Commit Graph

1166 Commits

Author SHA1 Message Date
kunw
a204215870 Merge branch 'master' into new-ui-with-sync-image 2016-05-27 18:48:03 +08:00
kunw
caf0ee0a20 updates for replication-job and policy interactions of UI. 2016-05-27 18:47:06 +08:00
Wenkai Yin
4f0e64c404 support job deletion 2016-05-27 18:46:07 +08:00
wemeya
b29a41034c modify code according to review 2016-05-27 17:54:25 +08:00
wemeya
e4bffb59da Merge remote-tracking branch 'upstream/master' 2016-05-27 17:32:54 +08:00
Daniel Jiang
34490c1d02 Merge pull request #279 from reasonerjt/job-service
Job service integration
2016-05-27 16:25:10 +08:00
Tan Jiang
8817c24a27 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-27 16:21:55 +08:00
Tan Jiang
9493b8c238 integrate jobservice into docker-compose template 2016-05-27 16:21:32 +08:00
Wenkai Yin
116cc15804 Merge pull request #276 from ywk253100/sync_image
Sync image
2016-05-27 15:17:53 +08:00
Wenkai Yin
f76b45426c conflict fix 2016-05-27 15:15:57 +08:00
Wenkai Yin
50994cc183 Merge pull request #275 from ywk253100/sync_image
Sync image
2016-05-27 15:14:52 +08:00
Wenkai Yin
1e09cf899b fix 2016-05-27 15:04:20 +08:00
Wenkai Yin
a4d318dffe Merge pull request #274 from ywk253100/modify_authentication_of_repository_api
bug fix: create repository client with credential when basic auth is used
2016-05-27 12:25:35 +08:00
Wenkai Yin
119dd50418 buf fix: create repository client with credential when basic auth is used 2016-05-27 12:18:12 +08:00
Wenkai Yin
cdac114955 support tag transfer and deletion 2016-05-27 10:45:21 +08:00
kunw
8b9e1ebdee Merge branch 'master' into new-ui-with-sync-image 2016-05-26 18:52:35 +08:00
kunw
2abdd99992 update for list replication-policy of UI. 2016-05-26 18:51:23 +08:00
wemeya
b1adf74913 modify router 2016-05-26 18:06:37 +08:00
wemeya
4314c244e5 add instructions for new added api 2016-05-26 16:48:49 +08:00
xiahaoshawn
626aec5c79 merge with upstream 2016-05-26 14:42:49 +08:00
Wenkai Yin
039d94c13d Merge branch 'master' into sync_image
Conflicts:
	api/repository.go
2016-05-26 14:12:26 +08:00
Wenkai Yin
f7de4c5841 Merge pull request #255 from ywk253100/modify_authentication_of_repository_api
Some modifications for implements of API
2016-05-26 14:05:53 +08:00
Wenkai Yin
d42359c679 Merge branch 'master' into sync_image 2016-05-26 14:05:14 +08:00
Wenkai Yin
73f69254e2 Merge branch 'master' into modify_authentication_of_repository_api 2016-05-26 14:01:09 +08:00
Wenkai Yin
6b2b6dedd8 support Get /api/projects/:id 2016-05-26 13:59:03 +08:00
Wenkai Yin
2a0571fc64 remove goto 2016-05-26 13:26:10 +08:00
Daniel Jiang
14ce697025 Merge pull request #238 from yhua123/patch-1
Update for using static 'rsyslog.conf' instead command 'sed' in  Dockerfile of  the log container
2016-05-26 13:01:14 +08:00
Daniel Jiang
78be8eec65 Merge pull request #271 from ywk253100/buf_fix_268
fix #268
2016-05-26 12:38:21 +08:00
xiahaoshawn
f6e9827ed4 show user role on the project list page 2016-05-26 12:31:03 +08:00
xiahaoshawn
55d1b075f3 add project and repo statistics data to dashboad 2016-05-26 12:29:49 +08:00
Wenkai Yin
61e1b03a75 add delete state handlers 2016-05-26 11:27:16 +08:00
kunw
a180b852b9 updates for adding replication section of UI. 2016-05-25 18:24:01 +08:00
Wenkai Yin
535bea1b6b fix #268 2016-05-25 17:22:33 +08:00
Wenkai Yin
ce1bdb9212 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-25 16:52:11 +08:00
Wenkai Yin
3f95a954dc add state handler for deleting repository 2016-05-25 16:51:40 +08:00
Daniel Jiang
e5c0491298 Merge pull request #269 from reasonerjt/job-service
add tags in db, and support tags in dao and job service api
2016-05-25 16:38:07 +08:00
Tan Jiang
a2d2314708 add tags in db, and support tags in dao and job service api 2016-05-25 16:33:45 +08:00
wemeya
bf3e6ed8cf modify conficts 2016-05-25 15:45:30 +08:00
Wenkai Yin
84cfafaeb0 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-25 15:41:11 +08:00
Daniel Jiang
6faf722561 Merge pull request #267 from reasonerjt/job-service
Job service - security
2016-05-25 15:35:56 +08:00
Tan Jiang
b80e727b7f Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-25 15:26:24 +08:00
Wenkai Yin
0b57345a4d 1.add API for getting logs of job 2.trigger replication by creating policy or enabling policy 3.trigger replication by webhook 2016-05-25 15:25:16 +08:00
Tan Jiang
86112c942b enable secret validation on UI and let job service use this secret to communicate with uI 2016-05-25 15:24:44 +08:00
wemeya
ad9d80aee9 modify merge confict 2016-05-25 15:21:27 +08:00
wemeya
25a88f8e29 change code for user and logapi 2016-05-25 14:21:01 +08:00
kunw
8d30879fc2 updates for reload action when editing project-member. 2016-05-25 12:13:07 +08:00
kunw
bab38f2514 update messages for repositories and watching result of repo count. 2016-05-24 18:37:25 +08:00
kunw
6216799942 add have logged in and no items handles. 2016-05-24 18:22:06 +08:00
Wenkai Yin
bba7336674 Merge pull request #264 from ywk253100/sync_image
integrated with new API of project
2016-05-24 16:21:16 +08:00
Wenkai Yin
00b2880cdd integrated with new API of project 2016-05-24 16:19:45 +08:00