Commit Graph

659 Commits

Author SHA1 Message Date
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
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
Wenkai Yin
2e9b59a20a add test case 2016-12-08 15:18:51 +08:00
yhua123
6565a3da54 Merge pull request #1189 from wknet123/master-fix-save-comment
Fix save comment issue.
NMT
2016-12-08 14:59:45 +08:00
kunw
b0da7b6d89 Merge remote-tracking branch 'upstream/dev' into dev-fix-popup 2016-12-08 13:54:04 +08:00
kunw
3d9d106acb Fixed popup and inline help toggle issues. 2016-12-08 13:23:02 +08:00
Wenkai Yin
fb9aa78f75 do not add the authentication header to requests which are not sent to registry 2016-12-07 18:20:25 +08:00
kunw
47ddd97182 Update pagination of UI. 2016-12-06 12:16:59 +08:00
Tan Jiang
3f6301b587 remove timeout for replicating large image 2016-11-30 17:43:04 +08:00
kunw
da85b8f3cb Fix save comment issue. 2016-11-29 16:55:52 +08:00
kunw
92a37083d6 Merged master. 2016-11-28 12:16:37 +08:00
kunw
cb1fed8d0e Update i18 messages 2016-11-28 12:05:44 +08:00
yhua123
a192ce90c6 Merge pull request #1172 from wknet123/master-handle-sign-in-error
Fixed handle other errors while signing in.
NMT
2016-11-28 10:57:01 +08:00
yhua123
e99d4b8466 Merge pull request #1160 from wknet123/master-handle-rep-err
Updates for handling 404 response text.
NMT
2016-11-28 10:55:59 +08:00
kunw
3d0bf35ef1 Fixed handle other errors while signning in. 2016-11-25 18:01:15 +08:00
kunw
499141c193 Fixed handle errors about sending email. 2016-11-25 17:32:44 +08:00
kunw
277785febc Update some i18n messages. 2016-11-25 17:13:52 +08:00
kunw
50a057994e Updates for handling 404 response text. 2016-11-24 17:37:00 +08:00
kunw
e3f5e9e501 Updates Swagger YAML for new added API. 2016-11-22 19:19:17 +08:00
yhua123
96cf5ef866 Revert "Updates Swagger YAML for new added APIs." 2016-11-22 18:36:34 +08:00
yhua123
44205610ec Merge pull request #1143 from wknet123/master-update-swagger
Updates Swagger YAML for new added APIs.

