63c1f9a23f 
								
							 
						 
						
							
							
								
								fix 500: E-mail already used in user settings page  
							
							
							
						 
						
							2014-12-29 20:00:07 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								20b5c23a19 
								
							 
						 
						
							
							
								
								Small fixes to multiple_emails feature  
							
							
							
						 
						
							2014-12-20 09:26:51 +02:00  
				
					
						
							
							
								 
						
							
								c4820f119d 
								
							 
						 
						
							
							
								
								work on  #754  
							
							
							
						 
						
							2014-12-18 03:26:09 -05:00  
				
					
						
							
							
								 
						
							
								6919c80f0b 
								
							 
						 
						
							
							
								
								Add function to the model for email address management (add/delete/activate)  
							
							
							
						 
						
							2014-12-17 17:40:10 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								39c068400e 
								
							 
						 
						
							
							
								
								Fix spelling errors in comments.  
							
							
							
						 
						
							2014-12-06 20:22:48 -05:00  
				
					
						
							
							
								 
						
							
								00cf3e4dab 
								
							 
						 
						
							
							
								
								Use the avatar.HashEmail function instead of hashing email directly.   Fixes   #700  
							
							
							
						 
						
							2014-12-03 16:19:35 -07:00  
				
					
						
							
							
								 
						
							
								5338808600 
								
							 
						 
						
							
							
								
								fix   #676  
							
							
							
						 
						
							2014-11-30 18:29:16 -05:00  
				
					
						
							
							
								 
						
							
								d75013a0e8 
								
							 
						 
						
							
							
								
								fix   #580  
							
							
							
						 
						
							2014-11-30 02:26:29 -05:00  
				
					
						
							
							
								 
						
							
								dc53270da9 
								
							 
						 
						
							
							
								
								Fix 653  
							
							
							
						 
						
							2014-11-22 10:22:53 -05:00  
				
					
						
							
							
								 
						
							
								8ea7ba3afa 
								
							 
						 
						
							
							
								
								fix   #644  
							
							
							
						 
						
							2014-11-21 13:10:00 -05:00  
				
					
						
							
							
								 
						
							
								ef275ebf62 
								
							 
						 
						
							
							
								
								more on change avatar  
							
							
							
						 
						
							2014-11-21 12:51:36 -05:00  
				
					
						
							
							
								 
						
							
								55dfe2c978 
								
							 
						 
						
							
							
								
								custom avatar upload  
							
							
							
						 
						
							2014-11-21 10:58:08 -05:00  
				
					
						
							
							
								 
						
							
								32dcaefafa 
								
							 
						 
						
							
							
								
								fox  #620  
							
							
							
						 
						
							2014-11-17 14:53:41 -05:00  
				
					
						
							
							
								 
						
							
								340a4595dd 
								
							 
						 
						
							
							
								
								support duoshuo mirror of gravatar  
							
							
							
						 
						
							2014-11-16 20:27:04 -05:00  
				
					
						
							
							
								 
						
							
								9e22840483 
								
							 
						 
						
							
							
								
								fix   #622  
							
							
							
						 
						
							2014-11-13 05:27:01 -05:00  
				
					
						
							
							
								 
						
							
								0c5ba4573a 
								
							 
						 
						
							
							
								
								fix session API broken and SQL pretection  
							
							
							
						 
						
							2014-11-04 11:37:15 -05:00  
				
					
						
							
							
								 
						
							
								83283bca4c 
								
							 
						 
						
							
							
								
								Safe work  
							
							
							
						 
						
							2014-10-25 07:50:19 -04:00  
				
					
						
							
							
								 
						
							
								f1d8746264 
								
							 
						 
						
							
							
								
								Fix fork repo and macaron API broken  
							
							
							
						 
						
							2014-10-24 18:43:17 -04:00  
				
					
						
							
							
								 
						
							
								963354c5d7 
								
							 
						 
						
							
							
								
								Add raw, history file button, and other mirror fixes  
							
							
							
						 
						
							2014-10-11 18:02:48 -04:00  
				
					
						
							
							
								 
						
							
								405ee14711 
								
							 
						 
						
							
							
								
								Fix SMTP auth logic  
							
							
							
						 
						
							2014-10-03 13:12:54 -04:00  
				
					
						
							
							
								 
						
							
								c1d047d16e 
								
							 
						 
						
							
							
								
								Merge pull request  #508  from chadoe/homelink  
							
							... 
							
							
							
							Fix user HomeLink when using a suburl 
							
						 
						
							2014-09-28 18:05:58 -04:00  
				
					
						
							
							
								 
						
							
								bb05ef907b 
								
							 
						 
						
							
							
								
								Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached  
							
							
							
						 
						
							2014-09-28 14:27:13 +02:00  
				
					
						
							
							
								 
						
							
								204952439a 
								
							 
						 
						
							
							
								
								Fix user HomeLink when using a suburl  
							
							
							
						 
						
							2014-09-28 13:55:58 +02:00  
				
					
						
							
							
								 
						
							
								b8368f98ff 
								
							 
						 
						
							
							
								
								Add directory level commit message  
							
							
							
						 
						
							2014-09-26 08:55:13 -04:00  
				
					
						
							
							
								 
						
							
								71e4689d11 
								
							 
						 
						
							
							
								
								Page: User profile  
							
							
							
						 
						
							2014-09-25 19:33:39 -04:00  
				
					
						
							
							
								 
						
							
								bd55b78775 
								
							 
						 
						
							
							
								
								Page: Commits and  fix   #249  
							
							
							
						 
						
							2014-09-23 23:18:14 -04:00  
				
					
						
							
							
								 
						
							
								5bbeeb0f1b 
								
							 
						 
						
							
							
								
								Page: Commits and  fix   #249  
							
							
							
						 
						
							2014-09-23 15:30:04 -04:00  
				
					
						
							
							
								 
						
							
								7ba9257a7f 
								
							 
						 
						
							
							
								
								Add suburl support  
							
							
							
						 
						
							2014-09-19 20:11:34 -04:00  
				
					
						
							
							
								 
						
							
								0055cbd365 
								
							 
						 
						
							
							
								
								Allow Gogs to run from a suburl behind a reverse proxy. e.g.  http://mydomain.com/gogs/  
							
							... 
							
							
							
							Conflicts:
	modules/setting/setting.go
Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl
Conflicts:
	routers/repo/setting.go 
							
						 
						
							2014-09-18 20:50:48 +02:00  
				
					
						
							
							
								 
						
							
								f94d7c3f51 
								
							 
						 
						
							
							
								
								clarify name/username/owner/pusher for webhook  
							
							
							
						 
						
							2014-09-17 09:20:14 -04:00  
				
					
						
							
							
								 
						
							
								d2aff9a46a 
								
							 
						 
						
							
							
								
								Continue working on new admin pages  
							
							
							
						 
						
							2014-08-29 20:50:43 +08:00  
				
					
						
							
							
								 
						
							
								1aec1a2dda 
								
							 
						 
						
							
							
								
								Finish new admin dashboard  
							
							
							
						 
						
							2014-08-28 22:29:00 +08:00  
				
					
						
							
							
								 
						
							
								74b31566cf 
								
							 
						 
						
							
							
								
								Finsih add/remove repo in organization  
							
							
							
						 
						
							2014-08-26 18:11:15 +08:00  
				
					
						
							
							
								 
						
							
								21a1b8e5a3 
								
							 
						 
						
							
							
								
								Finish new edit team page, add member to team  
							
							
							
						 
						
							2014-08-24 21:09:05 +08:00  
				
					
						
							
							
								 
						
							
								36b4c57ff1 
								
							 
						 
						
							
							
								
								Finish new organization members and invitation page  
							
							
							
						 
						
							2014-08-15 18:29:41 +08:00  
				
					
						
							
							
								 
						
							
								755eec745f 
								
							 
						 
						
							
							
								
								Finish new repo settings page  
							
							
							
						 
						
							2014-08-02 13:47:33 -04:00  
				
					
						
							
							
								 
						
							
								5e81383413 
								
							 
						 
						
							
							
								
								Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module  
							
							
							
						 
						
							2014-07-26 18:37:18 -04:00  
				
					
						
							
							
								 
						
							
								8dd07c0ddd 
								
							 
						 
						
							
							
								
								New UI merge in progress  
							
							
							
						 
						
							2014-07-26 00:24:27 -04:00  
				
					
						
							
							
								 
						
							
								cbcd08aa17 
								
							 
						 
						
							
							
								
								Mention organisation users when organisation gets mentioned  
							
							
							
						 
						
							2014-07-24 19:15:31 +02:00  
				
					
						
							
							
								 
						
							
								3969d704a0 
								
							 
						 
						
							
							
								
								Merge branch 'dev' of github.com:gogits/gogs into dev  
							
							
							
						 
						
							2014-07-12 00:55:35 -04:00  
				
					
						
							
							
								 
						
							
								0f907301b7 
								
							 
						 
						
							
							
								
								Fix   #285  
							
							
							
						 
						
							2014-07-12 00:55:19 -04:00  
				
					
						
							
							
								 
						
							
								63e47405b2 
								
							 
						 
						
							
							
								
								Only update access usernames where the username is changing  #282  
							
							
							
						 
						
							2014-07-11 20:57:00 -04:00  
				
					
						
							
							
								 
						
							
								63cc14062a 
								
							 
						 
						
							
							
								
								Paging function for users and repositories  
							
							
							
						 
						
							2014-07-07 04:15:08 -04:00  
				
					
						
							
							
								 
						
							
								be8ac7fb75 
								
							 
						 
						
							
							
								
								fix   #273  
							
							
							
						 
						
							2014-07-04 16:48:36 -04:00  
				
					
						
							
							
								 
						
							
								5dbfe3c26c 
								
							 
						 
						
							
							
								
								Finish organization homepage  
							
							
							
						 
						
							2014-06-28 15:43:25 -04:00  
				
					
						
							
							
								 
						
							
								6e448b0714 
								
							 
						 
						
							
							
								
								Finish delete organization  
							
							
							
						 
						
							2014-06-28 00:40:07 -04:00  
				
					
						
							
							
								 
						
							
								19e9104289 
								
							 
						 
						
							
							
								
								Organization settings page  
							
							
							
						 
						
							2014-06-27 03:37:01 -04:00