2
0
Commit Graph

711 Commits

Author SHA1 Message Date
Unknwon
df64dcfdfd Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 22:55:35 -05:00
Unknwon
5a7bca797c Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
	gogs.go
	models/models.go
	models/user.go
	templates/.VERSION
	templates/org/home.tmpl
2015-02-22 22:51:25 -05:00
Unknwon
f6e65b5e06 models: able to rename user with diff letter cases #981
- templates/org: mirror fix on name output
- routers: add missing error check
2015-02-22 18:24:49 -05:00
Unknwon
51da9e41f0 routers: able to migrate repo from local path
- modules/middleware/context.go: add HandleAPI method
2015-02-22 09:49:25 -05:00
Unknwon
700626f527 templates/user/settings/emial.tmpl: little fix on UI
- routers/user: little code format
- conf/locale: update French locale
2015-02-21 22:13:47 -05:00
无闻
3a2df08119 Merge pull request #959 from phsmit/access_update
Updating context and fixing permission issues
2015-02-21 02:55:30 -05:00
Peter Smit
2bb8323ab5 Remove GoGet option from repository and handle it with ?go-get=1 instead
The normal go get protocol is to show the go-import meta tag when ?go-get=1 is appended to the url. This commit implements that behaviour and cleans the go-get option from the repository settings page.
2015-02-17 10:36:17 +02:00
Peter Smit
16bfbe24e7 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.
2015-02-16 12:51:56 +02:00
Peter Smit
21da931939 Make sure that a mirror can't be written to by http or ssh 2015-02-16 12:00:06 +02:00
Unknwon
b1281b34af routers/install.go: able to keep previous custom settings for 2nd time install
- .gopmfile: update all commits
2015-02-13 16:48:23 -05:00
Unknwon
7ae5b92db8 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Peter Smit
71ea4a71bd 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
2015-02-12 14:25:07 +02:00
Peter Smit
81083a9415 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.
2015-02-12 14:14:45 +02:00
Unknwon
9aeb3d3eed Merge branch 'dev' of github.com:gogits/gogs into access 2015-02-11 19:25:59 -05:00
无闻
4d31520521 Merge pull request #925 from phsmit/newcollaboration
Collaboration
2015-02-11 12:43:13 -05:00
Unknwon
f771ec8c6c models: make code change for session issue with SQLite3 #739 2015-02-10 23:44:16 -05:00
Unknwon
a8ac54ff07 able to allow insecure certification of webhook for #891 2015-02-10 21:06:59 -05:00
Peter Smit
5af7b2864c Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
无闻
1c35655750 Merge pull request #911 from TonyTsangHK/dev
Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files.
2015-02-09 00:31:16 -05:00
Unknwon
bc9746281f 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)
2015-02-08 21:26:14 -05:00
无闻
42ba809042 Merge pull request #905 from phsmit/conf_on_cli
Add option to provide configuration file on command line
2015-02-08 20:22:02 -05:00
Unknwon
cdd2a75239 routers/repo/http.go: allow HTTP push/pull by token for #845 2015-02-07 15:47:23 -05:00
无闻
9323547d46 Merge pull request #845 from compressed/token_http
allow http push by token - #842
2015-02-07 15:27:59 -05:00
Unknwon
ba9cae6328 code fix for #908, and work for #884 2015-02-06 21:16:23 -05:00
无闻
89a75db225 Merge pull request #908 from nicolai86/feature/hide-signup-button-884
Make Signup button display configurable - #884
2015-02-06 21:03:31 -05:00
Unknwon
be2991163c models/action.go: add action reopen for #462
- models/issue.go: format comment type names
2015-02-06 20:47:21 -05:00
Unknwon
58c91218ab models/action.go: mirror fix on #892
- modules/base/markdown.go: fix issue link issue
- routers/repo/view.go: remove useless code
2015-02-06 20:34:49 -05:00
Peter Smit
5deb52e1b8 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.
2015-02-06 13:18:11 +02:00
Tony Tsang
b6fb5371ce Link to previous commited source file (diff.view_file button) instead of returning 404 for deleted files. 2015-02-06 17:02:32 +08:00
Raphael Randschau
c93da2ef7c Hide the registration button depending on the setting 2015-02-05 18:15:00 +01:00
Peter Smit
9dd98a9a0f Add option to provide configuration file on command line 2015-02-05 12:17:35 +02:00
Peter Smit
c2a69ea61f Merge branch 'dev' into newcollaboration 2015-02-05 11:08:10 +02:00
无闻
41deac5407 Merge pull request #818 from fzerorubigd/master
add a function to rewrite all public keys on admin request
2015-02-01 16:56:34 -05:00
Unknwon
89ea3e1acc routers: save partial config when install 2015-02-01 14:39:58 -05:00
Unknwon
b293b6eaa6 cmd: CMD option for port number of gogs web to prevent first time run conflict
- routers: use new binding convention to simplify code
- templates: able to set HTTP port number in install page
2015-02-01 12:41:03 -05:00
Unknwon
32152d2363 routers/repo: set raw page content type to 'text/plain' #828 2015-01-31 15:27:57 -05:00
Unknwon
37fcc8daf2 modules/base: add RenderCommitMessage with XSS-safe and special links
- update russian locale
2015-01-30 18:05:20 -05:00
Peter Smit
76f8904718 Introducing Collaboration Struct 2015-01-23 09:54:16 +02:00
无闻
161774d4fb Merge pull request #825 from phsmit/ssh2_keys
Implement #798 Flexible ssh-key input
2015-01-22 19:39:35 +08:00
无闻
edbfbfa66e Merge pull request #822 from phsmit/fix_807
Fix #807 parse the userinfo with the golang tools
2015-01-22 19:31:51 +08:00
Christopher Brickley
d0827e5d5e allow http push by token - #842 2015-01-08 09:30:22 -05:00
Peter Smit
6251626de4 Implement #798 Flexible ssh-key input
It is now possible to input ssh keys in a number of formats: openssh, SSH2 or just the base64 encoded key.
2015-01-02 15:38:11 +02:00
Unknwon
c73e9057ae Optmize git-fsck options and fix #820 2015-01-02 20:14:43 +08:00
Peter Smit
d016eaaa09 Fix #807 parse the userinfo with the golang tools
Note, this is now only fixed with Go version >= 1.4.2, see this bug in Go: 07d86b1f2d
2015-01-02 12:14:11 +02:00
Unknwon
677b1ec627 fix #808 2015-01-02 12:56:08 +08:00
fzerorubigd
c973c91656 add afunction to rewrite all public keys on admin request
refs #763
2015-01-01 02:15:52 +03:30
Unknwon
bd555551ce fix #801 2014-12-31 18:37:29 +08:00
Thomas Laroche
e948c7c262 Fix #795 2014-12-29 11:55:46 +01:00
Unknwon
81a44e4cd0 fix API changes 2014-12-28 20:40:35 +08:00
Unknwon
79537467da mirror fix and update 2014-12-20 22:51:16 -05:00