Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-30 22:24:14 +01:00
Code Issues Projects Releases Wiki Activity
3,191 Commits 53 Branches 317 Tags 335 MiB
ab65bca2fe
Commit Graph

718 Commits

Author SHA1 Message Date
kunw
963efc5253 Update components for pagination and sorting. 2017-05-31 11:31:56 +08:00
Wenkai Yin
1b83c0b076 support pagination in GET recent logs API 2017-05-26 17:51:20 +08:00
Wenkai Yin
1dffe91f91 bug fix 2017-05-26 17:23:01 +08:00
Wenkai Yin
8ae5e46d63 refactor config API 2017-05-25 14:44:05 +08:00
Wenkai Yin
2e059eb85a refactor sync registry API 2017-05-25 13:42:25 +08:00
kun wang
565110d9f1 Merge pull request #2375 from steven-zou/master 
Implement vulnerability scanning components [unstable]
 2017-05-25 12:07:00 +08:00
Steven Zou
7a0a423cc8 Implement vulnerability scanning components 2017-05-24 17:44:47 -07:00
Wenkai Yin
79e80aad67 Merge pull request #2359 from ywk253100/170523_log 
Refactor log API
 2017-05-24 18:32:44 +08:00
Wenkai Yin
0d3c25e2a5 refactor ldap API 2017-05-24 18:32:02 +08:00
Wenkai Yin
6ee64ba83a refactor email API 2017-05-24 18:31:01 +08:00
Wenkai Yin
1314ff92f5 refactor sync registry API 2017-05-24 18:29:24 +08:00
Wenkai Yin
cf306ec66e refactor statistics API 2017-05-24 16:34:33 +08:00
Wenkai Yin
a901297859 Merge pull request #2341 from ywk253100/170519_member 
Refactor member API
 2017-05-24 14:32:06 +08:00
Wenkai Yin
97972028e1 refactor search API 2017-05-24 13:33:46 +08:00
Wenkai Yin
924a62df7e Merge pull request #2355 from ywk253100/170522_repo 
Return signatures in GET tags API
 2017-05-24 10:30:58 +08:00
Wenkai Yin
30316a2b94 return signatures in GET tags API 2017-05-24 10:15:39 +08:00
Wenkai Yin
577eadf9f1 Merge pull request #2361 from ywk253100/170523_systeminfo 
Refactor system info API
 2017-05-24 10:10:14 +08:00
Steven Zou
12660e0ea6 Merge pull request #2347 from wknet123/master-replication 
Add shareable replication components
 2017-05-23 14:58:41 -07:00
