673a76d638 
								
							 
						 
						
							
							
								
								Merge pull request  #1211  from mephux/hotfix/type-fix-ValidatePassword  
							
							... 
							
							
							
							Hotfix/type fix validate password 
							
						 
						
							2015-04-24 15:03:21 +08:00  
				
					
						
							
							
								 
						
							
								e57594dc31 
								
							 
						 
						
							
							
								
								typo fix for comment  
							
							
							
						 
						
							2015-04-16 14:40:39 -04:00  
				
					
						
							
							
								 
						
							
								f78046fc3b 
								
							 
						 
						
							
							
								
								typo fix  
							
							
							
						 
						
							2015-04-16 14:36:32 -04:00  
				
					
						
							
							
								 
						
							
								698b9e2acc 
								
							 
						 
						
							
							
								
								#1070  Clearer error message for illegal characters  
							
							
							
						 
						
							2015-03-26 17:11:47 -04:00  
				
					
						
							
							
								 
						
							
								466facc009 
								
							 
						 
						
							
							
								
								#1067 : Deleting users should remove them from collaborator lists  
							
							... 
							
							
							
							- fix delete user but repository watches are not decreased 
							
						 
						
							2015-03-17 21:51:39 -04:00  
				
					
						
							
							
								 
						
							
								b72e75e522 
								
							 
						 
						
							
							
								
								#1024 : OFFLINE_MODE Still Uses Gravatar  
							
							
							
						 
						
							2015-03-12 20:32:38 -04:00  
				
					
						
							
							
								 
						
							
								ee68a826a5 
								
							 
						 
						
							
							
								
								v4 migration, merge 'dev', clean code and mirror fix  
							
							
							
						 
						
							2015-02-23 02:15:53 -05:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								6d0f3a07d4 
								
							 
						 
						
							
							
								
								code  fix   #941  caution: undertest  
							
							
							
						 
						
							2015-02-13 00:58:46 -05:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7e7160eefd 
								
							 
						 
						
							
							
								
								first pass work on migration  #925  
							
							
							
						 
						
							2015-02-11 21:58:37 -05:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f706102890 
								
							 
						 
						
							
							
								
								models: sanitize user full name when update settings  
							
							
							
						 
						
							2015-02-04 20:04:01 -05:00  
				
					
						
							
							
								 
						
							
								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