GitCaddy/GitCaddy Server
Limited
2
0
Fork 0
Code Issues Releases 4
2,146 Commits 20 Branches 4 Tags
8aec9956c19fcdcf33ad1fceaaa51f9d2fb59cfb
Commit Graph

654 Commits

Author SHA1 Message Date
Unknwon
8aec9956c1 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-22 23:34:05 -05:00
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
9356bd502c Merge branch 'dev' of github.com:gogits/gogs into dev 2015-02-21 22:13:50 -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
Raphael Randschau
a868ff0436 Fix #933 
Not sure why, but xorm ignores the num_issues and num_closed_issues
columns when updating, even though the values changed.

Listing them explicitly fixes the issue with the wrong issue counts
 2015-02-21 09:37:48 +01: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
0d601634fb Remove collaborators when removing and transferring repository 2015-02-16 13:34:42 +02:00
Unknwon
8414dd270e models: fix XORM API break 
cmd/web.go: check version after load config
 2015-02-14 17:01:33 -05:00
Peter Smit
234fba2c09 Fix access for team mode update 2015-02-13 23:12:33 +02:00
Peter Smit
7c22ddf98d 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)
 2015-02-13 13:58:19 +02:00
Unknwon
cfe7f5e13d some fixes, but not done yet! 2015-02-13 02:56:42 -05:00
Unknwon
16a8a4a4f7 fix mirror issues uncaught #941 2015-02-13 02:14:57 -05:00
Unknwon
7ae5b92db8 code fix #941 caution: undertest 2015-02-13 00:58:46 -05:00
Unknwon
38d3262e48 models/migrations: finish accessRefactor 2015-02-12 22:43:32 -05:00
无闻
4a6c7e10f2 Merge pull request #941 from phsmit/access_refactor 
Access refactor
 2015-02-12 21:34:27 -05:00
Unknwon
ee13766710 models/migrations: fix little logic error 2015-02-12 12:46:21 -05:00
Unknwon
eb69b6532c templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled #884 2015-02-12 12:38:44 -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
Peter Smit
fda8920ff0 Some comments and improvements for migrations 2015-02-12 13:59:42 +02:00
Unknwon
bd119381ba models/migartions: make Migration as interface and use session 2015-02-11 23:10:30 -05:00
Unknwon
4f24a5ef7d first pass work on migration #925 2015-02-11 21:58:37 -05:00
Unknwon
9aeb3d3eed Merge branch 'dev' of github.com:gogits/gogs into access 2015-02-11 19:25:59 -05:00
Unknwon
387df60344 Merge branch 'access' of github.com:gogits/gogs into access 2015-02-11 12:43:43 -05:00
无闻
4d31520521 Merge pull request #925 from phsmit/newcollaboration 
Collaboration
 2015-02-11 12:43:13 -05:00
Unknwon
07795ce5be better naming on #891 2015-02-11 12:04:01 -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
Unknwon
85067b08a4 models/repo.go: add update hook when migrate for #789 2015-02-09 12:42:53 -05:00
Peter Smit
5af7b2864c Change constants to UPPERCASE_WITH_UNDERSCORE style 2015-02-09 13:36:33 +02:00
Peter Smit
6e839cde62 Fix #922 2015-02-09 12:27:15 +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
235271d50a able to disable SSH for #883 2015-02-07 10:46:57 -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
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
无闻
53439a38b9 Merge pull request #892 from EtienneBruines/commit_reference 
Referencing issues from commit messages is now possible.
 2015-02-04 23:21:20 -05:00
Unknwon
94b839cc2d models: sanitize user full name when update settings 2015-02-04 20:04:01 -05:00
Peter Smit
fd1df86c44 Fix dashboard issue after collaboration migration 2015-02-04 16:08:55 +02:00
Peter Smit
bef38d9d3f Fix collaboration migration code 2015-02-04 16:03:39 +02:00
Unknwon
7712805a67 models: mirro code fix for #821 2015-02-02 23:42:53 -05:00