]> source.dussan.org Git - gitea.git/log
gitea.git
9 years agoUpdating context and fixing permission issues
Peter Smit [Mon, 16 Feb 2015 10:51:56 +0000 (12:51 +0200)]
Updating context and fixing permission issues

The boolean flags in the repo context have been replaced with mode and two methods

Also, the permissions have been brought more in line with https://help.github.com/articles/permission-levels-for-an-organization-repository/ , Admin Team members are able to change settings of their repositories.

9 years agoMerge pull request #951 from phsmit/fix_team_update
无闻 [Fri, 13 Feb 2015 21:25:18 +0000 (16:25 -0500)]
Merge pull request #951 from phsmit/fix_team_update

Fix access for team mode update

9 years agoFix access for team mode update
Peter Smit [Fri, 13 Feb 2015 21:12:33 +0000 (23:12 +0200)]
Fix access for team mode update

9 years agoMerge pull request #949 from phsmit/different_access_migration
无闻 [Fri, 13 Feb 2015 20:15:09 +0000 (15:15 -0500)]
Merge pull request #949 from phsmit/different_access_migration

Rewrite of access migration

9 years agoRewrite of access migration
Peter Smit [Fri, 13 Feb 2015 11:58:19 +0000 (13:58 +0200)]
Rewrite of access migration

The old migration had a few issues:
 - It left old column names around
 - It did not give the right access levels for owners and admins

Also, this includes a migration that fixes the authorization of owner teams, which was previously ORG_ADMIN (instead of ORG_OWNER)

9 years agosome fixes, but not done yet!
Unknwon [Fri, 13 Feb 2015 07:56:42 +0000 (02:56 -0500)]
some fixes, but not done yet!

9 years agofix mirror issues uncaught #941
Unknwon [Fri, 13 Feb 2015 07:14:57 +0000 (02:14 -0500)]
fix mirror issues uncaught #941

9 years agocode fix #941 caution: undertest
Unknwon [Fri, 13 Feb 2015 05:58:46 +0000 (00:58 -0500)]
code fix #941 caution: undertest

9 years agomodels/migrations: finish accessRefactor
Unknwon [Fri, 13 Feb 2015 03:43:32 +0000 (22:43 -0500)]
models/migrations: finish accessRefactor

9 years agoMerge pull request #941 from phsmit/access_refactor
无闻 [Fri, 13 Feb 2015 02:34:27 +0000 (21:34 -0500)]
Merge pull request #941 from phsmit/access_refactor

Access refactor

9 years agomodels/migrations: fix little logic error
Unknwon [Thu, 12 Feb 2015 17:46:21 +0000 (12:46 -0500)]
models/migrations: fix little logic error

9 years agoMerge pull request #940 from phsmit/migration_update
无闻 [Thu, 12 Feb 2015 17:42:51 +0000 (12:42 -0500)]
Merge pull request #940 from phsmit/migration_update

Some comments and improvements for migrations

9 years agoMerge remote-tracking branch 'mine/access_refactor' into access_refactor
Peter Smit [Thu, 12 Feb 2015 12:25:07 +0000 (14:25 +0200)]
Merge remote-tracking branch 'mine/access_refactor' into access_refactor

Conflicts:
cmd/serve.go
models/access.go
models/migrations/migrations.go
models/org.go
models/repo.go
models/user.go
modules/middleware/org.go
modules/middleware/repo.go
routers/api/v1/repo.go
routers/org/teams.go
routers/repo/http.go
routers/user/home.go

9 years agoRefactoring of the Access Table
Peter Smit [Thu, 5 Feb 2015 13:29:08 +0000 (15:29 +0200)]
Refactoring of the Access Table

This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.

9 years agoSome comments and improvements for migrations
Peter Smit [Thu, 12 Feb 2015 11:54:34 +0000 (13:54 +0200)]
Some comments and improvements for migrations

9 years agomodels/migartions: make Migration as interface and use session
Unknwon [Thu, 12 Feb 2015 04:10:30 +0000 (23:10 -0500)]
models/migartions: make Migration as interface and use session

9 years agofirst pass work on migration #925
Unknwon [Thu, 12 Feb 2015 02:58:37 +0000 (21:58 -0500)]
first pass work on migration #925

9 years agoMerge branch 'dev' of github.com:gogits/gogs into access
Unknwon [Thu, 12 Feb 2015 00:25:59 +0000 (19:25 -0500)]
Merge branch 'dev' of github.com:gogits/gogs into access

