Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-25 10:07:43 +01:00
Code Issues Projects Releases Wiki Activity
2,974 Commits 55 Branches 321 Tags 340 MiB
55a39e9bf3
Commit Graph

548 Commits

Author SHA1 Message Date
Wenkai Yin
ac77ee3bc4 modify ping targat and put target api 2017-04-10 13:45:24 +08:00
Steven Zou
7325572f38 Refine sign-in form validation behavior 2017-04-10 10:58:10 +08:00
Steven Zou
a385684983 translate copyright to zh 2017-04-10 10:39:43 +08:00
Daniel Jiang
3543a4742f Merge pull request #1967 from ywk253100/170407_role 
Fixes out of range bug when listing projects
 2017-04-07 20:09:30 +08:00
Wenkai Yin
5c2bd7eecc fix bug 2017-04-07 19:47:08 +08:00
Daniel Jiang
49377c5bc8 Merge pull request #1962 from ywk253100/170407_adminserver_log_leak 
Fix logs leak
 2017-04-07 19:19:17 +08:00
Daniel Jiang
642dbe329e Merge pull request #1961 from wknet123/master-new 
Make role name consistent.
 2017-04-07 19:18:58 +08:00
Daniel Jiang
9327fd2c66 Merge pull request #1960 from ywk253100/170407_role 
Donot add projectadmin role to sysadmin when return roles, fix #1957
 2017-04-07 19:16:33 +08:00
Daniel Jiang
554c57fc19 Merge pull request #1958 from steven-zou/master 
update message files
 2017-04-07 19:15:46 +08:00
Wenkai Yin
746667bb38 donot add projectadmin role to sysadmin when return roles, fix #1957 2017-04-07 19:09:59 +08:00
Steven Zou
c5f88d6085 Fix UI related issue and update message files: 
- update message files
 - fix minor UI/UX issues
 - revoke inline alert fix css
 - fix css style
 2017-04-07 18:30:58 +08:00
kunw
3c95bbd53a Make role name consistent. 2017-04-07 18:28:37 +08:00
Wenkai Yin
cd86c50e29 donot dump response to log, fix #1950 2017-04-07 18:14:22 +08:00
Wenkai Yin
ff9a64c631 donot log sensitive message to logs, fix #1949 2017-04-07 17:58:57 +08:00
Fangyuan Li
bc30341a76 Merge branch 'master' into fix_typo 2017-04-07 00:22:53 -07:00
maplain
be96a3b17c add a missing format string argument 2017-04-07 00:21:08 -07:00
Daniel Jiang
93f5c78b4b Merge pull request #1948 from ywk253100/170406_secretkey 
Mount config to another dir, fix #1939
 2017-04-07 11:35:58 +08:00
Daniel Jiang
4dddd5e9b4 Merge pull request #1944 from ywk253100/170406_ping_target 
Do not return password of target
 2017-04-07 11:35:07 +08:00
Daniel Jiang
1b2ad034a4 Merge pull request #1943 from ywk253100/170405_member_api 
Return createtime and updatetime in GET members API
 2017-04-07 11:34:44 +08:00
Daniel Jiang
dcda6fe72c Merge pull request #1942 from steven-zou/master 
adjust the size of inputbox in related forms
 2017-04-07 11:34:06 +08:00
Daniel Jiang
7bf124735a Merge pull request #1929 from ywk253100/170405_subject 
Modify the subject of resetting password email
 2017-04-07 11:33:29 +08:00
Wenkai Yin
e60fd0530f mount config to another dir, fix #1939 2017-04-07 09:14:41 +08:00
Steven Zou
0c9e6755db adjust gauge css style 2017-04-06 19:12:29 +08:00
Steven Zou
74a4de6868 Merge remote-tracking branch 'upstream/master' 2017-04-06 19:08:48 +08:00
kunw
559011ce93 Update for hidding password in target. 2017-04-06 19:05:44 +08:00
Wenkai Yin
488e19f514 donot return password of target 2017-04-06 18:48:43 +08:00
ywk253100
7c64709402 modify the subject of resetting password email, fix #1919 2017-04-06 18:40:50 +08:00
Steven Zou
b640a22a66 adjust the size of inputbox in related forms 2017-04-06 18:33:00 +08:00
Wenkai Yin
3b56893f3c return createtime and updatetime, fix #1924 2017-04-06 18:18:15 +08:00
Daniel Jiang
d8a0e01214 Merge pull request #1926 from wknet123/master-new 
Fix UX issues.
 2017-04-06 17:59:17 +08:00
