Wenkai Yin 14e71f0052 Merge branch 'master' into sync_image ... Conflicts: .travis.yml models/accesslog.go models/project.go models/user.go		2016-06-13 18:14:41 +08:00
..
accesslog.go	Merge branch 'master' into sync_image	2016-06-13 18:14:41 +08:00
authmodel.go	update file names, remove tests folder	2016-02-29 10:50:47 +08:00
base.go	modify merge conflicts	2016-06-02 17:57:39 +08:00
notification.go	Use registry 2.4 toget tag info from events	2016-04-26 20:06:21 +08:00
project.go	fix annotation error	2016-06-01 17:10:48 +08:00
replication_job.go	filter policies by name and project ID	2016-06-13 16:49:46 +08:00
repo.go	Use registry 2.4 toget tag info from events	2016-04-26 20:06:21 +08:00
role.go	add api for listing recent logs and changing user profile	2016-05-20 16:56:12 +08:00
toprepo.go	change code for review	2016-06-06 23:07:17 +08:00
user.go	Merge branch 'master' into sync_image	2016-06-13 18:14:41 +08:00