Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							7ccab9cd09 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							04164eada3 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							3fcc39c26b 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of github.com:gogits/gogs into dev  
						
						
						
						
					 
					
						2015-02-21 22:13:50 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							1654e9ecab 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							4f567edc6e 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							e6fc58a744 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							aa68e86206 
							
						 
					 
					
						
						
							
							Rewrite/simplify gogs serve  
						
						
						
						
					 
					
						2015-02-16 16:38:01 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							b6519f78c7 
							
						 
					 
					
						
						
							
							Remove collaborators when removing and transferring repository  
						
						
						
						
					 
					
						2015-02-16 13:34:42 +02:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							685ed1f807 
							
						 
					 
					
						
						
							
							models: fix XORM API break  
						
						... 
						
						
						
						cmd/web.go: check version after load config 
						
						
					 
					
						2015-02-14 17:01:33 -05:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							0009a1d2b1 
							
						 
					 
					
						
						
							
							Fix access for team mode update  
						
						
						
						
					 
					
						2015-02-13 23:12:33 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							ddf7014b9b 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							25f5a8d798 
							
						 
					 
					
						
						
							
							some fixes, but not done yet!  
						
						
						
						
					 
					
						2015-02-13 02:56:42 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							6b7d35eade 
							
						 
					 
					
						
						
							
							fix mirror issues uncaught  #941  
						
						
						
						
					 
					
						2015-02-13 02:14:57 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							6d0f3a07d4 
							
						 
					 
					
						
						
							
							code  fix   #941  caution: undertest  
						
						
						
						
					 
					
						2015-02-13 00:58:46 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							b99c4baab2 
							
						 
					 
					
						
						
							
							models/migrations: finish accessRefactor  
						
						
						
						
					 
					
						2015-02-12 22:43:32 -05:00 
						 
				 
			
				
					
						
							
							
								无闻 
							
						 
					 
					
						
						
						
						
							
						
						
							7fda0cdb93 
							
						 
					 
					
						
						
							
							Merge pull request  #941  from phsmit/access_refactor  
						
						... 
						
						
						
						Access refactor 
						
						
					 
					
						2015-02-12 21:34:27 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							0b3722c359 
							
						 
					 
					
						
						
							
							models/migrations: fix little logic error  
						
						
						
						
					 
					
						2015-02-12 12:46:21 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							67a9416ae5 
							
						 
					 
					
						
						
							
							templates/user/auth/signin.tmpl: hide sign up prompt when registration is disabled  #884  
						
						
						
						
					 
					
						2015-02-12 12:38:44 -05:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1ee384f1 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							0a4cda0dd4 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							2804784df9 
							
						 
					 
					
						
						
							
							Some comments and improvements for migrations  
						
						
						
						
					 
					
						2015-02-12 13:59:42 +02:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							876a856759 
							
						 
					 
					
						
						
							
							models/migartions: make Migration as interface and use session  
						
						
						
						
					 
					
						2015-02-11 23:10:30 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							7e7160eefd 
							
						 
					 
					
						
						
							
							first pass work on migration  #925  
						
						
						
						
					 
					
						2015-02-11 21:58:37 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							c5c467a9cd 
							
						 
					 
					
						
						
							
							Merge branch 'dev' of github.com:gogits/gogs into access  
						
						
						
						
					 
					
						2015-02-11 19:25:59 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							c7a042ef36 
							
						 
					 
					
						
						
							
							Merge branch 'access' of github.com:gogits/gogs into access  
						
						
						
						
					 
					
						2015-02-11 12:43:43 -05:00 
						 
				 
			
				
					
						
							
							
								无闻 
							
						 
					 
					
						
						
						
						
							
						
						
							e805fdb29c 
							
						 
					 
					
						
						
							
							Merge pull request  #925  from phsmit/newcollaboration  
						
						... 
						
						
						
						Collaboration 
						
						
					 
					
						2015-02-11 12:43:13 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							d02e45f985 
							
						 
					 
					
						
						
							
							better naming on  #891  
						
						
						
						
					 
					
						2015-02-11 12:04:01 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							485ea6f14f 
							
						 
					 
					
						
						
							
							models: make code change for session issue with SQLite3  #739  
						
						
						
						
					 
					
						2015-02-10 23:44:16 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							6a23252edc 
							
						 
					 
					
						
						
							
							able to allow insecure certification of webhook for  #891  
						
						
						
						
					 
					
						2015-02-10 21:06:59 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							bad533a219 
							
						 
					 
					
						
						
							
							models/repo.go: add update hook when migrate for  #789  
						
						
						
						
					 
					
						2015-02-09 12:42:53 -05:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							0d158e569b 
							
						 
					 
					
						
						
							
							Change constants to UPPERCASE_WITH_UNDERSCORE style  
						
						
						
						
					 
					
						2015-02-09 13:36:33 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							aa35be975f 
							
						 
					 
					
						
						
							
							Fix   #922  
						
						
						
						
					 
					
						2015-02-09 12:27:15 +02:00 
						 
				 
			
				
					
						
							
							
								无闻 
							
						 
					 
					
						
						
						
						
							
						
						
							6ed96b7a20 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							f15fa9167a 
							
						 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								无闻 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0ee35b3f 
							
						 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								Lauris BH 
							
						 
					 
					
						
						
						
						
							
						
						
							00653e52ee 
							
						 
					 
					
						
						
							
							Get username, name, surname and e-mail from LDAP server  
						
						
						
						
					 
					
						2015-02-08 01:49:51 +02:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							ba77a3b0b4 
							
						 
					 
					
						
						
							
							routers/repo/http.go: allow HTTP push/pull by token for  #845  
						
						
						
						
					 
					
						2015-02-07 15:47:23 -05:00 
						 
				 
			
				
					
						
							
							
								无闻 
							
						 
					 
					
						
						
						
						
							
						
						
							19525abfc4 
							
						 
					 
					
						
						
							
							Merge pull request  #845  from compressed/token_http  
						
						... 
						
						
						
						allow http push by token - #842  
						
						
					 
					
						2015-02-07 15:27:59 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							2a2596fe61 
							
						 
					 
					
						
						
							
							able to disable SSH for  #883  
						
						
						
						
					 
					
						2015-02-07 10:46:57 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							5a99e9a37b 
							
						 
					 
					
						
						
							
							models/action.go: add action reopen for  #462  
						
						... 
						
						
						
						- models/issue.go: format comment type names 
						
						
					 
					
						2015-02-06 20:47:21 -05:00 
						 
				 
			
				
					
						
							
							
								Unknwon 
							
						 
					 
					
						
						
						
						
							
						
						
							afccd0a3ee 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							4e79adf6b5 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							fc6d80d619 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							1ab09e4f1b 
							
						 
					 
					
						
						
							
							Add option to provide configuration file on command line  
						
						
						
						
					 
					
						2015-02-05 12:17:35 +02:00 
						 
				 
			
				
					
						
							
							
								Peter Smit 
							
						 
					 
					
						
						
						
						
							
						
						
							03af37554e 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into newcollaboration  
						
						
						
						
					 
					
						2015-02-05 11:08:10 +02:00 
						 
				 
			
				
					
						
							
							
								无闻 
							
						 
					 
					
						
						
						
						
							
						
						
							02c5bade0f 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							f706102890 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							4de0b19cec 
							
						 
					 
					
						
						
							
							models: mirro code fix for  #821  
						
						
						
						
					 
					
						2015-02-02 23:42:53 -05:00