Commit Graph

385 Commits

Author SHA1 Message Date
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
Wenkai Yin
c4606d0383 Merge pull request #1467 from yhua123/dev
add new ldap auth and import user feature
2017-02-27 16:17:14 +08:00
yhua
c48d908515 add new ldap auth and import user feature 2017-02-27 15:13:49 +08:00
Tan Jiang
81502e1e59 refinement per review 2017-02-27 12:52:14 +08:00
kunw
46cef020eb Rename directory name. 2017-02-27 11:41:46 +08:00
Tan Jiang
776c34a0ae fix go vet and golint errors 2017-02-26 22:05:13 +08:00
Tan Jiang
7620cd3b86 refactor token service 2017-02-26 19:53:13 +08:00
kunw
5619e4e7e3 Added lastest UI codes. 2017-02-24 18:06:08 +08:00
kunw
23f0ff1ea5 Refactor Harbor Clarity integration code structure. 2017-02-24 17:54:50 +08:00
Wenkai Yin
9f3f48be59 add harbor network to adminserver 2017-02-24 14:35:11 +08:00
Wenkai Yin
414e8a8bcf Merge remote-tracking branch 'upstream/dev' into 170224_merge_config
Conflicts:
	make/docker-compose.tpl
	src/ui/service/token/authutils.go
2017-02-24 13:52:19 +08:00
Wenkai Yin
a1858098c5 using different secret to mark himself when communicates with other components 2017-02-23 18:24:32 +08:00
Wenkai Yin
e2c7cfc0ad support changing all configurations through API 2017-02-23 16:27:19 +08:00
Tan Jiang
160d5636fb add basic unit test cases for token service 2017-02-22 20:44:29 +08:00
Wenkai Yin
40eb6bb7d3 encrypt passwords enhancement 2017-02-22 16:59:28 +08:00
Steven Zou
668f39c732 Merge pull request #1419 from wknet123/harbor-clarity-integration
Fixed some issues and merged latest codes.
2017-02-22 12:27:28 +08:00
kunw
3a621faba3 Fixed some issues and merged latest codes. 2017-02-22 13:03:05 +08:00
Steven Zou
e829b04f1f Merge pull request #1407 from wknet123/harbor-clarity-integration
Harbor Clarity UI integration.
2017-02-22 11:26:23 +08:00
kunw
3c112f2a2c Harbor Clarity UI integration. 2017-02-21 14:54:42 +08:00
Wenkai Yin
385d76e6f2 Merge remote-tracking branch 'upstream/configuration' into 170214_encryption
Conflicts:
	src/common/utils/registry/auth/tokenauthorizer.go
	src/common/utils/test/adminserver.go
	src/jobservice/replication/transfer.go
	src/ui/api/config.go
