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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									无闻 
								
							 
						 
						
							
							
								
							
							
	902f19f70b  
						 
						
							
							
								
								
								Merge pull request  #821  from phsmit/fix_819  
							
							... 
							
							
							
							
							Fix  #819  by fetching the repository from db before updating 
						
							2015-02-02 23:38:04 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Etienne Bruines 
								
							 
						 
						
							
							
								
							
							
	5c4b85c029  
						 
						
							
							
								
								
								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 . 
							
						 
						
							2015-02-02 16:34:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	0a2068d7fb  
						 
						
							
							
								
								
								models: code fix on  #818  
							
							
							
							
						 
						
							2015-02-01 17:21:56 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									无闻 
								
							 
						 
						
							
							
								
							
							
	cd6376f093  
						 
						
							
							
								
								
								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 
								
							 
						 
						
							
							
								
							
							
	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 
								
							 
						 
						
							
							
								
							
							
	ee6786216a  
						 
						
							
							
								
								
								modules/base: clean code with  #838  
							
							
							
							
						 
						
							2015-01-30 18:12:30 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	76f8904718  
						 
						
							
							
								
								
								Introducing Collaboration Struct  
							
							
							
							
						 
						
							2015-01-23 09:54:16 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	4ef3245413  
						 
						
							
							
								
								
								Migration code: errors are not to be forgotten  
							
							
							
							
						 
						
							2015-01-22 15:01:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	2a70d6b723  
						 
						
							
							
								
								
								Clean up migrations code  
							
							
							
							
						 
						
							2015-01-22 14:56:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	bb103e8723  
						 
						
							
							
								
								
								Create db migrations framework  
							
							
							
							
						 
						
							2015-01-22 14:52:58 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	452cca35e0  
						 
						
							
							
								
								
								Merge branch 'encoding' of github.com:gogits/gogs into dev  
							
							... 
							
							
							
							
							Conflicts:
	.gopmfile 
							
						 
						
							2015-01-17 15:29:45 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Christopher Brickley 
								
							 
						 
						
							
							
								
							
							
	d0827e5d5e  
						 
						
							
							
								
								
								allow http push by token -  #842  
							
							
							
							
						 
						
							2015-01-08 09:30:22 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	bb26285a12  
						 
						
							
							
								
								
								fix   #827  
							
							
							
							
						 
						
							2015-01-06 17:14:49 +08: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 
								
							 
						 
						
							
							
								
							
							
	44fa9147b7  
						 
						
							
							
								
								
								Fix   #819  by fetching the repository from db before updating  
							
							
							
							
						 
						
							2015-01-02 11:15:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	0b56272c13  
						 
						
							
							
								
								
								fix   #805  
							
							
							
							
						 
						
							2015-01-02 13:30:45 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	3ea1443885  
						 
						
							
							
								
								
								work on  #784  
							
							
							
							
						 
						
							2015-01-02 12:47:33 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fzerorubigd 
								
							 
						 
						
							
							
								
							
							
	
	
	6643647687 
 
						 
						
							
							
								
								
								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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									无闻 
								
							 
						 
						
							
							
								
							
							
	477bea574a  
						 
						
							
							
								
								
								Merge pull request  #782  from estetsenko/dev  
							
							... 
							
							
							
							
							fix for  #747  
							
						 
						
							2014-12-29 20:08:39 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									无闻 
								
							 
						 
						
							
							
								
							
							
	afdb0c7f9d  
						 
						
							
							
								
								
								Merge pull request  #790  from euank/master  
							
							... 
							
							
							
							
							Initialize unset git user.email / user.name correctly; fix Dockerfile 
							
						 
						
							2014-12-29 20:06:27 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	63c1f9a23f  
						 
						
							
							
								
								
								fix 500: E-mail already used in user settings page  
							
							
							
							
						 
						
							2014-12-29 20:00:07 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									euank 
								
							 
						 
						
							
							
								
							
							
	234a7c19a4  
						 
						
							
							
								
								
								Default values for both user.name and user.email  
							
							... 
							
							
							
							
							The previous behavior was to set default values only if user.name was
