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 |
|
wemeya
|
9b5cb57d2a
|
change code according to travis CI
|
2016-06-01 17:57:33 +08:00 |
|
wemeya
|
af55312664
|
change code for review
|
2016-06-01 17:51:06 +08:00 |
|
kunw
|
a9c4d85530
|
merge from master
|
2016-06-01 17:22:51 +08:00 |
|
kunw
|
b52de143b3
|
updates for destination and replication feature of UI.
|
2016-06-01 17:20:06 +08:00 |
|
Tan Jiang
|
886fb8eb67
|
fix annotation error
|
2016-06-01 17:10:48 +08:00 |
|
wemeya
|
4d4ab9e408
|
Merge remote-tracking branch 'upstream/master'
|
2016-06-01 17:02:02 +08:00 |
|
wemeya
|
ffd58c0f2d
|
add api to list top 10 repos
|
2016-06-01 17:01:43 +08:00 |
|
kun wang
|
54e54433e1
|
Merge pull request #283 from liubin/add-support-for-Japanese
add Japanese support
|
2016-06-01 16:33:13 +08:00 |
|
Tan Jiang
|
33c979974d
|
fix annotation error
|
2016-06-01 16:08:40 +08:00 |
|
Tan Jiang
|
7b79283cad
|
Merge remote-tracking branch 'upstream/job-service' into job-service
|
2016-06-01 16:04:24 +08:00 |
|
Daniel Jiang
|
03389abb96
|
Merge pull request #298 from reasonerjt/api-attributes
update attributes of api
|
2016-06-01 15:43:52 +08:00 |
|
Wenkai Yin
|
aadef3c10f
|
Merge pull request #297 from ywk253100/sync_image
Sync image
|
2016-06-01 15:32:21 +08:00 |
|
Tan Jiang
|
bf86f1ff58
|
update attributes of api
|
2016-06-01 15:17:05 +08:00 |
|
Wenkai Yin
|
610566fe73
|
Merge branch 'master' into sync_image
|
2016-06-01 15:10:52 +08:00 |
|
Wenkai Yin
|
8c6ea744c2
|
modify test codes of registry client to pass test
|
2016-06-01 15:09:10 +08:00 |
|
xiahaoshawn
|
0250086758
|
Merge remote-tracking branch 'upstream/master' into new-version-of-ui
|
2016-06-01 14:51:43 +08:00 |
|
kunw
|
c8d0d06464
|
update for checking project-member and sign-in field update options.
|
2016-06-01 14:50:34 +08:00 |
|
kunw
|
3c530f63f0
|
Merge branch 'master' into new-ui-with-sync-image
|
2016-06-01 14:03:52 +08:00 |
|
kunw
|
f6430c98ce
|
refactored on route config for details page.
|
2016-06-01 14:01:35 +08:00 |
|
Wenkai Yin
|
8206ef2dcb
|
Merge pull request #296 from ywk253100/bug_fix_get_member
bug fix: the length should be 0 when initialize a slice
|
2016-06-01 13:52:07 +08:00 |
|
Wenkai Yin
|
297e5c4a44
|
Merge remote-tracking branch 'upstream/job-service' into sync_image
|
2016-06-01 13:50:19 +08:00 |
|
Wenkai Yin
|
07c7ce403c
|
bug fix: the length should be 0 when initialize a slice
|
2016-06-01 13:47:23 +08:00 |
|
Daniel Jiang
|
38d68bec0c
|
Merge pull request #295 from reasonerjt/job-service
update travis.yml and fix build issues
|
2016-06-01 13:37:44 +08:00 |
|
Tan Jiang
|
e152d83d79
|
Merge remote-tracking branch 'upstream/job-service' into job-service
|
2016-06-01 13:34:55 +08:00 |
|
Tan Jiang
|
bd223796b4
|
fix issue in travis
|
2016-06-01 13:28:02 +08:00 |
|
Tan Jiang
|
c18fb10f80
|
install mysql 5.6 on travis
|
2016-06-01 13:06:01 +08:00 |
|
Tan Jiang
|
9f06617ea6
|
install mysql 5.6 on travis
|
2016-06-01 12:57:10 +08:00 |
|
Tan Jiang
|
82840368ff
|
install mysql 5.6 on travis
|
2016-06-01 12:35:44 +08:00 |
|
wemeya
|
498d2e629a
|
change code according to review
|
2016-06-01 12:27:26 +08:00 |
|