2017-02-20 12:21:56 +08:00
Wenkai Yin
390f89ee0a encrypt passwords and secret 2017-02-17 18:23:21 +08:00
Daniel Jiang
4bc69f294f Merge pull request #1390 from wknet123/configuration
Add configuration of UI.
2017-02-17 14:39:09 +08:00
Wenkai Yin
2e3174f404 update 2017-02-15 15:28:50 +08:00
kun wang
8b8dcc6b17 Fix some missing semi-colons in JS. (#1357)
LGTM
2017-02-14 17:43:33 +08:00
kunw
09dc6909ae Update for some changes about configuration settings of UI. 2017-02-14 12:34:47 +08:00
Wenkai Yin
06519bb3f2 update 2017-02-13 17:17:46 +08:00
kunw
421288046e Add configuration features to UI. 2017-02-13 13:13:49 +08:00
Wenkai Yin
6dc6b4fa79 update Makefile 2017-02-10 17:03:21 +08:00
Wenkai Yin
58d17cbd72 Merge pull request #1314 from laz2/fix-1306-admin-top-repos
Fix visibility of top repos for admin (#1306)
2017-02-10 15:45:37 +08:00
Tan Jiang
1d2970c3c5 Merge branch 'master' into dev 2017-02-10 10:51:20 +08:00
Wenkai Yin
1fbb28ad8c update 2017-02-09 15:25:52 +08:00
Wenkai Yin
9ec11ac672 add test cases 2017-02-09 11:24:23 +08:00
kun wang
13eaedb84f Update for batch deletion of repos. (#1335)
NMT
2017-02-08 18:15:07 +08:00
Wenkai Yin
480ac427cc Merge remote-tracking branch 'upstream/configuration' into 161228_config
Conflicts:
	src/adminserver/systemcfg/store/json/driver_json_test.go
	src/adminserver/systemcfg/systemcfg_test.go
2017-02-08 15:16:53 +08:00
Wenkai Yin
f113f4a54f update 2017-02-08 14:58:21 +08:00
Wenkai Yin
dc432d5575 support multiple namespace fix #1217 2017-02-07 13:13:42 +08:00
Dmitry Lazurkin
444b7f97bf fix visibility of top repos for admin (#1306) 2017-01-21 19:06:43 +03:00
Wenkai Yin
bcc6a4bbf2 update 2017-01-20 16:52:03 +08:00
Wenkai Yin
b6e27f6ea2 Merge remote-tracking branch 'upstream/configuration' into 161228_config
Conflicts:
	tests/docker-compose.test.yml
2017-01-19 17:56:53 +08:00
Wenkai Yin
f1f78a5649 update 2017-01-19 17:56:08 +08:00
wemeya
7f949b1a95 add test for ldap.go (#1307)
LGTM
2017-01-19 10:09:56 +08:00
Wenkai Yin
24a935a25f Merge remote-tracking branch 'upstream/configuration' into 161228_config 2017-01-12 17:41:54 +08:00
Wenkai Yin
75f660fa77 Merge remote-tracking branch 'upstream/dev' into 161228_config
Conflicts:
	make/common/templates/ui/env
	src/ui/auth/ldap/ldap.go
	src/ui/config/config.go
2017-01-12 17:41:14 +08:00
Wenkai Yin
b62a958250 configure harbor 2017-01-12 17:15:32 +08:00
kun wang
84509fbb3e regulate some model attribute names. (#1303)
LGTM
2017-01-11 18:31:20 +08:00
kun wang
733a9fd628 Merge pull request #1302 from yhua123/dev
LGTM
2017-01-11 04:30:10 -06:00
yhua
7fbe811394 add ldap ping feature 2017-01-11 15:08:41 +08:00
yhua
c61016512f fix project name length and follow docker project name rule 2017-01-11 11:39:18 +08:00
Wenkai Yin
05436d7a73 Merge pull request #1301 from laz2/fix-783-filter-top-repos
Fix filtering top repositories (#783, #1281) (recreated for dev branch)
2017-01-10 10:42:52 +08:00
Dmitry Lazurkin
3c7a09a8c4 Fix filtering top repositories (#783, #1281) 2017-01-06 21:53:29 +03:00
wemeya
ce0a44010d add test file for systeminfo.go (#1288)
LGTM
2017-01-06 15:41:07 +08:00
Ricardo Katz
160e22f0fe Changes LDAP Library and other LDAP improvements (#1277)
* Changes LDAP library to go-ldap and creates new ldap timeout directive

* Add support for connection on LDAP using TLS
2016-12-30 16:03:30 +08:00
kun wang
226ab5a5f7 Add debounce to input fields. (#1273)
LGTM
2016-12-29 13:23:59 +08:00
kun wang
6088d45686 Fix clarifying color about message in modals. (#1258)
LGTM
2016-12-23 15:05:39 +08:00
Wenkai Yin
111638ae8e Merge pull request #1249 from yhua123/dev-update-registry
update registry from 2.5.0 to 2.5.1
2016-12-16 18:03:53 +08:00
kun wang
d50ec3808a Fixed error messages displaying in modals. (#1254)
LGTM
2016-12-16 17:27:40 +08:00
yhua
0249f2181a update registry from 2.5.0 to 2.5.1 2016-12-15 16:50:50 +08:00
Penghao Cen
1e57166962 Remove http timeout option on getting catalog 2016-12-12 20:42:28 +08:00
Tan Jiang
ee4cfa68d8 Merge branch 'master' into dev 2016-12-12 14:39:45 +08:00
Wenkai Yin
d6d4711700 1.fix issue: deleting repo action will fall in deadlock between two Harbor if they are configured to sync to each other 2. Filter notification request in nginx 2016-12-09 18:10:20 +08:00
Daniel Jiang
64ae107fe5 Merge pull request #1224 from ywk253100/161205_rm_auth_header
Do not add the authentication header to requests which are not sent to registry
2016-12-09 00:48:09 +08:00
yhua123
c74703434f Merge pull request #1225 from wknet123/dev
Update about checking comment length with non-ASCII characters
NMT
2016-12-08 16:23:23 +08:00
kunw
9e73abf8f6 Update checking comment length. 2016-12-08 15:57:03 +08:00
yhua123
ead0985d20 Merge pull request #1146 from wknet123/dev-update-swagger
Updates Swagger YAML for new added API.
NMT
2016-12-08 15:44:39 +08:00