Need test cases for these 2 new API~
2016-11-22 18:35:45 +08:00
kun wang
211c0424ff Replace the style of select-all button. (#1140)
* Replace the style of select-all button.

* Remove the button as discussion.

LGTM, maybe others will give more comments, merge first
2016-11-22 18:34:02 +08:00
kunw
df85ff0125 Updates Swagger YAML for new added APIs. 2016-11-22 18:13:40 +08:00
kunw
902af427af Fixed toggle admin button. 2016-11-21 15:10:24 +08:00
Daniel Jiang
57e01000c9 Merge pull request #1128 from reasonerjt/dev
fix GetIsInsecure
2016-11-21 02:15:49 +08:00
Tan Jiang
418d9bc2b6 handle the no session scenario in project controller 2016-11-18 20:00:15 +08:00
Tan Jiang
4a603f0913 add a test case 2016-11-18 19:32:35 +08:00
Tan Jiang
aab3dfee4e fix GetIsInsecure 2016-11-18 19:13:23 +08:00
kunw
b663b06b74 Change cert dir path. 2016-11-18 17:50:42 +08:00
kunw
d26e972fb6 Add dowload cert to UI. 2016-11-18 16:07:18 +08:00
Tan Jiang
0df31586bb hide the button if user doesn't have permission to create project 2016-11-18 14:11:58 +08:00
Daniel Jiang
64b3c7f261 Merge pull request #1100 from ywk253100/161116_sql_wildcard
Escapse % and _ in sql
2016-11-18 13:17:49 +08:00
yhua123
fba88b79ac Merge pull request #1116 from wknet123/dev-precise-volume-size
Update for precising volume size.
LGTM
2016-11-18 11:11:02 +08:00
kunw
f6303672a0 Update for precising volume size. 2016-11-17 19:01:29 +08:00
Wenkai Yin
a64891103d escapse % and _ in sql 2016-11-17 16:39:45 +08:00
kunw
a0d73b8bf6 Updates for form data check. 2016-11-17 14:22:31 +08:00
yhua123
fb3f001a47 Merge pull request #1098 from wknet123/dev-revised-pagination
Update pagination component.
need more test
2016-11-17 13:45:20 +08:00
yhua123
3be2fb7733 Merge pull request #1107 from wknet123/dev-restrict-timespan
Updates for restriction to time span.
need more test
2016-11-17 13:44:50 +08:00
yhua123
13e37ce6aa Merge pull request #1095 from wknet123/dev-optimize-sign-in
Updates for optimizing interaction with sign-in action.
need more test
2016-11-17 13:43:49 +08:00
yhua123
bb0e96fbfd Merge pull request #1091 from wknet123/dev-fix-message-colors
Update for showing red color to error messages.
need testing
2016-11-17 13:42:02 +08:00
yhua123
df023468cb Merge pull request #1096 from wknet123/dev-change-language-name
Change Chinese language name.
LGTM
2016-11-17 13:25:55 +08:00
kunw
15c713f927 Updates for restriction timespan. 2016-11-17 12:17:07 +08:00
Daniel Jiang
ffbe980622 Merge pull request #1101 from reasonerjt/config-refactory
Config refactory
2016-11-16 22:00:20 +08:00
Tan Jiang
1e599833fa fix go vet error 2016-11-16 21:44:15 +08:00
Tan Jiang
51581d8d47 merge 2016-11-16 20:36:02 +08:00
Tan Jiang
9d7a18a0a3 fix issue in golint, support project creation restriction at backend 2016-11-16 20:31:04 +08:00
kunw
8a536ea892 Update pagination component. 2016-11-16 19:08:25 +08:00
yhua123
6d901e2335 Merge pull request #934 from wknet123/dev-volume-info
Added volume info to UI.
need more test.
2016-11-16 18:19:30 +08:00
kunw
bc13881fcc Change Chinese language name. 2016-11-16 18:06:33 +08:00
kunw
2ccb521e42 Updates for optimizing interaction with sign-in action. 2016-11-16 17:54:47 +08:00
kunw
c9ab2d2eb7 Update for removing cookies about user info. 2016-11-16 15:32:17 +08:00
kunw
85d38830bf Update for showing red color to error messages. 2016-11-16 15:27:16 +08:00
kunw
51a23baeea Updates for changing JSON attribute name. 2016-11-16 14:35:10 +08:00
kunw
e367ec24a8 Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-16 14:23:27 +08:00
Tan Jiang
33da8b230e ui config direcotry 2016-11-16 13:33:14 +08:00
Tan Jiang
0e3cb2e3f4 ui config refactory 2016-11-16 13:33:14 +08:00
Tan Jiang
31eccec220 unset env vars in TC 2016-11-16 13:33:14 +08:00
Tan Jiang
c34b2872bc config refactory for common pkg 2016-11-16 13:33:14 +08:00
kun wang
05759cf0ad Merge pull request #1080 from yhua123/dev
LGTM
2016-11-16 12:05:33 +08:00
yhua
99223fc29f update code for statics testing 2016-11-16 11:42:16 +08:00
Tan Jiang
853a15349d unset env vars in TC 2016-11-15 18:55:17 +08:00
Tan Jiang
b01aace154 config refactory for common pkg 2016-11-15 18:37:36 +08:00
kunw
c1c5ba8157 Update for adding timestamp to JS file name to avoid browser cache. 2016-11-14 18:27:56 +08:00
Tan Jiang
49d07ff581 set path for language cookie 2016-11-14 13:59:23 +08:00
Daniel Jiang
32f8c92eb7 Merge pull request #1019 from rikatz/master
Improves namespace validation for Docker Notary integration
2016-11-10 08:27:14 +08:00
kunw
76958eaa96 Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-09 16:57:27 +08:00
kunw
55b98f9abd Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-09 14:53:26 +08:00
yhua123
0a4ecd765f Merge pull request #1043 from wknet123/dev-set-autocomplete-off
Set form autocomplete to off
LGTM
2016-11-09 14:45:43 +08:00
kun wang
126b7fae55 Merge pull request #1023 from fillet54/add-mail-identity-config
Make mail identity configurable
2016-11-09 14:35:09 +08:00
kunw
8dbc391790 Set form autocomplete to off 2016-11-09 12:28:57 +08:00
Ricardo Pchevuzinske Katz
7a1212db45 Corrected the registryURL var name 2016-11-08 21:52:22 -02:00
Ricardo Pchevuzinske Katz
804759cbdb Corrected the registryURL var name 2016-11-08 21:36:53 -02:00
Ricardo Pchevuzinske Katz
72b44a17c6 Improved Harbor URL detection on Notary Requests 2016-11-08 20:12:58 -02:00
kunw
d166b8117b Updates for refining some i18n messages. 2016-11-07 18:21:31 +08:00
yhua123
ddc9e4538b Merge pull request #999 from wknet123/dev-ux-refinements
Updates for refinements of UX.
2016-11-07 15:31:05 +08:00
Phillip Gomez
0dfce1d837 Make mail identity configurable
The identity field parameter passed to smtp.SendMail is now
configurable instead of being hardcoded to 'Mail Config'.

This fixes issue #900
2016-11-06 18:05:46 -08:00
Ricardo Pchevuzinske Katz
802fea6633 Fix the repoLenght variable verification 2016-11-05 01:04:52 -02:00
Ricardo Pchevuzinske Katz
dbcbe80084 Improve Project Name handling for Docker Notary requests 2016-11-05 00:57:57 -02:00
Daniel Jiang
ddd03c55d3 Merge pull request #976 from wknet123/dev-show-totals
Updates for displaying pagination total number.
2016-11-04 15:30:33 +08:00
kunw
0f553aa4e2 Updates for checking cookie status. 2016-11-02 18:30:08 +08:00
kunw
10f69d5250 Updates for refinements of UX. 2016-11-02 18:01:07 +08:00
kunw
98a7c4adf6 Changes for golint checkings. 2016-11-02 13:03:42 +08:00
kunw
560b41b5e6 Merge remote-tracking branch 'upstream/dev' into dev-volume-info 2016-11-02 12:46:57 +08:00
kunw
e6b5714f7d Undo changes for session.current-user.js file. 2016-11-02 12:26:24 +08:00
kunw
075c9e378d Change template file for multi-language settings. 2016-11-02 12:03:05 +08:00
kunw
8a7f80a2a7 Merge remote-tracking branch 'upstream/dev' into dev-language-cookies 2016-11-02 11:51:04 +08:00
kunw
4a81f7796b Fixes issues about setting cookies in multi-language. 2016-11-02 11:48:43 +08:00
Daniel Jiang
171b17b202 Merge pull request #971 from ywk253100/161028_fix_961
User can not be deleted in LDAP authentication mode.
2016-10-31 12:39:24 +08:00
Wenkai Yin
8fe0a333a8 user can not be deleted in LDAP authentication mode 2016-10-31 10:53:11 +08:00
Daniel Jiang
a05a9c1afd Merge pull request #982 from reasonerjt/dev
recognize vic in notification handler
2016-10-31 10:09:53 +08:00
Tan Jiang
0b86da91e9 recognize vic in notification handler 2016-10-30 19:58:27 +08:00
yhua123
43b10fb404 Merge pull request #972 from wemeya/role
modify user_test.go
2016-10-29 22:08:54 +08:00
kun wang
7a14e69ea0 Merge pull request #974 from wknet123/dev-admin-options
Updates for issues about account settings.
2016-10-28 04:55:55 -05:00
kunw
1d18f5d154 Updates for controller tests. 2016-10-28 17:30:00 +08:00
kunw
8c9435324d Updates for controller tests. 2016-10-28 17:14:09 +08:00
Daniel Jiang
c732b624e9 Merge pull request #970 from zgdxiaoxiao/api-test3
add test case of search api
2016-10-28 16:56:33 +08:00
kunw
08b4851fc8 Updates for controller test cases. 2016-10-28 16:50:40 +08:00
kunw
54696b1112 Updates for redirections when user is not an admin. 2016-10-28 16:12:51 +08:00
wemeya
23487bebba modify user_test.go 2016-10-28 15:31:54 +08:00
Wenkai Yin
5cf381fc43 Merge pull request #969 from wemeya/role
modify log_test.go
2016-10-28 15:05:12 +08:00
kunw
26b1df4bdb Merge branch 'dev' into dev-admin-options 2016-10-28 14:57:00 +08:00
Daniel Jiang
ce40b26ff2 Merge pull request #949 from wknet123/dev
Updates for link of logs on dashboard.
2016-10-28 14:41:36 +08:00
zgdxiaoxiao
9252dbe7a0 add test case of search api 2016-10-28 14:30:19 +08:00
kunw
5cefe5c91f Updates for handling errors of UI. 2016-10-28 14:07:33 +08:00
kunw
509c68a781 Updates for issues of account settings in LDAP. 2016-10-28 13:53:47 +08:00
wemeya
9d3d7e6502 modify log_test.go 2016-10-28 13:44:30 +08:00
Daniel Jiang
76abe30d4d Merge pull request #955 from ywk253100/161027_fix_895
Fix #895
2016-10-28 12:45:49 +08:00
Daniel Jiang
5a01a41121 Merge pull request #956 from ywk253100/161027_fix_883
Fix #883
2016-10-28 12:45:18 +08:00
kunw
61657600b3 Updates for displaying pagination total number. 2016-10-28 11:44:43 +08:00
Wenkai Yin
a7c84cc2c8 fix #895. 2016-10-27 17:23:47 +08:00
Wenkai Yin
ebc569fb93 fix #883 2016-10-27 14:24:10 +08:00
kunw
7ffd40ea57 Updates for link of logs on dashboard. 2016-10-26 16:09:19 +08:00
kun wang
0c955020e9 Merge pull request #940 from wknet123/dev-block-ldap
Updates for blocking account settings in LDAP auth mode.
2016-10-26 15:11:57 +08:00
kun wang
1857ff36dd Merge pull request #943 from wknet123/dev-refresh-tags
Updates for refreshing repos or tags when deleted.
2016-10-26 15:11:33 +08:00
Daniel Jiang
aea99d49b4 Merge pull request #942 from wknet123/dev-originary-user-show
Updates for hiding buttons against to user role.
2016-10-26 14:23:00 +08:00
Daniel Jiang
4272d2e26f Merge pull request #923 from caicloud/signed-manifest-support
Add prettyjws in pattern for signed manifest support
2016-10-26 14:19:28 +08:00
kunw
07b09a92b8 Updates for checking role id. 2016-10-26 12:40:10 +08:00
kunw
2fcd649e01 Merge remote-tracking branch 'upstream/dev' into dev-originary-user-show 2016-10-26 10:57:10 +08:00
kunw
0e870bf694 Updates for refreshing repo or tags when deleted. 2016-10-25 18:39:55 +08:00
wemeya
2924799f78 add project role for non-sysadmin user 2016-10-25 18:25:39 +08:00
kunw
bb0246910e Updates for hiding buttons against to user role. 2016-10-25 18:22:29 +08:00
kunw
45803b53e1 Updates for blocking account settings in LDAP auth mode. 2016-10-25 16:20:42 +08:00
kun wang
ce7b556e84 Merge pull request #930 from wknet123/dev-admin-options
Fixed toggling admin options.
2016-10-25 13:46:43 +08:00
kun wang
b39f3ec2fe Merge pull request #932 from wknet123/dev-user-redirection
Fixed redirection when deleted user.
2016-10-25 13:41:54 +08:00
kunw
070cc30c83 Updates for changing admin options. 2016-10-25 13:39:22 +08:00
kunw
5ba1cc1f44 Updates error log. 2016-10-25 13:31:10 +08:00
Daniel Jiang
7930ca8285 Merge pull request #929 from wknet123/dev-origin
Updates for email validations.
2016-10-25 13:26:58 +08:00
kunw
811401f40e Added volume info of UI. 2016-10-25 12:44:27 +08:00