9 years agoMerge branch 'access' of github.com:gogits/gogs into access
Unknwon [Wed, 11 Feb 2015 17:43:43 +0000 (12:43 -0500)]
Merge branch 'access' of github.com:gogits/gogs into access

9 years agoMerge pull request #925 from phsmit/newcollaboration
无闻 [Wed, 11 Feb 2015 17:43:13 +0000 (12:43 -0500)]
Merge pull request #925 from phsmit/newcollaboration

Collaboration

9 years agoMerge pull request #937 from Stefan-Code/dev
无闻 [Wed, 11 Feb 2015 17:27:29 +0000 (12:27 -0500)]
Merge pull request #937 from Stefan-Code/dev

Changes to repo-header-download-drop

9 years agobetter naming on #891
Unknwon [Wed, 11 Feb 2015 17:04:01 +0000 (12:04 -0500)]
better naming on #891

9 years agoChanges to repo-header-download-drop, different repo-clone-url input behaviour
Stefan-Code [Wed, 11 Feb 2015 06:28:51 +0000 (07:28 +0100)]
Changes to repo-header-download-drop, different repo-clone-url input behaviour

9 years agomodels: make code change for session issue with SQLite3 #739
Unknwon [Wed, 11 Feb 2015 04:44:16 +0000 (23:44 -0500)]
models: make code change for session issue with SQLite3 #739

9 years agomodules/middleware/auth.go: remove uncheck login for watch a repo #929
Unknwon [Wed, 11 Feb 2015 03:53:46 +0000 (22:53 -0500)]
modules/middleware/auth.go: remove uncheck login for watch a repo #929

9 years agoable to allow insecure certification of webhook for #891
Unknwon [Wed, 11 Feb 2015 02:06:59 +0000 (21:06 -0500)]
able to allow insecure certification of webhook for #891

9 years agoupdate gopmfile and README
Unknwon [Mon, 9 Feb 2015 18:32:22 +0000 (13:32 -0500)]
update gopmfile and README

9 years agomodels/repo.go: add update hook when migrate for #789
Unknwon [Mon, 9 Feb 2015 17:42:53 +0000 (12:42 -0500)]
models/repo.go: add update hook when migrate for #789

9 years agotemplates/ng/base: change year to 2015, fix #928
Unknwon [Mon, 9 Feb 2015 16:04:17 +0000 (11:04 -0500)]
templates/ng/base: change year to 2015, fix #928

- conf/locale: update Japanese locale

9 years agoMerge pull request #924 from phsmit/fix_921
无闻 [Mon, 9 Feb 2015 15:54:24 +0000 (10:54 -0500)]
Merge pull request #924 from phsmit/fix_921

Fixes #921

9 years agoMerge pull request #923 from phsmit/fix_922
无闻 [Mon, 9 Feb 2015 15:45:41 +0000 (10:45 -0500)]
Merge pull request #923 from phsmit/fix_922

Fix #922

9 years agoChange constants to UPPERCASE_WITH_UNDERSCORE style
Peter Smit [Mon, 9 Feb 2015 11:36:33 +0000 (13:36 +0200)]
Change constants to UPPERCASE_WITH_UNDERSCORE style

9 years agoFixes #921
Peter Smit [Mon, 9 Feb 2015 10:56:46 +0000 (12:56 +0200)]
Fixes #921

Fixes #921 and makes the Mention regexp be in line with the others

9 years agoImprove argument parsing for serve command
Peter Smit [Mon, 9 Feb 2015 10:32:42 +0000 (12:32 +0200)]
Improve argument parsing for serve command

9 years agoFix #922
Peter Smit [Mon, 9 Feb 2015 10:27:15 +0000 (12:27 +0200)]
Fix #922

9 years agoMerge pull request #911 from TonyTsangHK/dev
无闻 [Mon, 9 Feb 2015 05:31:16 +0000 (00:31 -0500)]
Merge pull request #911 from TonyTsangHK/dev

Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.

9 years agomodules/setting: mirror path issue
Unknwon [Mon, 9 Feb 2015 03:23:01 +0000 (22:23 -0500)]
modules/setting: mirror path issue

9 years agocmd: code fix for #905
Unknwon [Mon, 9 Feb 2015 02:26:14 +0000 (21:26 -0500)]
cmd: code fix for #905

- routers/admin: add rewrite update hook operation
- conf/locale: update locale file due to ini behavior changes
- cmd/cert_stub.go: remove useless code
- cmd/fix.go: no longer need fix command(at least now)

