Commit Graph

11446 Commits

Author SHA1 Message Date
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
kunw
2011453d4b changed sign-in redirect to dashboard page 2016-05-24 15:15:50 +08:00
Wenkai Yin
e3884bd513 Merge pull request #263 from ywk253100/sync_image
Sync image
2016-05-24 15:08:49 +08:00
Wenkai Yin
55bc9de505 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-24 15:03:44 +08:00
Wenkai Yin
de72efaba8 CRUD of target API 2016-05-24 14:59:36 +08:00
kunw
29d10baac1 Merge branch 'master' into new-version-of-ui 2016-05-24 13:52:43 +08:00
kunw
c0f16a620b updates for pull-command and popover-details of UI. 2016-05-24 13:50:09 +08:00
Daniel Jiang
ea8c5bb251 Merge pull request #262 from reasonerjt/job-service
api will handle replication job for a single repo
2016-05-24 13:24:22 +08:00
Tan Jiang
86e44363a7 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-24 13:20:52 +08:00
Tan Jiang
58e7ab95a4 merge with master 2016-05-24 13:20:11 +08:00
Tan Jiang
6fcb532da3 Merge branch 'job-service' of https://github.com/vmware/harbor into job-service 2016-05-24 13:16:24 +08:00
Tan Jiang
b537225f16 /replicationJobs api will handle creating a job for a single repository 2016-05-24 13:15:27 +08:00
Daniel Jiang
5374f213c0 Merge pull request #261 from reasonerjt/job-service
store log in fs, provide api for getting log of a job
2016-05-24 11:10:48 +08:00
Tan Jiang
0a2b9b320b remove job_log table 2016-05-24 11:08:49 +08:00
Tan Jiang
616d96496a update the depth in New func 2016-05-24 11:02:03 +08:00
Daniel Jiang
db908edf87 Merge pull request #256 from saga92/master
add orm singleton
2016-05-24 11:01:19 +08:00
kunw
ce2454472b Merge branch 'new-version-of-ui' of https://github.com/vmware/harbor into new-version-of-ui 2016-05-24 10:54:23 +08:00
kunw
d3a7beb0ba updates for popup-details feature of UI. 2016-05-24 10:53:52 +08:00
kun wang
a48e3298f7 Merge pull request #260 from xiahaoshawn/new-version-of-ui
fix JavaScript code error detect by JSHint
2016-05-24 10:51:24 +08:00
saga92
de51b247f7 make singleton thread safe 2016-05-24 09:41:34 +08:00
Tan Jiang
da6f7f8a8c store log in fs, provide api for getting log of a job 2016-05-23 19:39:13 +08:00