Commit Graph

3999 Commits

Author SHA1 Message Date
Deng, Qian
ccfd206ae2 Merge branch 'master' into metadata_description 2017-12-13 15:21:57 +08:00
Wenkai Yin
c3e8795a0a
Merge pull request #3780 from ywk253100/171213_merge
Merge master branch codes
2017-12-13 14:58:20 +08:00
stonezdj
ec67974104 Refactor ldap
Changes include:

1. Use Session to manage the lifecycle of ldap connections
2. Abstract common AuthenticateHelper interface for db_auth, ldap_auth,
uaa_auth mode
2017-12-13 14:57:04 +08:00
Wenkai Yin
665a54edc3 Merge remote-tracking branch 'upstream/master' into 171213_merge 2017-12-13 13:40:24 +08:00
Daniel Jiang
90acafaea2
Merge pull request #3776 from wy65701436/pks-release
Add pks build bundle process
2017-12-13 13:13:36 +08:00
wangyan
a4490f1709 Add pks build bundle process 2017-12-12 19:36:06 -08:00
Wenkai Yin
62c652ede0
Merge pull request #3775 from pengpengshui/ping_replicationRule
Fix Replication Rule Ping target issue about #3770
2017-12-13 10:38:48 +08:00
Fuhui Peng (c)
f179e09cd0 Fix Replication Rule Ping target issue about #3770 2017-12-12 18:05:03 +08:00
yixingjia
ec269047c7
Merge pull request #3736 from yixingjia/HA
HA installation script
2017-12-12 16:27:28 +08:00
Wenkai Yin
17b5770743
Merge pull request #3738 from ywk253100/171204_swagger
Update the replicatoin APIs in swagger.yaml
2017-12-12 10:50:14 +08:00
Yan
bcb74dde83
Merge pull request #3730 from sigsbee/updateguide
Add link to user guide overview issue#3519
2017-12-10 20:49:24 -08:00
yixingjia
f4d0fd4d23
Merge pull request #3640 from yixingjia/moveconftoDB
Add database driver for Harbor configurations
2017-12-11 10:42:05 +08:00
Yan
f54ce1a1f6
Merge pull request #3765 from reasonerjt/fix-license-1.3
Fix the error License for 1.3 release
2017-12-08 02:47:15 -08:00
Tan Jiang
bf95d19798 Fix the error License for 1.3 release 2017-12-08 17:22:59 +08:00
Daniel Jiang
9193161f25
Merge pull request #3761 from vmware/add_api_testing
[Skip CI]add api testing for harbor including image pull and push
2017-12-08 17:11:59 +08:00
Steven Zou
61eefbaf6c add api testing for harbor including image pull and push 2017-12-08 16:16:50 +08:00
Deng, Qian
b15acdf151 Add UI for metadata description 2017-12-08 15:05:52 +08:00
yixingj
d328e2586e HA installation script
Add --ha options when install Harbor.