9 years agoMerge pull request #905 from phsmit/conf_on_cli
无闻 [Mon, 9 Feb 2015 01:22:02 +0000 (20:22 -0500)]
Merge pull request #905 from phsmit/conf_on_cli

Add option to provide configuration file on command line

9 years agomodules/ans1-ber: fix LDAP UTF8 string decoding for #916
Unknwon [Sun, 8 Feb 2015 19:39:54 +0000 (14:39 -0500)]
modules/ans1-ber: fix LDAP UTF8 string decoding for #916

9 years agopublic/ng/css: code generation for #919
Unknwon [Sun, 8 Feb 2015 18:00:22 +0000 (13:00 -0500)]
public/ng/css: code generation for #919

9 years agoMerge pull request #919 from Stefan-Code/dev
无闻 [Sun, 8 Feb 2015 17:51:58 +0000 (12:51 -0500)]
Merge pull request #919 from Stefan-Code/dev

Updated gogs.css - monospace font for hash

9 years agoconf/locale: add Spanish locale
Unknwon [Sun, 8 Feb 2015 17:39:11 +0000 (12:39 -0500)]
conf/locale: add Spanish locale

9 years agoUpdated gogs.css - monospace font for hash
Stefan [Sun, 8 Feb 2015 16:38:10 +0000 (17:38 +0100)]
Updated gogs.css - monospace font for hash

Updated gogs.css to use monospaced font for sha hash label in repository view to make it look nicer because of equal label width.

9 years agorouters/repo/http.go: allow HTTP push/pull by token for #845
Unknwon [Sat, 7 Feb 2015 20:47:23 +0000 (15:47 -0500)]
routers/repo/http.go: allow HTTP push/pull by token for #845

9 years agoMerge pull request #845 from compressed/token_http
无闻 [Sat, 7 Feb 2015 20:27:59 +0000 (15:27 -0500)]
Merge pull request #845 from compressed/token_http

allow http push by token - #842

9 years agoconf/locale: update locales
Unknwon [Sat, 7 Feb 2015 16:12:13 +0000 (11:12 -0500)]
conf/locale: update locales

9 years agoupdate README notice and CONTRIBUTING.md
Unknwon [Sat, 7 Feb 2015 16:09:17 +0000 (11:09 -0500)]
update README notice and CONTRIBUTING.md

9 years agoable to disable SSH for #883
Unknwon [Sat, 7 Feb 2015 15:46:57 +0000 (10:46 -0500)]
able to disable SSH for #883

9 years agoconf/locale: update French locale
Unknwon [Sat, 7 Feb 2015 02:29:15 +0000 (21:29 -0500)]
conf/locale: update French locale

9 years agocode fix for #908, and work for #884
Unknwon [Sat, 7 Feb 2015 02:16:23 +0000 (21:16 -0500)]
code fix for #908, and work for #884

9 years agoMerge pull request #908 from nicolai86/feature/hide-signup-button-884
无闻 [Sat, 7 Feb 2015 02:03:31 +0000 (21:03 -0500)]
Merge pull request #908 from nicolai86/feature/hide-signup-button-884

Make Signup button display configurable - #884

9 years agomodels/action.go: add action reopen for #462
Unknwon [Sat, 7 Feb 2015 01:47:21 +0000 (20:47 -0500)]
models/action.go: add action reopen for #462

- models/issue.go: format comment type names

9 years agomodels/action.go: mirror fix on #892
Unknwon [Sat, 7 Feb 2015 01:34:49 +0000 (20:34 -0500)]
models/action.go: mirror fix on #892

- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code

9 years agomodules/base: fix markdown mention regex for #826
Unknwon [Sat, 7 Feb 2015 00:15:58 +0000 (19:15 -0500)]
modules/base: fix markdown mention regex for #826

- conf/locale: add mew translator profile

9 years agoMerge pull request #826 from deringer/dev
无闻 [Sat, 7 Feb 2015 00:03:35 +0000 (19:03 -0500)]
Merge pull request #826 from deringer/dev

Fix user mention bug when parsing markdown documents

9 years agoRefactoring of the Access Table
Peter Smit [Thu, 5 Feb 2015 13:29:08 +0000 (15:29 +0200)]
Refactoring of the Access Table

This commit does a lot of the work of refactoring the access table in a table with id's instead of strings.

The result does compile, but has not been tested. It may eat your kittens.

9 years agoLink to previous commited source file (diff.view_file button) instead of returning...
Tony Tsang [Fri, 6 Feb 2015 09:02:32 +0000 (17:02 +0800)]
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.