Steven Zou
4d3b0b99ef Shrink gauge size 2017-04-06 17:25:50 +08:00
Steven Zou
0d9934aa40 uncomment alert close timer 2017-04-06 16:21:57 +08:00
Steven Zou
8f0285b4cb Fix UI/UX issues: 
Use blur event to instead focusout
Fix mail/ldap server testing spinner and button disabling issues
Fix content area/more info margins and make alert as overlay
fix reset password form issues
fix reset password style issue
fix tootip display inssue on reset form
commit index.html change
 2017-04-06 16:12:22 +08:00
kunw
26a2582553 Refine expression. 2017-04-06 15:06:05 +08:00
Steven Zou
d7f8317382 change free to used 2017-04-06 15:06:05 +08:00
Steven Zou
a1769ac6dc fix free storage info bug 2017-04-06 15:06:05 +08:00
Steven Zou
dfda6b4772 fix gauge bug 2017-04-06 15:06:04 +08:00
Steven Zou
b361e6332d change free to used 2017-04-05 19:11:16 +08:00
Steven Zou
39cfaf4be3 fix free storage info bug 2017-04-05 19:00:02 +08:00
kunw
503a332937 Fix UX issues. 2017-04-05 18:51:37 +08:00
Steven Zou
9afd0c9c3c fix gauge bug 2017-04-05 18:37:27 +08:00
kunw
6b322a6e00 Fix some UX issues. 2017-04-05 15:20:21 +08:00
kun wang
3028fe5a71 Merge pull request #1907 from steven-zou/dev 
Fix minor style issues
 2017-04-05 01:06:24 -05:00
Steven Zou
30dc41b4bb fix style issues 2017-04-05 13:11:49 +08:00
kunw
0c53d9de51 Remove unused images. 2017-04-05 11:20:37 +08:00
Steven Zou
5db2e387c1 fix issue 1824: Move signoff to the sign-in route canActivate 2017-04-01 18:36:20 +08:00
Steven Zou
a25e736ad0 add loading icon to index and remove related console logs 2017-04-01 18:14:08 +08:00
Steven Zou
30c28f9d8d fix issue 1874: support metrics refresh 2017-04-01 17:37:00 +08:00
Steven Zou
34927dacfa Fix minor issue of layout 2017-04-01 16:53:49 +08:00
Steven Zou
5a02cdc1cd fix issue 1687: change fonts and layout of metrics 2017-04-01 16:33:06 +08:00
Steven Zou
7e542258ee fix issue 1897: password validation enhancement 2017-04-01 16:18:42 +08:00
Steven Zou
c3be926426 Merge pull request #1898 from wknet123/dev-sync 
Updates for clearing filter values after actions.
 2017-03-31 18:40:17 +08:00
Daniel Jiang
2878d0c8a6 Merge pull request #1896 from reasonerjt/dev 
Do not return 403 for HEAD
 2017-03-31 18:31:26 +08:00
kunw
a8233a5b9a Updates for clearing filter values after actions. 2017-03-31 18:28:21 +08:00
kun wang
7d42b73f83 Merge pull request #1886 from steven-zou/dev 
Fix issue 1709
 2017-03-31 18:13:53 +08:00
Steven Zou
ec0baa5785 fix issue of resetting password 2017-03-31 16:56:38 +08:00
Steven Zou
9947d1f4bc fix issue of package.json 2017-03-31 16:07:06 +08:00
Tan Jiang
f96bde1abb Do not return 403 for HEAD 2017-03-31 15:36:57 +08:00
Steven Zou
ead67ba374 fix copyrights and icon color issues 2017-03-31 15:00:49 +08:00
Steven Zou
c801a1cc82 fix dependency issue in package.json 2017-03-31 14:38:52 +08:00
kunw
00bd8f3194 Update for UX issues. 2017-03-31 00:51:03 +08:00
Steven Zou
a40cb3c5fb append package.json file 2017-03-30 19:30:04 +08:00
Daniel Jiang
53a19674bf Merge pull request #1885 from ywk253100/170330_fix 
Shorten comment message of user registered from LDAP
 2017-03-30 19:14:47 +08:00
