Commit Graph

1458 Commits

Author SHA1 Message Date
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
kunw
debf482765 Fixed redirection when deleted user. 2016-10-25 11:55:27 +08:00
kunw
8f758120d9 Fixed toggling admin options. 2016-10-25 11:39:04 +08:00
kunw
dbe830395d Fixed log output. 2016-10-25 11:12:23 +08:00
kunw
0ba342ca96 updates for email validations. 2016-10-24 18:37:54 +08:00
Tan Jiang
64562b8f83 add test case to cover new password and old password are the same 2016-10-24 17:16:18 +08:00
Penghao Cen
9775de3d78 Add prettyjws in pattern for signed manifest support 2016-10-24 14:30:31 +08:00
Tan Jiang
b876ea360d update salt when updating password 2016-10-24 13:40:19 +08:00
Tan Jiang
e3e0074a7f API should not return the salt of a user 2016-10-24 10:46:12 +08:00
yhua
311cf8da07 change code 20161019 2016-10-21 18:39:10 +08:00