Wenkai Yin
33e2e87b62 refactor system info API 2017-05-23 18:40:09 +08:00
Wenkai Yin
e8572545c1 refactor log API 2017-05-23 18:17:12 +08:00
Wenkai Yin
92dcf4bfd3 refactor policy, job, target API 2017-05-23 16:57:25 +08:00
Wenkai Yin
0e237d8cab fix bug 2017-05-23 16:28:10 +08:00
Daniel Jiang
1c441b17be refactor job service (#2348) 2017-05-22 22:33:20 -07:00
kunw
5d3ed05a09 Update per comments. 2017-05-22 16:59:40 +08:00
Wenkai Yin
4884ec7835 Merge pull request #2335 from ywk253100/170518_user_api 
Refactor user API
 2017-05-22 11:43:34 +08:00
kunw
227b440956 Updates for replication spec. 2017-05-19 18:44:07 +08:00
Wenkai Yin
17813a75f0 refactor member API 2017-05-19 17:35:08 +08:00
Wenkai Yin
d45ef78eaf Merge pull request #2316 from ywk253100/170512_project 
Refactor project API
 2017-05-19 16:28:32 +08:00
Wenkai Yin
7df2be19de update 2017-05-19 13:24:31 +08:00
Wenkai Yin
3287bf6f9e refactor user API 2017-05-18 15:43:29 +08:00
Steven Zou
588bcf7d6c To fix intl not found issue in Safari 2017-05-17 11:05:28 -07:00
kunw
b26902448d Update for date-validators. 2017-05-17 18:38:19 +08:00
Wenkai Yin
b5279ea1f1 update 2017-05-17 17:54:10 +08:00
kunw
45ef8adca2 Merge remote-tracking branch 'upstream/master' into master-replication 2017-05-17 15:03:33 +08:00
kun wang
ed63c916bf Merge pull request #2310 from wknet123/master-repo-tags 
Add shareable repo and tag component.
 2017-05-17 14:33:51 +08:00
kunw
833c9f8f2e Refine spec of repository. 2017-05-17 13:33:31 +08:00
kunw
2da0bfa8b9 Add shareable replication component 2017-05-17 13:29:27 +08:00
Steven Zou
755654615e Modify project name checking 2017-05-16 18:23:09 -07:00
Steven Zou
26d20bd9aa Modify member name checking 2017-05-16 18:01:54 -07:00
Steven Zou
cf65c39cef Change the validation way of project name 2017-05-16 12:17:18 -07:00
Steven Zou
5744b83989 Modify password tips to add max length of pwd 2017-05-16 09:56:59 -07:00
Wenkai Yin
e1c1b8ec34 refactor project api 2017-05-16 15:02:37 +08:00
kunw
de88cccf77 Fix per comments. 2017-05-16 11:00:37 +08:00
Steven Zou
153d807fca Refine the access level of project creation 2017-05-15 17:57:20 -07:00
Daniel Jiang
4f66279c33 Fail authentication when username is empty (#2300) (#2303) 2017-05-15 14:35:38 -07:00
kunw
30a7a216c6 Add shareable repo and tag component. 2017-05-15 18:54:45 +08:00
Steven Zou
de8e0091f9 Merge pull request #2299 from wknet123/master-endpoint 
Update for restriction check.
 2017-05-12 22:35:52 +08:00
Daniel Jiang
7b0646760c Fail authentication when username is empty (#2300) 2017-05-12 06:12:36 -04:00
kunw
3b0bd2e700 Update for restriction check. 2017-05-12 17:38:09 +08:00
Wenkai Yin
e28ad39430 Merge pull request #2290 from ywk253100/170511_merge 
Refactor auth of token service
 2017-05-12 16:42:23 +08:00
Wenkai Yin
7e805b2dd4 refactor auth of token service 2017-05-12 16:27:13 +08:00
kun wang
da7fe47924 Merge pull request #2289 from wknet123/master-endpoint 
Add shareable endpoint components.
 2017-05-12 15:40:38 +08:00
kunw
900854128a Update for shareable endpoint. 2017-05-12 15:03:07 +08:00
Daniel Jiang
5892ef29c2 Merge pull request #2291 from reasonerjt/vulscan-job-refactory 
add scan job table and dao functions
 2017-05-12 02:45:55 -04:00
Tan Jiang
7d7d0c48f4 fix golin, add update status 2017-05-11 23:47:12 +08:00
Tan Jiang
dcbfb4d309 add scan job table and dao functions 2017-05-11 21:41:57 +08:00
Wenkai Yin
161cbea40b Merge pull request #2283 from ywk253100/170509_repo_api 
Refactor repository API
 2017-05-11 18:01:14 +08:00
Wenkai Yin
f1f302ec29 update 2017-05-11 17:02:01 +08:00
kunw
5071dcf304 Add shareable endpoint components. 2017-05-11 14:59:12 +08:00
Wenkai Yin
06ba7e0de0 update 2017-05-11 12:34:14 +08:00
kun wang
c3c7b540f1 Merge pull request #2278 from steven-zou/master 
Implement replication service interface
 2017-05-10 16:07:55 +08:00
Wenkai Yin
8f396b44f3 Merge remote-tracking branch 'upstream/master' into 170509_repo_api 
Conflicts:
	src/ui/api/repository.go
 2017-05-10 15:53:24 +08:00
Wenkai Yin
b02bbc0adf refactor repository API 2017-05-10 15:43:45 +08:00
Steven Zou
e3929f0e95 Implement replication service interface 2017-05-10 15:41:20 +08:00
Yan
8db1b2807e Merge pull request #2197 from ywk253100/170502_change_userid 
Delete column user_id from table access_log
 2017-05-10 00:02:54 -07:00
Steven Zou
b354653735 Merge pull request #2269 from steven-zou/master 
Implement tag service interface
 2017-05-10 14:37:22 +08:00
Wenkai Yin
01066c72b5 update 2017-05-10 13:11:09 +08:00
Steven Zou
54df5ec053 Implement tag service interface 2017-05-09 20:32:10 +08:00
Steven Zou
79544d39e0 Merge pull request #2268 from steven-zou/master 
Implement repository service interface
 2017-05-09 17:49:20 +08:00
Wenkai Yin
b5ef2c231d Merge pull request #2254 from ywk253100/170504_security_context 
Create different security contexts and project managers according to the request
 2017-05-09 17:41:19 +08:00
Steven Zou
3044a154b1 Implement repository service interface 2017-05-09 17:18:49 +08:00
Wenkai Yin
f8615e4746 create different security context according to the rquest 2017-05-09 17:02:29 +08:00
Steven Zou
68cc911373 Merge pull request #2264 from steven-zou/master 
Use local json loader for ngx-translate
 2017-05-09 16:24:24 +08:00
Steven Zou
28eafd2f30 Use local json loader for ngx-translate 2017-05-09 16:09:03 +08:00
Tan Jiang
fd8fd2fbe1 Enable project level content trust, controlled by environment variable 2017-05-09 15:36:58 +08:00
Daniel Jiang
7b0daca06a Merge pull request #2218 from ywk253100/170503_pms_db 
Implement the project manager based on database
 2017-05-07 22:54:37 -04:00
Daniel Jiang
b9b7e2f5e1 Merge pull request #2244 from vmware/release-1.1.0 
Merge latest code from release-1.1.0 branch
 2017-05-07 22:48:08 -04:00
Wenkai Yin
017e650b5b fix bug 2017-05-05 18:11:16 +08:00
wangyan
045b5a1c63 Fix permission issue catched by GAS Scanner 2017-05-05 00:20:35 -07:00
kun wang
a4a5ff6c60 Merge pull request #2233 from steven-zou/master 
Add test spec for log component
 2017-05-05 10:59:01 +08:00
Steven Zou
c837a1fb9e Add test spec for log component 2017-05-05 10:41:42 +08:00
kun wang
b7e1df7e1c Merge pull request #2222 from steven-zou/master 
Build code base for shareable UI components
 2017-05-04 17:50:24 +08:00
Steven Zou
6415689d56 Replace cookie service to ngx-cookie 2017-05-04 17:28:47 +08:00
Steven Zou
e057117d2e Build code base for shareable UI components 2017-05-04 17:09:55 +08:00
Steven Zou
0ae0c31168 Merge changes of rel 1.1.0 back to master 2017-05-04 15:47:02 +08:00
Wenkai Yin
b4c172b754 update 2017-05-04 12:28:00 +08:00
Wenkai Yin
3591086259 update 2017-05-04 12:27:14 +08:00
Wenkai Yin
92aa8ac15b implement PMS based on database 2017-05-04 12:17:32 +08:00
Wenkai Yin
13d9b05dcb Merge pull request #2193 from ywk253100/170502_security_ctx_db 
Implement security context interface
 2017-05-04 12:15:44 +08:00
Daniel Jiang
c97d349fa8 Merge pull request #2204 from reasonerjt/release-1.1.0 
handle unexpected error in ldap search
 2017-05-03 19:17:17 +08:00
kun wang
11beddaaf9 Merge pull request #2198 from wknet123/release-1.1.0-fix 
Encode sign-in params.
 2017-05-03 19:05:30 +08:00
Tan Jiang
7487095dd8 handle unexpected error in ldap search 2017-05-03 18:54:41 +08:00
kun wang
a519534bd1 Merge branch 'release-1.1.0' into release-1.1.0-fix-notary 2017-05-03 18:43:43 +08:00
kunw
e5a17418c8 Fix sign-in encode issue. 2017-05-03 18:32:48 +08:00
kunw
db504068a6 Fix tags action display issue. 2017-05-03 18:09:27 +08:00
kunw
e44c0c8af9 Fix notary signature issue. 2017-05-03 18:01:04 +08:00
Wenkai Yin
22826b5309 update 2017-05-03 17:22:19 +08:00
Wenkai Yin
d5db9db00b update 2017-05-03 17:21:38 +08:00
kunw
2f526e2b5f Encode sign-in params. 2017-05-03 16:03:27 +08:00
Steven Zou
dd80ea48bb Merge pull request #2192 from wknet123/master-fix-tags-action 
Fix issues about tags action.
 2017-05-03 15:23:19 +08:00
Daniel Jiang
79903ca3f3 Merge pull request #2194 from reasonerjt/create-reverse-proxy 
create reverse proxy
 2017-05-03 15:09:11 +08:00
Wenkai Yin
3be9cca0f5 delete column user_id from table accesslog 2017-05-03 14:18:07 +08:00
Tan Jiang
785298e6b9 create reverseproxy 2017-05-02 20:27:45 +08:00
kunw
bcb1dff59d Fix issues about tags action. 2017-05-02 17:49:21 +08:00
kun wang
f7a4a21066 Merge pull request #2191 from steven-zou/master 
Enhance the module configuration of harbor ui
 2017-05-02 17:40:38 +08:00
Wenkai Yin
ac7256efbd implement security context interface for database 2017-05-02 17:36:38 +08:00
Steven Zou
25004bbd1f Enhance the module configuration of harbor ui 2017-05-02 15:12:39 +08:00
Wenkai Yin
4eca617916 Merge remote-tracking branch 'upstream/master' into 170427_delete_ownerid 2017-05-02 14:58:36 +08:00
Wenkai Yin
4f9d9ed5d8 delete owner_id column from table repository 2017-05-02 14:57:07 +08:00
kunw
5ed47c0316 Merge release-1.1.0 2017-05-02 13:27:06 +08:00
Wenkai Yin
80d83d97bd Merge pull request #2158 from ywk253100/170427_pm 
Implement security context for secret
 2017-05-02 13:12:20 +08:00
Daniel Jiang
97e214c3d3 bypass some email test (#2184) 2017-05-02 12:48:44 +08:00
kun wang
89f5905f34 Update for member guard. (#2182) 2017-04-28 18:44:44 +08:00
kun wang
edbd4a8973 Update messages for access level. (#2176) 2017-04-28 17:11:03 +08:00
kun wang
62f9f842d4 Revert changes to tags route. (#2179) 2017-04-28 16:55:44 +08:00
kun wang
d03657e1d0 Update statistic label messages. (#2174) 2017-04-28 13:36:29 +08:00
kun wang
5e0805bd99 Update messages for access level. (#2175) 2017-04-28 13:16:15 +08:00
kunw
ed488e683d Update for tags route. 2017-04-28 11:04:45 +08:00
Wenkai Yin
e08b8217c3 implement security context for secret 2017-04-27 17:33:24 +08:00
Daniel Jiang
eb39fbf814 Merge pull request #2157 from vmware/release-1.1.0 
merge 1.1.0 fix code into master
 2017-04-27 17:27:23 +08:00
Daniel Jiang
e4af15048d Merge pull request #2148 from ywk253100/170425_authN_interface 
Abstract security context interface and enable security filter
 2017-04-27 11:35:22 +08:00
Steven Zou
fc47d3932c Merge pull request #2136 from wknet123/master-ui-aot 
Fix issue about UX.
 2017-04-26 22:22:09 +08:00
Wenkai Yin
f8f56ad555 auth integration 2017-04-26 18:54:46 +08:00
kunw
fc6d3cd9b9 Update per comments. 2017-04-26 18:34:18 +08:00
Steven Zou
bed7b584ab fix nav divider style issue 2017-04-26 18:18:35 +08:00
Tan Jiang
2f6dd6f102 do not return error when ldap bind failed 2017-04-26 16:29:00 +08:00
Wenkai Yin
f92b17e8b9 Merge remote-tracking branch 'upstream/release-1.1.0' into 170424_ldap_fix 2017-04-26 15:29:04 +08:00
kunw
1d98212d60 Fix UI compile issues. 2017-04-25 21:28:31 +08:00
kunw
e8113fa3fa Merge remote-tracking branch 'upstream/master' into master-ui-aot 2017-04-25 20:34:44 +08:00
kunw
adee392c3c Fix issues about confirm buttons and date validation. 2017-04-25 20:34:28 +08:00
Steven Zou
91f75f6395 Merge pull request #2135 from steven-zou/master 
Change the alert style to global style
 2017-04-25 19:45:51 +08:00
Steven Zou
dfadb70cc0 Change the alert style to global style 2017-04-25 19:27:28 +08:00
Daniel Jiang
ff4ba7d124 Merge pull request #2130 from reasonerjt/use-crypto-rand 
replace math/rand with crypto/rand
 2017-04-25 18:07:00 +08:00
Tan Jiang
da19700a1e replace math/rand with crypto/rand 2017-04-25 17:47:40 +08:00
Tan Jiang
e17526a495 fix ldap issue 2017-04-25 16:33:01 +08:00
Steven Zou
95c4994737 fix issue:#2012 2017-04-25 16:28:45 +08:00
Steven Zou
ba18333405 fix issue:#2011 2017-04-25 15:27:19 +08:00
Steven Zou
bb6cd5b17a remove ‘required’ flag from 'searchDN and search password' of ldap 2017-04-25 14:17:09 +08:00
Wenkai Yin
b9833990c4 bug fix 2017-04-25 14:13:03 +08:00
Steven Zou
e31bab435b Enable UI UT test framework (karma and jasmine) 2017-04-24 19:44:12 +08:00
kunw
35489e40ff Fix UI defered issues. 2017-04-24 18:48:35 +08:00
kunw
0c0db587ec Updates per comments. 2017-04-24 16:07:07 +08:00
kunw
1018d1a1c0 Merge remote-tracking branch 'upstream/master' into master-ui-aot 2017-04-24 15:05:38 +08:00
BhEaN
54bcb1fbe1 Added Spanish language 2017-04-22 00:29:27 +02:00
kunw
ba49eb79f1 Update for ui image building. 2017-04-21 19:34:57 +08:00
Tan Jiang
480bbc1a0d fix issue in LDAP support 2017-04-21 19:06:10 +08:00
Steven Zou
543a960ca2 Allow admin to change password when auth mode is 'ldap_auth' 2017-04-21 18:27:32 +08:00
kunw
f4ef4eda02 Merge latest updates. 2017-04-20 23:49:13 +08:00
kunw
b42f8935e2 Fix and update codes for AoT. 2017-04-20 23:47:06 +08:00
Steven Zou
30254f0d89 Setup UI shared components libarary 2017-04-20 14:58:31 +08:00
kunw
012a42a6a2 Merged latest updates. 2017-04-19 12:09:23 +08:00
kunw
3ca69d7596 Upgrade to Angular 4 and Clarity 0.9.0 2017-04-19 12:05:58 +08:00
wy65701436
d983e9d4fe update ignore file 
rm unused langagues files.
 2017-04-14 02:49:16 -07:00
wy65701436
b9c8fe51b5 replace header of ts files 2017-04-13 19:06:23 -07:00
wy65701436
22a540ea30 fix golint issue 2017-04-13 04:16:51 -07:00
wy65701436
53f7cfb967 replace go header 2017-04-13 03:54:58 -07:00
Steven Zou
7247fe3924 Fix language switching issue 2017-04-12 17:38:28 +08:00
Steven Zou
3171e43e66 override page title and search placeholder when in VIC mode 2017-04-12 08:55:39 +08:00
Steven Zou
3f8dd77eeb amend typo in copyright declearation 2017-04-11 22:19:30 +08:00
Steven Zou
73fa73c21d Merge pull request #1995 from wknet123/master-jit 
Fix invisible action for sysadmin.
 2017-04-11 18:50:45 +08:00
kunw
9427629267 Fix invisible action for sysadmin. 2017-04-11 18:35:47 +08:00
Yan
9a624c1dfc Merge pull request #1990 from wy65701436/master 
customize beego 404
 2017-04-11 16:12:02 +08:00
kun wang
28cd538954 Merge pull request #1984 from wknet123/master-jit 
Update endpoint interaction of UI.
 2017-04-11 15:37:02 +08:00
wy65701436
1bbe14fc9e add comment for source code 2017-04-11 00:30:36 -07:00
wy65701436
a1c20dd666 update template 2017-04-11 00:13:37 -07:00
wy65701436
c63addebb8 add 4040 2017-04-11 00:06:26 -07:00
wy65701436
a8aa0ad9b3 add customize 404 2017-04-11 00:05:28 -07:00
Steven Zou
6664b57365 Merge branch 'master' into master 2017-04-11 14:20:07 +08:00
kunw
9c6e49c5dd Update endpoint interaction of UI. 2017-04-11 11:42:56 +08:00
Wenkai Yin
228ecf9b78 bug fix 2017-04-10 17:25:10 +08:00
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