Wenkai Yin
f0f305a69c return 412 when deleting a target used by a policy, fix #1881 2017-03-30 18:59:18 +08:00
Steven Zou
301a9c57c2 Implement metrics gauge 2017-03-30 18:57:32 +08:00
Wenkai Yin
b99ae2496d shorten message 2017-03-30 18:53:39 +08:00
kunw
b677e8338b Fix list job error message. 2017-03-30 16:07:14 +08:00
Steven Zou
aa8edc5f15 fix user constructor issue 2017-03-30 16:07:14 +08:00
Steven Zou
9b9be0253c fix issue 1860 and other minor remending 2017-03-30 16:07:14 +08:00
Wenkai Yin
966b476d36 mount ca dir to container, fix #1829 2017-03-30 16:07:14 +08:00
Wenkai Yin
fc1ec482a4 remove compress js flag 2017-03-30 16:07:14 +08:00
Steven Zou
791aaa0724 fix issues 2017-03-30 16:07:14 +08:00
Wenkai Yin
052bc429a7 update 2017-03-30 16:07:14 +08:00
Wenkai Yin
0d80608036 add ut 2017-03-30 16:07:14 +08:00
Wenkai Yin
c3a35510fd fix sending email bug, fix #1834 2017-03-30 16:07:14 +08:00
kunw
a1b3fe8a27 Fix UX issues. 2017-03-30 15:51:00 +08:00
kun wang
64bcbfde00 Merge pull request #1872 from steven-zou/dev 
Fix issue #1860 and other minor things
 2017-03-30 14:27:27 +08:00
Wenkai Yin
4236d47653 Merge remote-tracking branch 'upstream/dev' into 170329_send_email 2017-03-30 14:03:25 +08:00
Wenkai Yin
2528ad9c62 Merge pull request #1870 from ywk253100/170330_ca_download_dir 
Mount ca dir to UI container
 2017-03-30 13:52:27 +08:00
Wenkai Yin
0ec0349016 update 2017-03-30 13:51:56 +08:00
Steven Zou
03aa346efc fix user constructor issue 2017-03-30 13:40:36 +08:00
Steven Zou
3ec4310faf fix issue 1860 and other minor remending 2017-03-30 13:24:15 +08:00
Wenkai Yin
ec27e2dc07 remove compress js flag 2017-03-30 12:59:47 +08:00
Wenkai Yin
ee2a6748c0 mount ca dir to container, fix #1829 2017-03-30 12:50:20 +08:00
Steven Zou
e38a055451 fix issues 2017-03-30 12:33:42 +08:00
kunw
c88b705c8b Fix matched lang issue and some i18n messages. 2017-03-30 00:35:19 +08:00
Wenkai Yin
705452ac04 add ut 2017-03-29 23:12:17 +08:00
kunw
ed11d23e40 Lowercase language names. 2017-03-29 19:57:06 +08:00
kunw
04f1c8e625 Fix export function. 2017-03-29 19:18:17 +08:00
kunw
3fdb06377d Add styles.css 2017-03-29 19:04:56 +08:00
kunw
ae4fdff2c3 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-29 18:40:38 +08:00
kunw
0616bb3219 Updates for date time format by locale. 2017-03-29 18:40:18 +08:00
Steven Zou
fdb7f9fa4b fix issue #1809 2017-03-29 18:25:21 +08:00
Steven Zou
fe5de50566 Fix UI issues 2017-03-29 16:17:17 +08:00
Wenkai Yin
189536e354 fix sending email bug, fix #1834 2017-03-29 15:54:02 +08:00
Steven Zou
86c8cbf0cd fix issue 1823 2017-03-28 23:50:02 +08:00
Steven Zou
ffd3b73232 fix related issues 2017-03-28 23:16:31 +08:00
kunw
fb79b4d730 Merge latest update. 2017-03-28 19:02:15 +08:00
kunw
ec3ddd82fd Updates for showing image ID and router tags. 2017-03-28 18:55:31 +08:00
Steven Zou
cd33432264 fix issue 1795 2017-03-28 18:37:03 +08:00
Steven Zou
b3ef639caf control the button status based on app config 2017-03-28 15:18:51 +08:00
Steven Zou
41bb91f279 applied unique message handler and fix signin issue when code is 401 2017-03-28 14:47:21 +08:00
kunw
52d679e16d Updates for message handlers and i18n messages for replication and endpoints. 2017-03-28 01:22:12 +08:00
kun wang
b433b2d54f Merge pull request #1816 from steven-zou/dev 
Add general message handler to handle the error messages as described in #1694
 2017-03-27 18:57:43 +08:00
