Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-11 03:25:21 +01:00
Code Issues Projects Releases Wiki Activity
1,708 Commits 53 Branches 317 Tags 335 MiB
a75165adc5
Commit Graph

1708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tan Jiang
884f496854 Merge remote-tracking branch 'upstream/api-attribute-rename' into api-attributes 2016-06-03 18:51:26 +08:00
Tan Jiang
2a79a577e9 update swagger 2016-06-03 18:50:42 +08:00
saga92
c46c8143eb Update README.md 2016-06-03 18:31:59 +08:00
saga92
16b3a331ea Update README.md 2016-06-03 18:30:59 +08:00
saga92
c0abb590de Update README.md 2016-06-03 18:30:02 +08:00
saga92
bcc51d685c Merge branch 'master' of https://github.com/saga92/harbor 2016-06-03 18:02:14 +08:00
saga92
919f11cec8 fix bugs 2016-06-03 18:02:02 +08:00
saga92
53382a2df3 Update README.md 2016-06-03 18:01:07 +08:00
Henry Zhang
6f1a446381 update roadmap 2016-06-03 17:03:58 +08:00
Henry Zhang
2154fcf1d3 update roadmap 2016-06-03 16:57:38 +08:00
Wenkai Yin
92b0eb0522 Merge pull request #310 from ywk253100/sync_image 
rename url to endpoint
 2016-06-03 16:17:30 +08:00
Wenkai Yin
93a4158d21 rename url to endpoint 2016-06-03 16:16:31 +08:00
kunw
86e13b6c02 Merge branch 'job-service' into new-ui-with-sync-image 2016-06-03 14:10:53 +08:00
Daniel Jiang
e7e23240f0 Merge pull request #308 from wknet123/master 
fixed bug of issue #284
 2016-06-03 13:05:39 +08:00
kunw
c43fc1a42b fixed bug of issue #284 2016-06-03 12:27:46 +08:00
wemeya
e985a587c2 modify as travis CI required 2016-06-02 19:15:23 +08:00
wemeya
26d7f77532 modify as travis CI required 2016-06-02 19:10:53 +08:00
wemeya
9f16403a22 modify test code 2016-06-02 19:03:04 +08:00
Wenkai Yin
5b7376f096 Merge pull request #306 from ywk253100/sync_image 
try to stop replication when a policy is disabled
 2016-06-02 18:21:35 +08:00
Wenkai Yin
10cf76a682 try to stop replication when a policy is disabled 2016-06-02 18:17:00 +08:00
wemeya
eb62beba31 modify merge conflicts 2016-06-02 17:57:39 +08:00
Wenkai Yin
ca6131e67d Merge pull request #305 from ywk253100/sync_image 
bug fix: the username in token is null when using basic auth
 2016-06-02 17:33:31 +08:00
wemeya
389a6037d5 change code as the review reqired 2016-06-02 17:33:10 +08:00
Wenkai Yin
396889280f bug fix: the username in token is null when using basic auth 2016-06-02 17:32:04 +08:00
kunw
32ab3164fa updates for adapting renamed model attributes and reformated code structures. 2016-06-02 16:56:16 +08:00
xiahaoshawn
575fc90e61 abstracted summary section as a directive 2016-06-02 15:44:53 +08:00
root
d66a8f913e merge master 2016-06-02 13:41:52 +08:00
kunw
b5c1985247 Merge branch 'api-attribute-rename' of https://github.com/vmware/harbor into api-attribute-rename 2016-06-02 12:30:57 +08:00
Daniel Jiang
82fb8df5a1 Merge pull request #303 from reasonerjt/api-attributes 
missed quotes around json tag...
 2016-06-02 12:20:17 +08:00
Tan Jiang
bbac16a033 missed quotes around json tag... 2016-06-02 12:14:40 +08:00
Daniel Jiang
f9f5f7f70a Merge pull request #302 from reasonerjt/api-attributes 
role info need to be in user model for now
 2016-06-02 12:11:39 +08:00
kunw
e3e0b48230 Merge branch 'api-attribute-rename' of https://github.com/vmware/harbor into api-attribute-rename 2016-06-02 12:11:16 +08:00
kunw
e8531edd39 updates for attribute-rename of js 2016-06-02 12:10:32 +08:00
Tan Jiang
1dcb19b519 role info need to be in user model for now 2016-06-02 12:07:30 +08:00
Daniel Jiang
0d209c12bf Merge pull request #301 from reasonerjt/api-attributes 
Api attributes
 2016-06-02 11:33:05 +08:00
wemeya
267152f8e6 change code according to review 2016-06-01 19:29:08 +08:00
wemeya
ccbe297bba change code according to travis CI 2016-06-01 18:12:06 +08:00
wemeya
1c9162559c change code 2016-06-01 18:07:33 +08:00
wemeya
c972406d0f change code 2016-06-01 18:02:32 +08:00