b0ddced2b5 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries  
						
						... 
						
						
						
						# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go 
						
						
					 
					
						2016-11-10 21:05:52 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a4454f5d0f 
					 
					
						
						
							
							Rewrite XORM queries  
						
						
						
						
					 
					
						2016-11-10 20:59:51 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4247304f5a 
					 
					
						
						
							
							Update import paths from github.com/go-gitea to code.gitea.io ( #135 )  
						
						... 
						
						
						
						- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis
See https://docs.travis-ci.com/user/languages/go#Go-Import-Path  
						
						
					 
					
						2016-11-10 17:24:48 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f388661bda 
					 
					
						
						
							
							ACCESS_MODE_* -> AccessMode*  
						
						
						
						
					 
					
						2016-11-07 17:20:37 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2d68bd1ef9 
					 
					
						
						
							
							Change import reference to match gitea instead of gogs ( #37 )  
						
						
						
						
					 
					
						2016-11-03 10:29:56 -02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e74630ae3b 
					 
					
						
						
							
							#1384  add pagination for repositories  
						
						
						
						
					 
					
						2016-07-24 14:32:46 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1f2e173a74 
					 
					
						
						
							
							Refactor User.Id to User.ID  
						
						
						
						
					 
					
						2016-07-24 01:08:22 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e6f927f61a 
					 
					
						
						
							
							#1692  api: admin list and create team under organization  
						
						
						
						
					 
					
						2016-03-21 12:47:54 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1314ba219e 
					 
					
						
						
							
							Updated and created were appended with _unix. Fresh databases have only the newly named fields.  
						
						
						
						
					 
					
						2016-03-11 12:43:35 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						045f14fbd0 
					 
					
						
						
							
							#1146  finsih UI work for access mode of collaborators  
						
						... 
						
						
						
						Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin. 
						
						
					 
					
						2016-03-05 18:08:42 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2158e6fc43 
					 
					
						
						
							
							fix   #1997  
						
						
						
						
					 
					
						2015-11-19 11:40:00 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4d3138cd10 
					 
					
						
						
							
							fix   #1953  
						
						
						
						
					 
					
						2015-11-15 14:55:12 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f8ae161c74 
					 
					
						
						
							
							fix   #1302  
						
						
						
						
					 
					
						2015-11-13 17:37:02 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ff35a37769 
					 
					
						
						
							
							#1458 : Authorities were messed up when using mysql database  
						
						
						
						
					 
					
						2015-08-28 13:51:15 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1453e91f41 
					 
					
						
						
							
							minor fix on API response  
						
						
						
						
					 
					
						2015-08-19 20:08:57 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dea3a8c6a4 
					 
					
						
						
							
							WIP: create PR - choose branch  
						
						
						
						
					 
					
						2015-08-08 22:43:14 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						04e596f984 
					 
					
						
						
							
							#1369 : nil pointer when add repo to team  
						
						
						
						
					 
					
						2015-07-24 16:52:01 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						663c28beb6 
					 
					
						
						
							
							#1279 : Removing user from collaboration removes repositiory  
						
						
						
						
					 
					
						2015-07-14 22:56:02 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6f81c05dde 
					 
					
						
						
							
							#1143  Team member access lost when adding repository collaborator  
						
						... 
						
						
						
						- fix bug when add a repo to team, all other team members gets access as well 
						
						
					 
					
						2015-03-24 18:14:04 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						588f3215c6 
					 
					
						
						
							
							#1040 : dashboard no longer accessible when repo is missing  
						
						
						
						
					 
					
						2015-03-16 04:04:27 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f44204e944 
					 
					
						
						
							
							REAMDE: update  
						
						
						
						
					 
					
						2015-02-28 21:50:04 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						473e265727 
					 
					
						
						
							
							models: done testing on new access system  
						
						
						
						
					 
					
						2015-02-28 21:44:09 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8896c82d34 
					 
					
						
						
							
							models: fix issue with transfer repository  
						
						... 
						
						
						
						README: fix typo 
						
						
					 
					
						2015-02-24 00:27:22 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ee68a826a5 
					 
					
						
						
							
							v4 migration, merge 'dev', clean code and mirror fix  
						
						
						
						
					 
					
						2015-02-23 02:15:53 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						25f5a8d798 
					 
					
						
						
							
							some fixes, but not done yet!  
						
						
						
						
					 
					
						2015-02-13 02:56:42 -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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0d158e569b 
					 
					
						
						
							
							Change constants to UPPERCASE_WITH_UNDERSCORE style  
						
						
						
						
					 
					
						2015-02-09 13:36:33 +02: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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fd1df86c44 
					 
					
						
						
							
							Fix dashboard issue after collaboration  migration  
						
						
						
						
					 
					
						2015-02-04 16:08:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						76f8904718 
					 
					
						
						
							
							Introducing Collaboration Struct  
						
						
						
						
					 
					
						2015-01-23 09:54:16 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						74b31566cf 
					 
					
						
						
							
							Finsih add/remove repo in organization  
						
						
						
						
					 
					
						2014-08-26 18:11:15 +08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e0f9c628c5 
					 
					
						
						
							
							Add create organization  
						
						
						
						
					 
					
						2014-06-25 00:44:48 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ad5ec45dd6 
					 
					
						
						
							
							Fix   #165  
						
						
						
						
					 
					
						2014-06-21 00:51:41 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						914ffa496f 
					 
					
						
						
							
							Show private repository activities in dashboard if has access  
						
						
						
						
					 
					
						2014-05-08 19:17:43 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e867283406 
					 
					
						
						
							
							Assignee back end  
						
						
						
						
					 
					
						2014-05-08 12:24:11 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f6c4fbeb37 
					 
					
						
						
							
							Collaborator  
						
						
						
						
					 
					
						2014-05-01 11:32:12 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						49c01c0b57 
					 
					
						
						
							
							Fix import path  
						
						
						
						
					 
					
						2014-04-18 09:35:09 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						90f6aa8cd1 
					 
					
						
						
							
							Add repo mirror and import  
						
						
						
						
					 
					
						2014-04-12 20:35:35 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						33aa4f7438 
					 
					
						
						
							
							Support private repo  
						
						
						
						
					 
					
						2014-04-11 21:47:39 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e41ab839c7 
					 
					
						
						
							
							Use session for rolling back  
						
						
						
						
					 
					
						2014-04-04 18:55:17 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						79a610592e 
					 
					
						
						
							
							Add: rename repository  
						
						
						
						
					 
					
						2014-04-03 15:50:55 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2a0066420a 
					 
					
						
						
							
							Fix bug work with sqlite3  
						
						
						
						
					 
					
						2014-03-30 16:01:50 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f470c241d6 
					 
					
						
						
							
							IP: RC Code Review  
						
						
						
						
					 
					
						2014-03-27 11:37:33 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e51afe4621 
					 
					
						
						
							
							Add postgres support, clean code, code review  
						
						
						
						
					 
					
						2014-03-17 14:03:58 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3eb1ab9e8b 
					 
					
						
						
							
							Add UI for register user  
						
						
						
						
					 
					
						2014-02-17 18:38:50 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ee9bcf4d9f 
					 
					
						
						
							
							add publickey & access  
						
						
						
						
					 
					
						2014-02-17 23:57:23 +08:00