not set, but to always set it for both. This only sets a value if there
wasn't one; this fixes cases where someone has a user.name but no
user.email (see included Dockerfile) or someone has a user.email but no
user.name (before the email would have been over-written). 
							
						 
						
							2014-12-27 19:07:54 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									estetsenko 
								
							 
						 
						
							
							
								
							
							
	bae1d65564  
						 
						
							
							
								
								
								bugfix: Unable to assign any issue myself  
							
							
							
							
						 
						
							2014-12-24 20:47:45 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	3af757ed77  
						 
						
							
							
								
								
								Replace mahonia with the standard functions in the Golang Sub-repositories  
							
							
							
							
						 
						
							2014-12-22 11:01:52 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	66e2016eeb  
						 
						
							
							
								
								
								Fix for wrong email query  
							
							... 
							
							
							
							
							Changing EmailAdress.OwnerId to EmailAddress.Uid should have accompanied this change 
							
						 
						
							2014-12-21 09:16:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									无闻 
								
							 
						 
						
							
							
								
							
							
	a18decf4cc  
						 
						
							
							
								
								
								Merge pull request  #755  from phsmit/multiple_emails  
							
							... 
							
							
							
							
							Multiple emails 
							
						 
						
							2014-12-20 22:47:05 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter 
								
							 
						 
						
							
							
								
							
							
	20b5c23a19  
						 
						
							
							
								
								
								Small fixes to multiple_emails feature  
							
							
							
							
						 
						
							2014-12-20 09:26:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	c4820f119d  
						 
						
							
							
								
								
								work on  #754  
							
							
							
							
						 
						
							2014-12-18 03:26:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter 
								
							 
						 
						
							
							
								
							
							
	6919c80f0b  
						 
						
							
							
								
								
								Add function to the model for email address management (add/delete/activate)  
							
							
							
							
						 
						
							2014-12-17 17:40:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Peter Smit 
								
							 
						 
						
							
							
								
							
							
	99599c099f  
						 
						
							
							
								
								
								Add alternative email addresses to the model  
							
							... 
							
							
							
							
							A new struct is created named EmailAddress that contains alternative
email addresses for users. Also the email related methods; IsEmailUsed
and GetUserByEmail are updated.
DeleteUser deletes the extra email addresses and DeleteInactivateUsers
also deletes inactive accounts. This could be factored out, but should
do it for now. 
							
						 
						
							2014-12-17 10:26:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	b553ea45ee  
						 
						
							
							
								
								
								modes/repo: incorrect SSH clone URL for  #742  
							
							
							
							
						 
						
							2014-12-13 16:46:00 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	ac4a10456e  
						 
						
							
							
								
								
								api: able to create repo and  fix   #726  
							
							... 
							
							
							
							
							- POST /user/repos
- POST /org/:org/repos 
							
						 
						
							2014-12-12 20:30:32 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	2f3a7e53cb  
						 
						
							
							
								
								
								fix   #735  
							
							
							
							
						 
						
							2014-12-12 01:29:36 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	9a1fe801e5  
						 
						
							
							
								
								
								fix   #711  
							
							
							
							
						 
						
							2014-12-09 02:18:25 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joseph Crail 
								
							 
						 
						
							
							
								
							
							
	39c068400e  
						 
						
							
							
								
								
								Fix spelling errors in comments.  
							
							
							
							
						 
						
							2014-12-06 20:22:48 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	0b785ad967  
						 
						
							
							
								
								
								work on  #672  
							
							
							
							
						 
						
							2014-12-05 18:08:09 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	e577f2fff3  
						 
						
							
							
								
								
								fix   #706  and other mirror improve  
							
							
							
							
						 
						
							2014-12-04 23:07:51 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrew Burns 
								
							 
						 
						
							
							
								
							
							
	00cf3e4dab  
						 
						
							
							
								
								
								Use the avatar.HashEmail function instead of hashing email directly.   Fixes   #700  
							
							
							
							
						 
						
							2014-12-03 16:19:35 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	5338808600  
						 
						
							
							
								
								
								fix   #676  
							
							
							
							
						 
						
							2014-11-30 18:29:16 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Unknwon 
								
							 
						 
						
							
							
								
							
							
	d75013a0e8  
						 
						
							
							
								
								
								fix   #580  
							
							
							
							
						 
						
							2014-11-30 02:26:29 -05:00