9 years agoAdd locales (en/de native, rest -> translate.google.com)
Raphael Randschau [Thu, 5 Feb 2015 17:10:52 +0000 (18:10 +0100)]
Add locales (en/de native, rest -> translate.google.com)

9 years agoHide the registration button depending on the setting
Raphael Randschau [Thu, 5 Feb 2015 16:09:38 +0000 (17:09 +0100)]
Hide the registration button depending on the setting

9 years agoAdd ShowRegistrationButton configuration option
Raphael Randschau [Thu, 5 Feb 2015 16:09:26 +0000 (17:09 +0100)]
Add ShowRegistrationButton configuration option

9 years agopublic/ng/css: code generate for #907
Unknwon [Thu, 5 Feb 2015 13:22:59 +0000 (08:22 -0500)]
public/ng/css: code generate for #907

9 years agoMerge pull request #907 from makhov/new-lines-highlighting-format
无闻 [Thu, 5 Feb 2015 13:21:01 +0000 (08:21 -0500)]
Merge pull request #907 from makhov/new-lines-highlighting-format

fix highlighting css for del code

9 years agofix css for same code
Alexey Makhov [Thu, 5 Feb 2015 13:02:37 +0000 (16:02 +0300)]
fix css for same code

9 years agofix css for del code
Alexey Makhov [Thu, 5 Feb 2015 12:56:48 +0000 (15:56 +0300)]
fix css for del code

9 years agoMerge pull request #904 from makhov/new-lines-highlighting-format
无闻 [Thu, 5 Feb 2015 12:30:37 +0000 (07:30 -0500)]
Merge pull request #904 from makhov/new-lines-highlighting-format

new lines highlighting format

9 years agoAdd option to provide configuration file on command line
Peter Smit [Thu, 5 Feb 2015 10:12:37 +0000 (12:12 +0200)]
Add option to provide configuration file on command line

9 years agoMerge branch 'dev' into newcollaboration
Peter Smit [Thu, 5 Feb 2015 09:08:10 +0000 (11:08 +0200)]
Merge branch 'dev' into newcollaboration

9 years agonew lines highlighting format
Alexey Makhov [Thu, 5 Feb 2015 07:49:04 +0000 (10:49 +0300)]
new lines highlighting format

9 years agoMerge pull request #892 from EtienneBruines/commit_reference
无闻 [Thu, 5 Feb 2015 04:21:20 +0000 (23:21 -0500)]
Merge pull request #892 from EtienneBruines/commit_reference

Referencing issues from commit messages is now possible.

9 years agomodels: sanitize user full name when update settings
Unknwon [Thu, 5 Feb 2015 01:04:01 +0000 (20:04 -0500)]
models: sanitize user full name when update settings

9 years agopublic/ng/js: script fix on #901
Unknwon [Thu, 5 Feb 2015 00:52:31 +0000 (19:52 -0500)]
public/ng/js: script fix on #901

9 years agoMerge branch 'dev' of github.com:gogits/gogs into dev
Unknwon [Thu, 5 Feb 2015 00:14:13 +0000 (19:14 -0500)]
Merge branch 'dev' of github.com:gogits/gogs into dev

9 years agocmd: update csrf version requirement
Unknwon [Thu, 5 Feb 2015 00:14:09 +0000 (19:14 -0500)]
cmd: update csrf version requirement

9 years agoMerge pull request #901 from makhov/fix-diff-view
无闻 [Thu, 5 Feb 2015 00:13:40 +0000 (19:13 -0500)]
Merge pull request #901 from makhov/fix-diff-view

fix lines highlighting at diff view

9 years agolittle fix
Alexey Makhov [Wed, 4 Feb 2015 19:06:40 +0000 (22:06 +0300)]
little fix

9 years agoadd multifile support to diff view highlighting
Alexey Makhov [Wed, 4 Feb 2015 18:54:45 +0000 (21:54 +0300)]
add multifile support to diff view highlighting

9 years agoFix dashboard issue after collaboration migration
Peter Smit [Wed, 4 Feb 2015 14:08:55 +0000 (16:08 +0200)]
Fix dashboard issue after collaboration  migration

9 years agoFix collaboration migration code
Peter Smit [Wed, 4 Feb 2015 13:47:40 +0000 (15:47 +0200)]
Fix collaboration migration code

9 years agofix diff lines highlighting
Alexey Makhov [Tue, 3 Feb 2015 20:53:34 +0000 (23:53 +0300)]
fix diff lines highlighting