Currently it does nothing.
2017-12-07 22:56:57 +08:00
Daniel Jiang
6f4e27ef73
Merge pull request #3754 from wy65701436/fix-issux-#3751
Update prepare chmod to support python3
2017-12-07 18:51:24 +08:00
wangyan
8cd5ac5171 Update prepare chmod to support python3 2017-12-07 00:31:02 -08:00
yixingj
9b03c93afd Add database driver for Harbor configurations
1>Add a new database driver for configurations
2> change the current default driver from json
to database
2017-12-06 13:06:54 +08:00
Steven Zou
82d842d77c
Merge pull request #3741 from wy65701436/add-tc-concourse
Add test cases for concourse-ci
2017-12-04 04:53:47 -06:00
wangyan
2d047d03e7 Add test cases for concourse-ci 2017-12-04 01:42:15 -08:00
Qian Deng
5de872486c
Merge pull request #3692 from ywk253100/171127_repo_desc
Add update repository API to support description of repository
2017-12-04 17:25:38 +08:00
Wenkai Yin
075fab93c1
Merge pull request #3705 from ywk253100/171127_subscribe
Publish replication notification for manual, schedule and immediate trigger
2017-12-04 17:19:21 +08:00
Wenkai Yin
2ba3758472 Update the replicatoin APIs in swagger.yaml 2017-12-04 15:39:40 +08:00
Wenkai Yin
594d213630 Publish replication notification for manual, scheduel and immediate trigger 2017-12-04 15:07:30 +08:00
myufei
4e87152cd5 Add link to user guide overview issue#3519 2017-12-02 02:36:30 +08:00
Daniel Jiang
c7790ff37e
Merge pull request #3715 from stonezdj/ldap_e2e
Add LDAP e2e test
2017-12-01 10:57:38 +08:00
Daniel Jiang
975fb2e449
Merge pull request #3710 from vmware/ping_endpoint_dev
Fix ping target bug
2017-12-01 10:56:28 +08:00
stonezdj
73abc68cb4 Add LDAP e2e test 2017-11-30 18:53:53 +08:00
Daniel Jiang
7f4ef4e117
Update LICENSE and NOTICE file for 1.3 release (#3721) 2017-11-30 15:46:10 +08:00
Wenkai Yin
2d0fb14a91
Merge pull request #3709 from ninjadq/ping_endpoint_dev
Bump UI lib version to 0.5.16
2017-11-29 17:42:54 +08:00
Deng, Qian
092c19c666 Bump UI lib version to 0.5.16 2017-11-29 17:41:19 +08:00
Wenkai Yin
6094cca159
Merge pull request #3708 from ywk253100/171129_ping
Refactor ping target API
2017-11-29 17:29:01 +08:00
Wenkai Yin
7ccdce33a0 Refactor ping target API
Merge ping target API by ID into ping target API
2017-11-29 17:15:03 +08:00
Yan
13ffebcff7
Merge pull request #3702 from wy65701436/fix-ci-bug
Fix ci upload latest bundle bug
2017-11-28 15:02:01 +08:00
wangyan
48cdc0fb04 Fix ci upload latest bundle bug 2017-11-27 22:05:28 -08:00
Wenkai Yin
34f70ff3b6
Merge pull request #3693 from ywk253100/171127_schedual_trigger
Implement schedual trigger for replication
2017-11-28 13:43:01 +08:00
Wenkai Yin
fa85ad6d28
Merge pull request #3687 from ywk253100/171123_trigger_api
Add replication manual trigger API & update replication/policy API docs
2017-11-28 13:38:53 +08:00
Wenkai Yin
4161ce5459
Merge pull request #3666 from ywk253100/171120_watch_list
Implement the methods of WatchList
2017-11-28 13:36:55 +08:00
Andy Ladjadj
a1dce0d951
Update swagger.yaml
Fix semantic error:  add slash in the value of $refs in the swagger for
2017-11-27 23:55:49 +01:00
Daniel Jiang
d13321f2b5
Support getting user info via token in UAA Client (#3686) 2017-11-27 18:13:36 +08:00
Wenkai Yin
4902fdf2ef Implement schedual trigger for replication 2017-11-27 16:50:35 +08:00
stone
30e536b18b
Merge pull request #3683 from stonezdj/local_ldap_enhance
Ldap enhancement
2017-11-27 14:36:20 +08:00
Wenkai Yin
6b0ee138e5 Implement immediate trigger and the methods of WatchList 2017-11-27 14:23:21 +08:00
Wenkai Yin
8d9af50bbc Add update repository API to support description of repository 2017-11-27 14:18:57 +08:00
A31882(Wu Yi Chung)
0ae6eccde4 Replace Nginx-Proxy with Ingress 2017-11-27 09:25:24 +08:00
yixingjia
97c26f04e7
Merge pull request #3682 from yixingjia/fixclairpermission
Fix clair permission issue
2017-11-25 21:51:59 +08:00
A31882(Wu Yi Chung)
ae2b702ea5 Replace ReplicationController with Deployment 2017-11-24 16:50:09 +08:00