Daniel Jiang
f142778826 Merge pull request #1815 from reasonerjt/fix-1811 
fixes 1811
 2017-03-27 18:53:41 +08:00
Steven Zou
3c05a35303 fix issue #1694: add general message handler to handler the error and error messages 2017-03-27 18:39:53 +08:00
Steven Zou
df6e3c5d0a fix self deletion issue of #1766 2017-03-27 16:35:26 +08:00
Tan Jiang
9e0b16c492 fixes 1811 2017-03-27 16:34:24 +08:00
Daniel Jiang
8cfdd1f5cc Merge pull request #1780 from ywk253100/170322_refactor_adminserver_test 
Refactor uts of adminserver
 2017-03-27 16:23:03 +08:00
Steven Zou
5fb2605a45 support 'remember me' and root cert downloading 2017-03-27 15:58:00 +08:00
Steven Zou
5c4e17638f Merge pull request #1808 from vmware/fix/merge_latest_ui_code_to_dev 
merge latest ui code to dev
 2017-03-27 13:47:16 +08:00
Wenkai Yin
4cc2115a23 Merge pull request #1710 from ywk253100/170321_url 
Refactor API URL.
 2017-03-27 13:26:32 +08:00
Steven Zou
88783af851 merge latest ui code to dev 2017-03-27 12:51:23 +08:00
Tan Jiang
5e2598028f remove root.json after getting the targets 2017-03-25 17:00:26 +08:00
Steven Zou
28a513f900 Merge pull request #1791 from wknet123/dev-revised 
Merge latest updates of UI.
 2017-03-24 18:42:38 +08:00
Wenkai Yin
5c4808bf93 update frontend codes 2017-03-24 18:38:33 +08:00
Wenkai Yin
bf83ea2506 Merge pull request #1788 from ywk253100/170324_ping_ldap 
Read password from config when calling ping ldap API if password is not provided
 2017-03-24 18:34:04 +08:00
kunw
fb862e5cb8 Merge latest updates of UI. 2017-03-24 18:29:51 +08:00
Wenkai Yin
12847f90d1 if password is not provided read it from config when calling ping ldap API 2017-03-24 18:00:21 +08:00
Tan Jiang
aa25c20f44 only admin can access registry's catalog API 2017-03-24 15:29:53 +08:00
Wenkai Yin
d83554013b Merge remote-tracking branch 'upstream/dev' into 170321_url 2017-03-24 14:56:55 +08:00
Wenkai Yin
e77e2333ec refactor some uts of adminserver 2017-03-24 13:07:45 +08:00
kunw
9a4ba69026 Fix issues per testing and merge latest updates. 2017-03-24 01:04:42 +08:00
kunw
801a83ffd5 Add restriction for repositories and tags. 2017-03-23 15:48:45 +08:00
kunw
01d9930b5a Merge latest updates for UX refinements. 2017-03-23 15:36:41 +08:00
Wenkai Yin
9e12274309 Merge remote-tracking branch 'upstream/dev' into 170321_url 
Conflicts:
	src/ui/router.go
 2017-03-23 11:19:34 +08:00
kunw
9419b632f2 Merge latest UI codes. 2017-03-22 20:54:22 +08:00
Wenkai Yin
b461ba54a8 refactor api. 2017-03-22 14:30:49 +08:00
wy65701436
677359b606 remove file exist. 2017-03-21 22:20:44 -07:00
wy65701436
5a764d30ea remove file exist. 2017-03-21 22:07:12 -07:00
wy65701436
e667bd7a79 add version file 2017-03-21 18:39:09 -07:00
wy65701436
c5633f7ce8 add version support 2017-03-21 04:56:59 -07:00
Wenkai Yin
753a544294 fix merge issue 2017-03-21 16:29:51 +08:00
Wenkai Yin
383997f785 read capacity from adminserver 2017-03-21 16:28:24 +08:00
Daniel Jiang
e02dd11703 Merge pull request #1684 from ywk253100/170320_adminserver_client 
Abstract adminserver client into a single package
 2017-03-21 16:08:31 +08:00
Daniel Jiang
1320bc8685 Merge pull request #1698 from wknet123/dev-revised 
Update latest changes of UI codes for dev branch.
 2017-03-21 15:21:33 +08:00