9 years agoscripts: remove confuse scripts
Unknwon [Tue, 3 Feb 2015 17:42:34 +0000 (12:42 -0500)]
scripts: remove confuse scripts

9 years agoscripts: remove confuse scripts
Unknwon [Tue, 3 Feb 2015 17:42:34 +0000 (12:42 -0500)]
scripts: remove confuse scripts

9 years agoMerge pull request #897 from makhov/makhov/fix-admin-config
无闻 [Tue, 3 Feb 2015 17:21:50 +0000 (12:21 -0500)]
Merge pull request #897 from makhov/makhov/fix-admin-config

fix error at admin/config

9 years agofix error at admin/config
Alexey Makhov [Tue, 3 Feb 2015 14:26:56 +0000 (17:26 +0300)]
fix error at admin/config

9 years agopublic/ng/css: code fix on #895
Unknwon [Tue, 3 Feb 2015 11:54:29 +0000 (06:54 -0500)]
public/ng/css: code fix on #895

- templates/user/settings: fix email panel nav highlight

9 years agoMerge branch 'master' of github.com:gogits/gogs into dev
Unknwon [Tue, 3 Feb 2015 11:51:44 +0000 (06:51 -0500)]
Merge branch 'master' of github.com:gogits/gogs into dev

9 years agoMerge pull request #895 from makhov/makhov/fix-settings-email-html
无闻 [Tue, 3 Feb 2015 11:50:57 +0000 (06:50 -0500)]
Merge pull request #895 from makhov/makhov/fix-settings-email-html

fix settings/email html&css

9 years agofix settings/email html&css in less
Alexey Makhov [Tue, 3 Feb 2015 08:05:13 +0000 (11:05 +0300)]
fix settings/email html&css in less

9 years agofix settings/email html&css
Alexey Makhov [Tue, 3 Feb 2015 07:32:55 +0000 (10:32 +0300)]
fix settings/email html&css

9 years agomodels: mirro code fix for #821
Unknwon [Tue, 3 Feb 2015 04:42:53 +0000 (23:42 -0500)]
models: mirro code fix for #821

9 years agoMerge pull request #821 from phsmit/fix_819
无闻 [Tue, 3 Feb 2015 04:38:04 +0000 (23:38 -0500)]
Merge pull request #821 from phsmit/fix_819

Fix #819 by fetching the repository from db before updating

9 years agomodules/base: fix README filename checker, fix #877
Unknwon [Tue, 3 Feb 2015 04:04:36 +0000 (23:04 -0500)]
modules/base: fix README filename checker, fix #877

9 years agoReferencing issues from commit messages is now possible.
Etienne Bruines [Mon, 2 Feb 2015 15:34:07 +0000 (16:34 +0100)]
Referencing issues from commit messages is now possible.

Code-wise: the fixing-part of the code now doesn't reference the issue any more, because this is done by the referencing-part of the code, which is called just before.

Fixes #462, #668, #732.

9 years agoconf/locale: update Japanese locale
Unknwon [Mon, 2 Feb 2015 14:44:51 +0000 (09:44 -0500)]
conf/locale: update Japanese locale

9 years agoconf/locale: update Japanese locale
Unknwon [Mon, 2 Feb 2015 12:33:24 +0000 (07:33 -0500)]
conf/locale: update Japanese locale

9 years agomodels: code fix on #818
Unknwon [Sun, 1 Feb 2015 22:21:56 +0000 (17:21 -0500)]
models: code fix on #818

9 years agoMerge pull request #818 from fzerorubigd/master
无闻 [Sun, 1 Feb 2015 21:56:34 +0000 (16:56 -0500)]
Merge pull request #818 from fzerorubigd/master

add a function to rewrite all public keys on admin request

9 years agoMerge pull request #889 from mgdelacroix/patch-1
无闻 [Sun, 1 Feb 2015 21:48:48 +0000 (16:48 -0500)]
Merge pull request #889 from mgdelacroix/patch-1

Add Miguel de la Cruz as a translator

9 years agoAdd Miguel de la Cruz as a translator
Miguel de la Cruz [Sun, 1 Feb 2015 21:47:58 +0000 (22:47 +0100)]
Add Miguel de la Cruz as a translator

9 years agoMerge branch 'dev' of github.com:gogits/gogs into dev
Unknwon [Sun, 1 Feb 2015 19:40:05 +0000 (14:40 -0500)]
Merge branch 'dev' of github.com:gogits/gogs into dev