Commit Graph

1357 Commits

Author SHA1 Message Date
yhua123
7ae8d54f72 Update .travis.yml
add sudo before hostcfg
2016-06-15 12:14:45 +08:00
Wenkai Yin
d77a78e4d1 Merge pull request #342 from wemeya/develop
change swagger.yml
2016-06-15 11:53:38 +08:00
kunw
3dcd9cff51 Merge remote-tracking branch 'upstream/job-service' into new-ui-with-sync-image 2016-06-15 11:43:17 +08:00
Wenkai Yin
7393c006c9 Merge pull request #341 from ywk253100/sync_image
bug fix: when no rows found, return nil not error
2016-06-15 11:42:28 +08:00
Wenkai Yin
96c9e4c202 bug fix: when no rows found, return nil not error 2016-06-15 11:29:14 +08:00
yhua123
f1b5ee1522 Create hbapidelrpo_test.go
add new test case for delete repo API
2016-06-15 11:20:34 +08:00
yhua123
fc92df0d17 Update testprepare.sh
change docker login address to localhost
2016-06-15 11:19:10 +08:00
yhua123
5f6b53b93b Update .travis.yml
1 change docker default login method from https to http
2 run test preparation
2016-06-15 11:02:33 +08:00
kunw
fe92146269 Merge branch 'job-service' into new-ui-with-sync-image 2016-06-15 10:47:58 +08:00
xiahaoshawn
6db9974609 Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into new-ui-with-sync-image 2016-06-15 10:25:03 +08:00
Wenkai Yin
e457487f68 Merge pull request #340 from ywk253100/sync_image
modify router
2016-06-14 18:52:10 +08:00
Wenkai Yin
7f31c3901b modify router 2016-06-14 18:49:23 +08:00
kunw
77abd8057d Merge branch 'job-service' into new-ui-with-sync-image 2016-06-14 18:48:27 +08:00
wemeya
a0e9d4e790 Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-14 18:47:33 +08:00
kunw
18509958a2 updates for destination operations of UI. 2016-06-14 18:47:32 +08:00
Wenkai Yin
f631d67020 Merge pull request #338 from ywk253100/sync_image
bug fix: deletion of repository which has been deleted should return 404
2016-06-14 18:34:10 +08:00
Wenkai Yin
f050c963d5 Merge branch 'bug_fix_for_delete_repo' into sync_image
Conflicts:
	api/repository.go
2016-06-14 18:25:08 +08:00
Wenkai Yin
12a72c0f6c bug fix: deletion of repository which has been deleted should return 404 2016-06-14 18:17:32 +08:00
wemeya
a2c073e8f9 change url error 2016-06-14 18:03:20 +08:00
Wenkai Yin
b24fa366ec Merge pull request #337 from ywk253100/sync_image
Sync image
2016-06-14 17:57:21 +08:00
Wenkai Yin
580276e17e Merge branch 'master' into sync_image 2016-06-14 17:41:54 +08:00
Wenkai Yin
6c543e6cac Merge pull request #334 from yhua123/patch-1
Update harborapi.go
2016-06-14 17:38:47 +08:00
Wenkai Yin
6282584654 Merge pull request #336 from yhua123/patch-2
Update hbapiaddprj_test.go
2016-06-14 17:38:25 +08:00
Wenkai Yin
b782e18b0c Merge pull request #333 from ywk253100/sync_image
remove duplicate mysql installation
2016-06-14 17:37:02 +08:00
Wenkai Yin
db9347135c bug fix 2016-06-14 17:33:37 +08:00
kunw
881f67d1bc updates for renamed model attributes of project. 2016-06-14 15:38:59 +08:00
kunw
ea344ef10e updates for adapting with renamed model attributes. 2016-06-14 14:54:00 +08:00
yhua123
21bd0ba9fa Update hbapiaddprj_test.go
fix one issue, project name should be lower case.
2016-06-14 14:31:35 +08:00
xiahaoshawn
9bef9f26d2 integrated top ten repositories and user logs to dashboard 2016-06-14 13:56:25 +08:00
yhua123
97c78c635c Update harborapi.go
1 add one new API test interface: delete repository
2 fix one sling usage issue
2016-06-14 13:47:11 +08:00
Wenkai Yin
fcfa009cad remove duplicate mysql installation 2016-06-14 13:04:31 +08:00
kunw
6b1e70eee9 Merge remote-tracking branch 'upstream/job-service' into new-ui-with-sync-image 2016-06-14 12:11:14 +08:00
Wenkai Yin
dba2ce3bf2 Merge pull request #332 from ywk253100/sync_image
assume Yes to remove
2016-06-14 12:07:48 +08:00
Wenkai Yin
df4766b43e add primary key annotation to models 2016-06-14 11:59:44 +08:00
Wenkai Yin
fa0898f98c assume Yes to remove 2016-06-14 11:38:10 +08:00
kunw
91eacb895c Merge branch 'job-service' into new-ui-with-sync-image 2016-06-14 11:22:03 +08:00
Wenkai Yin
c7418f43da Merge pull request #331 from ywk253100/sync_image
Sync image
2016-06-14 11:19:16 +08:00
Wenkai Yin
81600e8db4 bug fix 2016-06-14 11:14:48 +08:00
wemeya
5205bd2367 change url for toggle project 2016-06-13 18:51:14 +08:00
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
kunw
b2c7a7d44b Merge branch 'job-service' into new-ui-with-sync-image 2016-06-13 18:14:05 +08:00
kunw
cec58dc622 updates for creation of replication-policy and list-policy operations of UI. 2016-06-13 18:12:46 +08:00
Wenkai Yin
8f56e9fc4a Merge pull request #330 from ywk253100/sync_image
add modify policy
2016-06-13 17:54:05 +08:00
Wenkai Yin
bc0aa21441 add modify policy 2016-06-13 17:32:22 +08:00
Wenkai Yin
32857a9154 Merge pull request #329 from ywk253100/sync_image
filter policies by name and project ID
2016-06-13 16:57:43 +08:00
Wenkai Yin
39edccf549 filter policies by name and project ID 2016-06-13 16:49:46 +08:00
Wenkai Yin
784947a787 Merge pull request #328 from ywk253100/sync_image
Sync image
2016-06-13 14:40:25 +08:00
Wenkai Yin
cf7ee9a327 update implements of FilterTargets() 2016-06-13 14:24:13 +08:00
Wenkai Yin
82b4781571 update implements of FilterTargets() 2016-06-13 13:48:12 +08:00
kunw
da80adc025 updates for showing message when none of policy results. 2016-06-13 12:10:45 +08:00