Commit Graph

1097 Commits

Author SHA1 Message Date
wemeya
e34162bcb5 modify syntax error 2016-06-07 20:38:56 +08:00
wemeya
0147ec8d3b Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-07 20:35:24 +08:00
kun wang
2784e72151 Merge pull request #323 from wknet123/master
update for listing repo name contains dot.
2016-06-07 18:09:10 +08:00
kunw
f3723384b1 update for listing repo name contains dot. 2016-06-07 17:49:17 +08:00
kunw
36c1e7ae72 Merge branch 'new-ui-with-sync-image' of https://github.com/vmware/harbor into new-ui-with-sync-image 2016-06-07 16:49:44 +08:00
kunw
ea43ff7c28 updates for replication and destination UI. 2016-06-07 16:49:38 +08:00
Daniel Jiang
8a55cd8efc Merge pull request #322 from yhua123/master
update .travis and go lib dir
2016-06-07 16:11:45 +08:00
yhua
227ea57d6e update .travis 2016-06-07 16:00:46 +08:00
yhua
2c9ff58a81 Merge remote-tracking branch 'upstream/master'
merge code for develop 20160607
2016-06-07 15:02:45 +08:00
yhua
bd8f311d1b test for travis and github lib(1) 2016-06-07 14:55:04 +08:00
yhua
2f8ec6461b test for travis and github lib 2016-06-07 14:40:37 +08:00
Daniel Jiang
285572e64b Merge pull request #319 from vmware/api-attribute-rename
Api attribute rename
2016-06-07 14:26:39 +08:00
Daniel Jiang
fdeba6acd0 Merge pull request #321 from reasonerjt/master
remove .swp files
2016-06-07 14:26:12 +08:00
kunw
efc141e811 Merge branch 'job-service' into new-ui-with-sync-image 2016-06-07 14:25:17 +08:00
kunw
cbb6491970 merge updates of new-version-of-ui 2016-06-07 14:24:01 +08:00
Tan Jiang
46187d6fa8 remove .swp files 2016-06-07 14:06:29 +08:00
kunw
617c39d2a9 Merge branch 'master' into new-ui-with-sync-image 2016-06-07 14:00:16 +08:00
kun wang
bd0ef1eb3d Merge pull request #272 from xiahaoshawn/new-version-of-ui
LGTM
2016-06-07 13:59:41 +08:00
Wenkai Yin
52c7f9716b Merge pull request #317 from ywk253100/sync_image
Sync image
2016-06-07 13:58:16 +08:00
Daniel Jiang
e4d4e8a92f Merge pull request #320 from yhua123/master
for API testing (support Travis automation testing)
2016-06-07 13:52:18 +08:00
Wenkai Yin
cc890adf49 Merge branch 'master' into sync_image 2016-06-07 13:51:15 +08:00
Wenkai Yin
f91d2f1eba Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-06-07 13:48:10 +08:00
yhua
202a2a91c5 remove cat 2016-06-07 13:41:27 +08:00
Wenkai Yin
6788f891f1 add test for dao metod 2016-06-07 13:41:02 +08:00
yhua
12e15de42e change docker status 2016-06-07 13:28:51 +08:00
kunw
0151639ebd updates for item-detail.js 2016-06-07 13:00:08 +08:00
yhua
83a88e5ec0 automation testing 2016-06-07 12:27:21 +08:00
yhua
00f69eb327 automation testing 2016-06-07 12:19:48 +08:00
xiahaoshawn
b338af3973 update local message 2016-06-07 11:56:10 +08:00
kunw
b8201688d6 Merge branch 'api-attribute-rename' of https://github.com/vmware/harbor into api-attribute-rename 2016-06-07 11:55:14 +08:00
kunw
34e4c4e6f7 merged from upstream/master 2016-06-07 11:53:55 +08:00
wemeya
fbb26634a7 change code for travis ci 2016-06-06 23:47:27 +08:00
shixi_weimeng
8459fcf7dc change code for review 2016-06-06 23:07:17 +08:00
wemeya
411ead21fc change code for review 2016-06-06 17:53:36 +08:00
Wenkai Yin
4fbe18cb03 pass golint 2016-06-06 17:46:19 +08:00
Wenkai Yin
e8cad0f9f3 pass golint 2016-06-06 17:42:16 +08:00
Wenkai Yin
3f6eace9cb pass golint 2016-06-06 17:36:48 +08:00
Wenkai Yin
f4e6d048b2 add validation to create, update policies and targets 2016-06-06 17:31:47 +08:00
wemeya
15ee62485f Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-06 16:35:59 +08:00
xiahaoshawn
21f0633d6d change as Kun's comments 2016-06-06 15:39:17 +08:00
xiahaoshawn
7def2ad824 merge with upstream 2016-06-06 15:01:33 +08:00
Daniel Jiang
cfa56fee61 Merge pull request #316 from reasonerjt/api-attributes
swagger update
2016-06-06 14:06:51 +08:00
Daniel Jiang
05e02ac843 Merge pull request #314 from hainingzhang/master
update readme
2016-06-06 13:23:22 +08:00
Henry Zhang
d2773958ac update readme 2016-06-06 12:07:30 +08:00
Daniel Jiang
dc14fc30c5 Merge pull request #312 from hainingzhang/master
create roadmap
2016-06-05 23:25:20 +08:00
Daniel Jiang
f1f6195615 Merge pull request #313 from saga92/master
remove fill update_time procedule& improve migrate guide
2016-06-05 23:24:30 +08:00
kunw
f267b6818e Merge branch 'job-service' into new-ui-with-sync-image 2016-06-05 00:12:32 +08:00
kunw
0e108fa74f Merge branch 'master' into new-ui-with-sync-image 2016-06-05 00:11:15 +08:00
kunw
3613c95576 updates for replication and destination integration with api 2016-06-04 23:59:02 +08:00
saga92
434b9ca5ac fix bugs 2016-06-04 10:10:22 +08:00