kunw
084d6a2b91 Updates for new UI latest changes. 2017-03-21 14:20:32 +08:00
kunw
cef202cb54 Merge latest codes. 2017-03-21 12:09:27 +08:00
kunw
5c3fd9fc43 Merge latest updates. 2017-03-21 11:51:12 +08:00
Daniel Jiang
127bd09c59 Merge pull request #1676 from reasonerjt/deletion-control 
DELETE /api/repository returns 412 if the tag is signed in notary
 2017-03-21 10:55:45 +08:00
Wenkai Yin
67612aa2e3 abstract adminserver client into a single package 2017-03-21 01:00:26 +08:00
wy65701436
769ca125f9 rm js and mp files 2017-03-20 07:59:35 -07:00
Yan
038d7dd90c Dev new ui (#1) 
* Updates for verfied tags deletion.

* Remove old UI.

* Move i18n folder.

* Updates for latest UI codes.

* make travis with latest dev code.

* update test code

* add cat log

* cat nginx

* cat nginx

* fix template error

* remove --with-notary

* remove controller test

* fix controller test bug

* modify controller test

* debug controller test

* update controller test

* update index title to harbor, discussed with Kun.

* Update package.json

* Merge latest UI changes.

* remove git
 2017-03-20 18:51:20 +08:00
Tan Jiang
aa769dbfa8 fix warning message 2017-03-20 18:13:50 +08:00
Tan Jiang
5017199885 fix go vet issue 2017-03-20 17:46:57 +08:00
Tan Jiang
1b3043f901 DELETE /api/repository returns 412 if the tag is signed in notary 2017-03-20 17:33:08 +08:00
Steven Zou
a311ade53d update ui code for fixing bugs and upgrade Clarity version to 0.8.7 2017-03-20 16:33:14 +08:00
Daniel Jiang
29f3e609e7 Merge pull request #1667 from ywk253100/170317_mount_data 
Mount directory data to adminserver phase 1
 2017-03-20 14:45:52 +08:00
Wenkai Yin
a40994852f remove duplicate codes 2017-03-20 14:01:43 +08:00
Wenkai Yin
3a167ddfce mount data directory to adminserver 2017-03-20 13:41:02 +08:00
Daniel Jiang
eda9aa189e Merge pull request #1634 from reasonerjt/more-systeminfo 
return ca root cert status in systeminfo
 2017-03-20 10:41:24 +08:00
Yan
92d9f8516f Merge pull request #1626 from ywk253100/170315_registry_upgrade 
Upgrade registry to 2.6.0
 2017-03-17 18:25:22 +08:00
Tan Jiang
5e229f7d96 systeminfo returns flag for ca root 2017-03-17 14:06:33 +08:00
Wenkai Yin
20e764636b fix search bug 2017-03-16 16:26:04 +08:00
Wenkai Yin
9d8366d89e Merge remote-tracking branch 'upstream/dev' into 170315_ping_email 
Conflicts:
	src/ui/api/harborapi_test.go
 2017-03-16 15:54:15 +08:00
Wenkai Yin
ca15c0e093 update ut cases 2017-03-16 15:17:21 +08:00
Wenkai Yin
108aa21499 upgrade registry to 2.6.0 2017-03-16 13:44:16 +08:00
Wenkai Yin
b25f5f9692 ping email server API enhancement 2017-03-16 11:52:12 +08:00
Wenkai Yin
c3626edd42 reset config 2017-03-16 11:27:45 +08:00
Tan Jiang
e8af73aff6 fix notary test error 2017-03-15 19:50:37 +08:00
kunw
a80008d0f9 Remove old UI. 2017-03-15 17:27:10 +08:00
Steven Zou
f6b9427de5 fix dashboard route issue 2017-03-14 18:37:05 +08:00
Steven Zou
079cca5f91 merge latest ui code to fix block issues 2017-03-14 18:01:18 +08:00
kunw
959af275d8 Updates for verfied tags deletion. 2017-03-13 19:34:30 +08:00
kunw
e80840c2d3 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-13 18:23:09 +08:00
kunw
d700786878 Merge latest UI codes. 2017-03-13 18:20:45 +08:00
Daniel Jiang
58a05c0aaf Merge pull request #1563 from ywk253100/170310_top_repo 
Refactor getting top repo API to return more info
 2017-03-13 10:45:36 +08:00
Tan Jiang
ef906c96d0 provide systeminfo API for UI 2017-03-10 18:53:11 +08:00
Wenkai Yin
fea1ae4e26 refactor getting top repo API to return detail info 2017-03-10 15:23:22 +08:00
Wenkai Yin
39f786dbbc Merge pull request #1557 from ywk253100/170309_get_tag 
Refactor getting tags API to return more info
 2017-03-10 15:22:25 +08:00
Daniel Jiang
6eb2912aad Merge pull request #1554 from ywk253100/170309_bug_fix 
bug fix in search API: do not return duplicate projects when user does not login
 2017-03-09 20:20:19 +08:00
Wenkai Yin
d7b867ebcc bug fix in search API: do not return duplicate projects when user does not login 2017-03-09 17:34:34 +08:00
Wenkai Yin
3cb53011eb refactor get tags API to return more info 2017-03-09 17:30:00 +08:00
Wenkai Yin
c8802f05ad refactor get tag API 2017-03-09 14:48:25 +08:00
Daniel Jiang
40653436b1 Merge pull request #1551 from ywk253100/170308_test_case 
Modify test cases for get repo API
 2017-03-09 14:24:18 +08:00
Steven Zou
e115f8b577 merge latest ui_ng code in 2017-03-09 10:18:03 +08:00
Wenkai Yin
18402f84f0 modify test cases 2017-03-08 20:42:40 +08:00
Tan Jiang
42bc430cfd update swagger, fix minor issues in test 2017-03-08 13:57:34 +08:00
Wenkai Yin
f7fe063436 fix conflict 2017-03-08 10:57:17 +08:00
Wenkai Yin
aaa27386c9 Merge pull request #1534 from reasonerjt/notary-integration 
Provide a api for retrieving the signature of a repo.
 2017-03-07 21:11:03 +08:00
Tan Jiang
8ec94a6d0a fix golint issue 2017-03-07 19:34:02 +08:00
Tan Jiang
d983982d19 provide api to fetch repository's signature information from Harbor's nested notary intance 2017-03-07 19:14:00 +08:00
Steven Zou
da3ebdcdcd merge ui_ng 2017-03-07 17:20:33 +08:00
Daniel Jiang
c1d9d68232 Merge pull request #1518 from ywk253100/170306_search 
Refactor search API to return more info
 2017-03-07 13:12:53 +08:00
Daniel Jiang
b16a8843a2 Merge pull request #1512 from ywk253100/1703002_email_ping 
Support email ping
 2017-03-07 13:06:30 +08:00
Wenkai Yin
1d83d8b642 remove cache 2017-03-07 12:28:24 +08:00
Wenkai Yin
dfae869dce add test cases 2017-03-06 18:03:31 +08:00
Wenkai Yin
d6a6f67596 refactor search API to return more info 2017-03-06 17:47:05 +08:00
Daniel Jiang
d5a4e5cc20 Merge pull request #1513 from reasonerjt/token-service-refactory 
support generate UI token for notary
 2017-03-06 15:59:13 +08:00
Daniel Jiang
c619bb9294 Merge pull request #1490 from ywk253100/170301_config 
Read some configs from env when start up
 2017-03-06 12:40:21 +08:00
Tan Jiang
109db458c3 support generate UI token for notary 2017-03-06 12:17:22 +08:00
Wenkai Yin
0a80d7fee2 fix bug in sending email 2017-03-03 18:10:28 +08:00
Wenkai Yin
23bf2f0ddf support ping email server 2017-03-03 16:36:13 +08:00
Wenkai Yin
a4cb261df9 read some configs from env 2017-03-02 13:24:41 +08:00
Steven Zou
ac6c26d6db Merge pull request #1483 from vmware/feature/merge_ui_ng_code 
merge code for building
 2017-02-28 12:51:44 +08:00
Steven Zou
dcc88cbea2 merge code for building 2017-02-28 12:46:15 +08:00
Tan Jiang
71c9fcf849 remove confusing comment 2017-02-28 11:37:09 +08:00
Tan Jiang
6454ccfc3a fix the 'v2' URL conflict issue, and remove the work around in token service code 2017-02-27 21:01:26 +08:00
kunw
44ea387f02 Updates for configuration ldap scope. 2017-02-27 19:12:19 +08:00
Steven Zou
2e20a65121 Merge pull request #1458 from wknet123/harbor-clarity-integration 
Merge Harbor clarity integration to into Dev branch.
 2017-02-27 16:20:22 +08:00