Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-29 20:18:05 +01:00
Code Issues Projects Releases Wiki Activity
4,714 Commits 55 Branches 321 Tags 341 MiB
82b57971c0
Commit Graph

1516 Commits

Author SHA1 Message Date
Daniel Jiang
f41d2ff436 Merge pull request #3101 from ywk253100/170822_replica 
Convert 500 error returned by Admiral to duplicate project error when creating duplicate project
 2017-08-22 15:59:19 +08:00
Wenkai Yin
599d94be0c update 2017-08-22 15:22:25 +08:00
Steven Zou
749435ccf3 Merge pull request #3102 from steven-zou/master 
Fix projetcId not ready and ca download link issues
 2017-08-22 14:53:45 +08:00
Wenkai Yin
ffb2f4201b update 2017-08-22 14:28:45 +08:00
Steven Zou
d2540b71f5 fix ca download link issue 2017-08-22 13:57:23 +08:00
Wenkai Yin
bb958a7f4b convert 500 error returned by Admiral to duplicate project error when creating duplicate project 2017-08-22 13:34:06 +08:00
Steven Zou
3784c08e3d Fix the projectId not ready issue 2017-08-22 13:33:24 +08:00
Tan Jiang
c1bbcb5bab update the interval of clair updater to 12 hours, and update the interval for scan all to 2 hours 2017-08-21 13:45:23 +08:00
Steven Zou
5deff12550 update ui library version 2017-08-18 18:50:42 +08:00
Fuhui Peng (c)
45c4796486 '1918' 2017-08-18 17:42:50 +08:00
Fuhui Peng (c)
7393843bd0 '3022' 2017-08-18 17:41:03 +08:00
Fuhui Peng (c)
e4af0bdb10 Merge branch 'master' of https://github.com/vmware/harbor 2017-08-18 16:16:52 +08:00
Wenkai Yin
7296bdc131 increase length of username in database to 256 2017-08-17 15:24:34 +08:00
pengpengshui
b362e4d36a fix issue about cannot click add replication button , 3071 2017-08-17 14:59:25 +08:00
pengpengshui
160593a86a fix issue about no warn when deleting repository which contains signed tags, 3022 2017-08-17 14:45:13 +08:00
pengpengshui
78e1f8c8ce fix issues about image have no data an scan complete time in image detail ,3054,3023 2017-08-17 14:42:36 +08:00
pengpengshui
04929c98f7 fix issue about back to public project #1918 2017-08-17 14:29:23 +08:00
pengpengshui
613dfc597d fix #3046 about delete ID from 'copy Digest ID' 2017-08-17 13:02:07 +08:00
Tan Jiang
2ffcf10eaa restart scan jobs when jobservice is started 2017-08-16 17:24:41 +08:00
Wenkai Yin
bb00c2c2cf Merge pull request #3045 from ywk253100/170814_config 
[BAT]Remove useless attributes in configuration API
 2017-08-15 12:18:06 +08:00
Steven Zou
df6d37b9d5 Merge pull request #3043 from steven-zou/master 
add CVE link
 2017-08-14 17:57:19 +08:00
Wenkai Yin
0ffb74f261 remove useless attributes in configuration API 2017-08-14 16:42:25 +08:00
Steven Zou
4a543a3e52 add CVE link 2017-08-14 15:56:55 +08:00
Yan
d0103856f1 [BAT] fix issues (#3037) 
* fix issues

* update
 2017-08-14 15:19:48 +08:00
Wenkai Yin
c878a4df06 Merge pull request #3033 from ywk253100/170811_scope 
Fix bug in parsing scope
 2017-08-11 17:56:49 +08:00
Wenkai Yin
98d8b7e246 fix bug in parsing scope 2017-08-11 14:13:15 +08:00
Daniel Jiang
1403fe09ff Merge pull request #3030 from reasonerjt/fix-jobservice-update-vuln-bug 
Do not throw error if the scan result is unchanged
 2017-08-11 13:26:15 +08:00
Daniel Jiang
9b6ad0e90f Merge pull request #3027 from reasonerjt/add-vuln-link 
add cve link in Harbor API
 2017-08-10 19:44:06 +08:00
Tan Jiang
882683ae6f Do not throw error if the scan result is unchanged 2017-08-10 17:26:39 +08:00
Wenkai Yin
ec5c5514b5 Merge pull request #3025 from ywk253100/170808_bug_fix 
Fix bug: can not display signed or not correctly
 2017-08-10 17:11:27 +08:00
Tan Jiang
5846d7d28d add cve link in Harbor API 2017-08-10 15:27:30 +08:00
Wenkai Yin
c3c21586ea fix bug: can not display signed or not correctly 2017-08-10 15:12:52 +08:00
Wenkai Yin
9b9b5e414f Merge pull request #3021 from ywk253100/170808_bug_fix 
[BAT] Fix bug: can delete repository contains signed tags
 2017-08-10 13:28:45 +08:00
Wenkai Yin
7205d03106 bug fix 2017-08-10 11:09:04 +08:00
Wenkai Yin
9fc80a1731 Merge pull request #3014 from ywk253100/170808_bug_fix 
Return isSystem when using ldap
 2017-08-09 18:49:49 +08:00
Wenkai Yin
689994fa93 return isSystem when using ldap 2017-08-09 18:02:55 +08:00
Daniel Jiang
5ba363657f Merge pull request #3006 from ywk253100/170808_bug_fix 
[BAT]Remove useless codes
 2017-08-09 16:05:16 +08:00
Daniel Jiang
78bacbc80a Merge pull request #2978 from wy65701436/issue-2975 
Issue 2975
 2017-08-09 16:05:00 +08:00
Wenkai Yin
7fedca3a4a remove useless codes 2017-08-09 15:13:51 +08:00
Steven Zou
be0b621c65 update the library version 2017-08-09 15:03:33 +08:00
Wenkai Yin
3c64ae340e bug fix 2017-08-08 16:22:29 +08:00
Steven Zou
49f52ef8f8 Merge pull request #2987 from pengpengshui/master 
[BAT]fix #2986 about configration save button issue
 2017-08-08 16:10:08 +08:00
pengpengshui
700d3141b4 fix #2986 about configration save button issue 2017-08-08 15:13:58 +08:00
Daniel Jiang
383a09e21f Merge pull request #2982 from reasonerjt/tc-vuln-data 
add tc for vulnerability transform
 2017-08-08 12:15:54 +08:00
pengpengshui
fb8e700e30 fix bug about tooltips issues 2017-08-08 09:59:36 +08:00
Steven Zou
b6b232ce6a Merge pull request #2945 from vmware/fix_issue_#2762 
Fix data race issues of go sources
 2017-08-07 21:57:03 +08:00
Tan Jiang
5b6c53a1bf add the json file required by UT 2017-08-07 21:12:49 +08:00
wangyan
657d3c322f fix issue 2975 
udpate

update

update

update

update

update
 2017-08-07 18:01:37 +08:00
Tan Jiang
8f41be471d add tc for vulnerability transform 2017-08-07 17:14:51 +08:00
Steven Zou
21d3f4a549 Fix data race issues of go sources 2017-08-07 14:50:37 +08:00
Wenkai Yin
7800d2c2b2 check the existence of project when generating token 2017-08-07 13:30:16 +08:00
Steven Zou
43ca7e33fa Merge pull request #2971 from steven-zou/master 
upgrade ui lib version to 0.4.2
 2017-08-04 21:16:19 +08:00
Daniel Jiang
6bd622196e Merge pull request #2972 from reasonerjt/master 
Fix perf issue and connection leak in Clair.
 2017-08-04 19:48:26 +08:00
Tan Jiang
fa0cb8731c Fix performance issue and connection leakage 2017-08-04 19:22:52 +08:00
Steven Zou
373c6a3783 upgrade ui lib version to 0.4.2 2017-08-04 19:21:38 +08:00
Daniel Jiang
d4dce3bb60 Merge pull request #2970 from wy65701436/issue-2965 
fix 2965
 2017-08-04 19:17:01 +08:00
wangyan
5b54b554ab update 2017-08-04 18:59:16 +08:00
Steven Zou
325eb6bbc1 Merge pull request #2969 from pengpengshui/master 
fix #2893 about add tooltips title
 2017-08-04 18:58:23 +08:00
wangyan
bcc1a5c41d fix 2965 
update package

update
 2017-08-04 18:44:00 +08:00
pengpengshui
89b56eaea0 fix #2893 about add tooltips title 2017-08-04 18:34:12 +08:00
Steven Zou
39ffff7c84 update ui library version to 0.3.92 2017-08-04 10:37:38 +08:00
Wenkai Yin
d5a6d25082 Merge pull request #2923 from ywk253100/170728_registry 
Remove useless insecure flag
 2017-08-04 10:14:40 +08:00
Steven Zou
1c3830086a Merge pull request #2959 from pengpengshui/master 
fix #2889 #2892 about tooltips of self-registration and member model add button problem
 2017-08-04 10:03:26 +08:00
pengpengshui
21379a1d3d fix #2889 #2892 about tooltips of self-registration and member model add button problem 2017-08-04 09:44:20 +08:00
Steven Zou
baa863d026 Fix issue #2879 (#2953) 
* Change vul result bar texts

* Support server-driven pagination for replication jobs
 2017-08-03 15:09:13 +08:00
pengpengshui
0966887f98 fix #2909 about time can be empty 2017-08-03 13:38:27 +08:00
pengpengshui
3417ff731b fix #2910 about scan all position 2017-08-03 12:32:29 +08:00
pengpengshui
cd1077fa43 fix 2912 #2938 about save button in vul tag and signed icon 2017-08-02 19:07:30 +08:00
Daniel Jiang
6f8f765358 Merge pull request #2906 from ywk253100/170728_integration 
Apply security filter to certain patterns and enable basic auth for deleting repo
 2017-08-02 18:09:15 +08:00
pengpengshui
e76a76e60c fix #2890 about time in vulnerablity 2017-08-01 18:30:47 +08:00
Steven Zou
e7da22d812 fix issue #2840 and #2916 2017-08-01 15:49:50 +08:00
pengpengshui
87b0f3460e fix color about #2908 2017-08-01 12:34:08 +08:00
pengpengshui
d666574f66 fix #2903 #2908 about icons color and statistics style 2017-07-31 17:20:27 +08:00
pengpengshui
8ca28446d4 fix #2917 about scan error log does`t show 2017-07-31 17:15:36 +08:00
pengpengshui
39aaf2928f fix #2911 about spaces at the begin of log 2017-07-31 17:12:28 +08:00
Wenkai Yin
67200db678 update 2017-07-31 13:58:41 +08:00
Wenkai Yin
8963a15520 remove useless insecure flag 2017-07-31 13:45:49 +08:00
pengpengshui
52bcb8a643 Merge branch 'master' of https://github.com/vmware/harbor 2017-07-31 12:42:28 +08:00
pengpengshui
468257167a fix #2896 #2886 #2888 about tooltips,inline alert ,datagrid leftside style 2017-07-29 06:19:46 +08:00
Steven Zou
220e709530 support read-ony mode for replication list view (#2915) 2017-07-28 18:49:17 +08:00
Wenkai Yin
cdb75519a9 1. only apply security filter to /api/ and /service/ 2.support basic auth for deleting repository and tag in integration mode 2017-07-28 15:25:22 +08:00
Wenkai Yin
ce169e74dc Merge pull request #2878 from ywk253100/170724_registry 
Refactor registry client
 2017-07-28 13:40:32 +08:00
Wenkai Yin
eb9a4dfff9 update 2017-07-28 13:21:34 +08:00
Wenkai Yin
a8dc75dd15 update 2017-07-28 13:10:26 +08:00
Steven Zou
1467a8a5be Merge pull request #2900 from steven-zou/master 
fix issue #2435
 2017-07-28 12:43:42 +08:00
Steven Zou
d7eb8df28e Merge pull request #2885 from pengpengshui/master 
fix 2869/2870 about the  log of a pending status replication job
 2017-07-27 21:43:01 +08:00
pengpengshui
be9dd5cdc3 fix 2869/2870 about the log of a pending status replication job 2017-07-28 07:17:55 +08:00
Steven Zou
5f548ea49a fix issue #2435 2017-07-27 18:43:27 +08:00
Wenkai Yin
1da9b8653b update according to the comments 2017-07-27 18:23:55 +08:00
Daniel Jiang
8117e9ee79 Merge pull request #2884 from ywk253100/170726_api 
Add API to check whether a project can be deleted or not
 2017-07-27 10:29:03 +03:00
Wenkai Yin
9d7ad6de68 Add API to check whether a project can be deleted or not 2017-07-27 14:08:32 +08:00
Wenkai Yin
0a74a0f1e4 update 2017-07-27 08:17:29 +08:00
Wenkai Yin
71e4c3c447 Merge remote-tracking branch 'upstream/master' into 170724_registry 
Conflicts:
	src/ui/utils/utils.go
 2017-07-26 18:46:41 +08:00
Wenkai Yin
cc264f85e7 do not ping if using raw token authorizer 2017-07-26 18:41:36 +08:00
Steven Zou
f3c1caeb3c fix issue #2811 2017-07-26 17:58:43 +08:00
Steven Zou
ec7b5ccfea fix issue #2832 2017-07-26 16:55:20 +08:00
Steven Zou
5c32719590 Merge pull request #2872 from steven-zou/master 
fix issue 2858
 2017-07-26 16:09:42 +08:00
Daniel Jiang
69c49dd7d1 Merge pull request #2856 from reasonerjt/project-scan-all 
Provide API for scanning images under a project
 2017-07-26 10:58:58 +03:00
Daniel Jiang
9d02fc1c70 Merge pull request #2866 from reasonerjt/master 
fix #1953, fail jobservice when configuration init encounters errors.
 2017-07-26 10:58:04 +03:00
Steven Zou
7244134e50 fix issue 2858 2017-07-26 15:51:37 +08:00
Tan Jiang
10c8573464 provide API for scanning images under a projet 2017-07-26 15:19:17 +08:00
Steven Zou
7a0fe1034a Merge pull request #2871 from pengpengshui/master 
fix #2839 about project log has no logs
 2017-07-26 12:55:26 +08:00
pengpengshui
1fd68529ae fix #2839 about project log has no logs 2017-07-26 10:44:06 +08:00
pengpengshui
e4c21dc5de change code style again about replication rule link issue 2017-07-26 05:58:15 +08:00
pengpengshui
9c6c71ed72 modify code about replication rule link issue 2017-07-26 04:16:21 +08:00
pengpengshui
30bd67748e fix #2853 about replication rule link issue 2017-07-26 03:51:47 +08:00
Tan Jiang
97b334c3c0 fix #1953 2017-07-25 21:12:03 +08:00
Steven Zou
7c2699953d Fix config change watching issue 2017-07-25 20:27:25 +08:00
Steven Zou
a047c1fe96 Merge pull request #2850 from steven-zou/master 
Enhance scanning status controlling
 2017-07-24 14:26:29 +08:00
Steven Zou
598f2b43db add missing i18n message keys 2017-07-24 13:49:43 +08:00
Steven Zou
97a9052050 Enhance scanning status controlling 2017-07-24 13:39:49 +08:00
Yan
274f764622 update interceptor error code (#2836) 
* update interceptor error code

* update

* update error string

* update interceptor error code

update

update error string
 2017-07-23 18:34:44 -07:00
Wenkai Yin
62c1bf5389 load absent property from env 2017-07-21 17:54:41 +08:00
Tan Jiang
cd24c0f171 fix issue in golint 2017-07-21 00:07:42 +08:00
Tan Jiang
ea25c3cfe5 provide api to show log of scan job 2017-07-20 19:32:27 +08:00
Wenkai Yin
b127ba391d Merge pull request #2827 from ywk253100/170720_replic 
Fix replicate issue
 2017-07-20 18:48:33 +08:00
Wenkai Yin
1c4a42009d remove duplicate codes in notification handler (#2828) 2017-07-20 03:10:52 -07:00
Wenkai Yin
2e427bffe2 fix replicate issue 2017-07-20 16:47:14 +08:00
Wenkai Yin
e0040a09b6 Merge pull request #2821 from ywk253100/170719_integration 
Refactor getting project logic according to the change of Admiral's API
 2017-07-20 15:57:42 +08:00
Wenkai Yin
d36a7585c3 Merge pull request #2818 from ywk253100/170719_delete_getctxofuser 
Delete the method of getting security context of specific user
 2017-07-20 15:57:21 +08:00
Steven Zou
1b2a538aaf Fix scan now issue in the tag list (#2824) 
* Provide 'Scan Now' menu in the tag list

* Fix scan now issue in the tag list
 2017-07-20 00:08:56 -07:00
Wenkai Yin
1298d465da refactor GetPublic logic 2017-07-20 10:34:18 +08:00
Steven Zou
aa681eb018 Provide 'Scan Now' menu in the tag list (#2819) 2017-07-19 18:28:00 -07:00
Wenkai Yin
603d15671a delete the method of getting security context of specific user 2017-07-19 18:05:50 +08:00
Wenkai Yin
75c4d4a60a Merge pull request #2816 from ywk253100/170719_trim 
Trim the new line in the end of token file
 2017-07-19 17:51:49 +08:00
Wenkai Yin
e9a2ee779f trim the new line in the end of token file 2017-07-19 17:34:04 +08:00
Steven Zou
e6368ab8a0 Merge pull request #2799 from vmware/fix_issue_#2793 
Fix issue of detecting configuration changes
 2017-07-19 17:32:45 +08:00
Wenkai Yin
f57b9ae9d5 trim new line in the end of token file 2017-07-19 17:28:54 +08:00
Steven Zou
8f921db588 Refine scheduler 2017-07-19 16:57:22 +08:00
Steven Zou
3120abad8e Merge pull request #2809 from steven-zou/master 
Add job log reviewer
 2017-07-19 16:43:23 +08:00
Daniel Jiang
8a23f0e0a1 Merge pull request #2812 from reasonerjt/systeminfo-scan-all 
add next_scan_all to systeminfo api response
 2017-07-19 15:49:57 +08:00
Steven Zou
056b15c74b Force refresh user list view 2017-07-19 15:27:59 +08:00
Steven Zou
9057f751e3 Implement job log viewer 2017-07-19 15:27:32 +08:00
Wenkai Yin
7573d59624 update token file location 2017-07-19 13:46:10 +08:00
Tan Jiang
ad2cafe4d2 add next_scan_all to systeminfo api response 2017-07-19 13:33:42 +08:00
Steven Zou
5c876621ec Merge branch 'master' into fix_issue_#2793 2017-07-19 12:34:43 +08:00
Wenkai Yin
6e10a21871 Merge pull request #2774 from ywk253100/170713_integration 
Trim last / in url
 2017-07-19 10:15:05 +08:00
Wenkai Yin
44ad4581e5 Merge pull request #2807 from ywk253100/170718_integration 
Support basic auth in integration mode
 2017-07-19 10:14:44 +08:00
pengpengshui
b16c521e2f Merge remote-tracking branch 'upstream/master' 2017-07-18 19:12:06 -07:00
pengpengshui
1810b7ed42 fix #2800 about consistent datagrid footer indicate number of items and roll back connent-test issue 2017-07-18 19:10:16 -07:00
pengpengshui
34f9a3b911 fix issue about endpontUrl,username,password should have data when connent-test button could click #2435 2017-07-18 14:00:17 -07:00
pengpengshui
8236e0358e fix #2775 about create-rule modal connect test issue 2017-07-18 09:50:04 -07:00
Wenkai Yin
fc2bb51582 support basic auth in integration mode 2017-07-18 19:20:19 +08:00
Daniel Jiang
7d5fe961f3 Merge pull request #2798 from reasonerjt/master 
The password to access clair db can be configured in harbor.cfg
 2017-07-18 18:56:51 +08:00
Steven Zou
201095a259 Enhance scanning policy notify handler and add more testing cases 2017-07-17 23:43:24 +08:00
pengpengshui
47e24609b6 change the code style of the issue create-project modal submit button 2017-07-17 17:35:10 -07:00
pengpengshui
26154aae55 change the code style of the issue create-project modal submit button 2017-07-17 17:07:46 -07:00
pengpengshui
fc857a8928 fix create-project modal submit button issue 2017-07-17 15:28:31 -07:00
pengpengshui
74169e3021 fix issue about nav replicationManagement lose highlight 2017-07-17 12:46:01 -07:00
Steven Zou
db58ca673d Fix issue of detecting configuration changes 2017-07-17 17:39:41 +08:00
Tan Jiang
629cf29850 The password to access clair db can be configured in harbor.cfg, skip auto-scan if clair-db is not ready 2017-07-17 15:25:47 +08:00
Daniel Jiang
6f2ff672c4 Merge pull request #2789 from reasonerjt/master 
fix nil pointer issue
 2017-07-14 20:37:00 +08:00
Tan Jiang
473b85cffa fix nil pointer issue 2017-07-14 20:06:34 +08:00
Steven Zou
203b8a5bf0 Merge pull request #2790 from steven-zou/master 
Fix issue #2688 and #2686
 2017-07-14 19:14:27 +08:00
Steven Zou
de6300a3b2 Fix issue #2688 and #2686 2017-07-14 18:54:49 +08:00
Steven Zou
bf8a05615b fix issue 2772 (#2785) 2017-07-14 02:03:58 -07:00
Steven Zou
4e33bd9e46 fix issue 2772 2017-07-14 16:39:40 +08:00
Steven Zou
c91189a560 Merge pull request #2784 from steven-zou/master 
fix issue 2759
 2017-07-14 16:25:19 +08:00
Steven Zou
b69083ecd1 Merge pull request #2779 from pengpengshui/master 
Fix the issue #2564,#2552 and #2758
 2017-07-14 16:01:22 +08:00
pengpengshui
900837326a fix the issue about project name set private/pubulic alert problem 2017-07-14 14:11:42 -07:00
pengpengshui
8ec00c479e fix2552 connect button grayed out 2017-07-14 09:28:20 -07:00
Steven Zou
fae35add8f fix issue 2759 2017-07-14 15:58:35 +08:00
Daniel Jiang
22ba87338e Merge pull request #2777 from reasonerjt/fetch-timestamp-from-clairdb 
provide default timestamp for all distros in system info api
 2017-07-14 15:32:27 +08:00
Tan Jiang
771e26a188 fix bug 2017-07-14 14:53:12 +08:00
Steven Zou
a1a36a4cc4 Support backend server pagination in repo list (#2778) 
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts

* support clair db timestamps

* Support backend pagination in repository list
 2017-07-13 20:58:53 -07:00
pengpengshui
be6e265890 Merge remote-tracking branch 'upstream/master' 2017-07-13 17:14:31 -07:00
pengpengshui
ea07c211e2 fix2564 issue 2017-07-13 10:37:13 -07:00
pengpengshui
66bfc02d5b fix2564 issue 2017-07-13 09:37:15 -07:00
Tan Jiang
72b3a020e3 provide default timestamp for all distros in system info api 2017-07-13 18:48:05 +08:00
Wenkai Yin
5c965719a2 trim / in url 2017-07-13 17:12:53 +08:00
Daniel Jiang
920c41c204 Merge pull request #2769 from ywk253100/170713_integration 
Bug fix
 2017-07-13 16:47:43 +08:00
Daniel Jiang
0501f52cda Merge pull request #2765 from ywk253100/170712_member 
Fix bug in GET member API
 2017-07-13 16:47:19 +08:00
Wenkai Yin
c4fbc707af bug fix 2017-07-13 13:58:24 +08:00
Steven Zou
0ce74dd377 Support clair db timestamps (#2767) 
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts

* support clair db timestamps
 2017-07-12 22:04:42 -07:00
Wenkai Yin
d51b01c200 fix bug in GET member API 2017-07-12 19:17:26 +08:00
Daniel Jiang
ca6bd3b585 Merge pull request #2741 from reasonerjt/fetch-timestamp-from-clairdb 
read last update from clair db, return in system info
 2017-07-12 17:16:30 +08:00
Tan Jiang
7fdb77f6d2 fix tc 2017-07-12 16:48:57 +08:00
Tan Jiang
436f0efab8 overall timestamp returns 0 when error happens, split check and mark into two func 2017-07-12 15:57:57 +08:00
Wenkai Yin
ba22ee5022 Merge pull request #2738 from ywk253100/170711_integration 
Disable some APIs in integration mode
 2017-07-12 15:13:50 +08:00
Tan Jiang
5f233f3e21 address comment 2017-07-12 15:05:27 +08:00
Steven Zou
8ffb5593b9 Merge pull request #2749 from pengpengshui/fix2688 
fixed issue #2688
 2017-07-12 14:20:29 +08:00
pengpengshui
982263bd66 delete one line 2017-07-12 13:51:51 -07:00
Daniel Jiang
9c8c79db43 Merge pull request #2740 from reasonerjt/query-clair-db 
enable security on jobservice scan api
 2017-07-12 13:24:16 +08:00
Steven Zou
76bb28d3d0 UI: Support root cert downloading in configuration component (#2742) 
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts
 2017-07-11 22:23:19 -07:00
Wenkai Yin
005d783463 Merge pull request #2732 from ywk253100/170710_bug_fix 
Bug fix
 2017-07-12 12:59:24 +08:00
pengpengshui
003ae3a14f fixed issue #2688 2017-07-11 21:23:32 -07:00
Yan
c1fc09a2d9 format error to make it readable for docker (#2731) 
remove unneeded
 2017-07-11 19:36:51 -07:00
Tan Jiang
543cf62e14 read last update from clair db, return in system info 2017-07-11 21:26:31 +08:00
Tan Jiang
92258cd012 enable security on jobservice scan api 2017-07-11 21:22:27 +08:00
Wenkai Yin
7e8468c302 update 2017-07-11 18:49:25 +08:00
Wenkai Yin
52f9e5f1c8 disable some APIs in integration mode 2017-07-11 18:13:48 +08:00
Steven Zou
35c62da69c remove watch testing case 2017-07-11 15:53:04 +08:00
Steven Zou
cbdf49c8e9 Merge remote-tracking branch 'upstream/master' 2017-07-11 15:44:32 +08:00
Steven Zou
7ee052b9dd Update policy scheduler according to comments 2017-07-11 15:22:00 +08:00
Wenkai Yin
0de64ed139 bug fix 2017-07-10 18:38:21 +08:00
Daniel Jiang
6fa12cdb1e Merge pull request #2730 from reasonerjt/scan-all-control 
restrict scan all API, it should be called once every a period of time
 2017-07-10 16:17:26 +08:00
Tan Jiang
fb07b544ab address comment 2017-07-10 13:53:21 +08:00
Wenkai Yin
0b282039e9 Merge pull request #2725 from ywk253100/170707_status_code 
Return real status code returned by admiral APIs
 2017-07-10 10:12:50 +08:00
Tan Jiang
eb11cda596 restrict scan all API, it should be called once every a period of time 2017-07-09 22:06:13 +08:00
Tan Jiang
e1e975096c add int id for scan overview and revoke the change in beego 2017-07-09 12:37:08 +08:00
Daniel Jiang
43734bfb90 Merge pull request #2726 from reasonerjt/clair-notification 
clair notification handler enhancements
 2017-07-09 12:29:19 +08:00
Steven Zou
3cba51ef72 Merge pull request #2704 from m-masataka/change_gettags_interval 
change tag retrive's timeout
 2017-07-07 20:28:16 +08:00
Steven Zou
ff889cedde Fix conflict 2017-07-07 20:15:40 +08:00
Steven Zou
a0718385c1 Fix the import cycle issue 2017-07-07 20:12:01 +08:00
Tan Jiang
b84c7c25f1 return the status only when deployed with Clair 2017-07-07 19:04:00 +08:00
Wenkai Yin
d668730ffa return real status code returned by admiral APIs 2017-07-07 18:40:57 +08:00
Tan Jiang
ca805759d9 update scan overview in notification handler, and return clair vuln timestamp in system info 2017-07-07 17:47:52 +08:00
Steven Zou
cadc1187c2 Merge remote-tracking branch 'upstream/master' 2017-07-07 00:39:29 +08:00
Steven Zou
44be165edf Enable policy scheduler in ui main 2017-07-07 00:38:38 +08:00
Wenkai Yin
f7412b0c31 update auth context as Admiral's API changed 2017-07-06 18:32:22 +08:00
Wenkai Yin
315ca51611 Merge pull request #2675 from ywk253100/170630_tags 
Just return tag list rather than 500 if there are errors when getting signatures or scan overview
 2017-07-06 15:07:20 +08:00
Wenkai Yin
7b39a46c98 update 2017-07-06 14:48:43 +08:00
Wenkai Yin
cbaf24fe81 Merge pull request #2713 from ywk253100/170704_pm 
Move some method of project manager to security context
 2017-07-06 14:29:21 +08:00
Daniel Jiang
b96770b90a Merge pull request #2693 from reasonerjt/clair-notification 
Clair notification handler
 2017-07-05 20:18:34 +08:00
Steven Zou
82e17fade1 refine scheduler according to review comments 2017-07-05 19:13:49 +08:00
Yan
d849c36e3f Merge pull request #2570 from samifruit514/master 
Allow 255 chars for Realname
 2017-07-05 03:17:57 -07:00
Steven Zou
4b2bae4558 Merge branch 'master' of https://github.com/steven-zou/harbor 2017-07-05 17:57:31 +08:00
Steven Zou
5a5eb1d377 Update commnets of exported methods and structs 2017-07-05 17:57:20 +08:00
Wenkai Yin
b866200e4f Move some method of project manager to security context 2017-07-05 17:41:58 +08:00
Steven Zou
a477cb1a3e Merge branch 'master' of github.com:steven-zou/harbor 2017-07-05 17:04:43 +08:00
Steven Zou
c3dd5e6d12 Enhancements to configuration sharable component 2017-07-05 16:10:47 +08:00
Tan Jiang
8b31715b34 provide Clair notification handler 
update the timestamp in DB, when handling the notification
 2017-07-05 15:35:53 +08:00
Steven Zou
2bc557b559 Implement policy scheduler 2017-07-05 02:41:52 +08:00
root
f2d02848db change tag retrive's timeout 2017-07-04 10:03:38 +00:00
Wenkai Yin
b51b3ea5ac Merge pull request #2699 from ywk253100/170704_integration 
Fix bugs found in test
 2017-07-04 17:42:43 +08:00
Wenkai Yin
94507fc8a1 fix bugs found in test 2017-07-04 17:18:24 +08:00
Steven Zou
5cfe6540b7 Merge pull request #2670 from steven-zou/master 
Implement scan all policy configuration
 2017-07-04 16:53:50 +08:00
Wenkai Yin
aac742e8ba update 2017-07-04 12:33:11 +08:00
Steven Zou
f50a125d61 fix spec failure issue 2017-07-03 18:46:35 +08:00
Wenkai Yin
d2eb8fc8b6 filter request for basic auth in integration mode 2017-07-03 17:58:36 +08:00
Wenkai Yin
3ebe1a824b update codes of auth context 2017-07-03 13:37:55 +08:00
Wenkai Yin
2818c047bf Merge pull request #2672 from ywk253100/170628_getpm 
Create a global project manager
 2017-06-30 16:38:29 +08:00
Wenkai Yin
bdbdb383ac update 2017-06-30 16:21:55 +08:00
Wenkai Yin
2ada2dbd16 Merge pull request #2631 from ywk253100/170626_statistic 
Refactor statistics API to return private/public count of projects and repositories
 2017-06-30 14:26:15 +08:00
Wenkai Yin
99a492270e just return tag list rather than 500 error if there are errors 2017-06-30 13:40:25 +08:00
Wenkai Yin
84b443e2b2 Merge remote-tracking branch 'upstream/master' into 170628_getpm 
Conflicts:
	src/ui/config/config.go
	src/ui/proxy/interceptor_test.go
 2017-06-30 00:14:45 +08:00
Wenkai Yin
d6b4330cc8 create a global project manager 2017-06-30 00:08:45 +08:00
Steven Zou
1db36d99fb Implement scan all policy configuration 2017-06-29 18:41:30 +08:00
Daniel Jiang
ea827ffd6e Merge pull request #2658 from ywk253100/170627_registry 
Provide a method to get token from token service
 2017-06-29 17:56:38 +08:00
Tan Jiang
9ac23d9da5 add the attribute to valid keys 2017-06-29 16:06:48 +08:00
Tan Jiang
af0e8c85bb configuration api can handle scan all policy 2017-06-29 15:14:11 +08:00
Yan
159d549dbd Merge pull request #2581 from wy65701436/vul-interceptor 
vulnerable interceptor
 2017-06-28 22:10:10 -07:00
wangyan
c6a8e4076b to get travis status 2017-06-28 21:20:44 -07:00
wangyan
5a26ab1a53 vul interceptor 
update

fix http  no found

fix test

fix test

update

fix typo

fix travis

update per comment

update typo
 2017-06-28 05:22:28 -07:00
Wenkai Yin
f806adaac4 update test cases of PMS project manager 2017-06-28 15:44:40 +08:00
Wenkai Yin
ab65bca2fe Merge pull request #2649 from ywk253100/170627_service_account 
Implement GetByMember function in PMS project manager
 2017-06-28 15:25:21 +08:00
Wenkai Yin
4770aeba90 provide a method to get token from token service 2017-06-28 12:23:14 +08:00
Tan Jiang
00e86d86b6 provide an API to scan all images, and some refactory 2017-06-27 19:25:11 +08:00
Wenkai Yin
016af6bc78 implement GetByMember function in PMS project manager 2017-06-27 18:44:20 +08:00
Daniel Jiang
34871fe202 Merge pull request #2627 from reasonerjt/clair-integration 
small refinement to clair client
 2017-06-26 14:34:08 +08:00
Steven Zou
30ece92360 Merge pull request #2614 from steven-zou/master 
Update UI builder to 1.2.5
 2017-06-26 14:24:55 +08:00
Wenkai Yin
6e9ec3f22c refactor statistics API 2017-06-26 14:15:01 +08:00
Wenkai Yin
c50e2a5606 Merge pull request #2607 from ywk253100/170622_project 
Fix bug: can't show the role of member
 2017-06-26 10:17:36 +08:00
Tan Jiang
ed296812f0 small refinement to clair client 2017-06-25 11:44:56 +08:00
Steven Zou
7c68c1ca69 Enhance script in make/dev/nodeclarity/entrypoint.sh 2017-06-23 18:58:58 +08:00
Steven Zou
a12ec997cc Fix tooltip cut issue 
Change Dockerfile of UI builder
 2017-06-23 18:58:43 +08:00
Steven Zou
7c0e79d10a update ui builder to 1.2.6 2017-06-23 18:58:14 +08:00
Wenkai Yin
b960565d11 Merge remote-tracking branch 'upstream/master' into 170621_auth 
Conflicts:
	src/ui/filter/security.go
 2017-06-23 18:49:08 +08:00
Wenkai Yin
94822746f1 implement admiral login 2017-06-23 18:17:45 +08:00
Wenkai Yin
e0f01cfd09 Merge pull request #2616 from ywk253100/170623_project 
Add GetAll support in PMS project manager
 2017-06-23 18:08:09 +08:00
Wenkai Yin
419cf8dfc3 fix bug: can't show the role of member 2017-06-23 17:23:00 +08:00
Wenkai Yin
0b55ce6e80 add GetAll support in PMS project manager 2017-06-23 16:53:59 +08:00
Daniel Jiang
6e0f274c07 Merge pull request #2608 from reasonerjt/clair-integration 
fix nil pointer in vulnerability/details api
 2017-06-23 11:00:53 +08:00
Wenkai Yin
93924c092d Merge pull request #2597 from ywk253100/170621_jobservice 
Call UI's API to get project information in Jobservice
 2017-06-23 10:23:26 +08:00
Tan Jiang
d31a25317e fix nil pointer in vulnerability/details api 2017-06-22 18:26:40 +08:00
Steven Zou
fde171bcb3 Fix UI issues 2017-06-22 16:44:34 +08:00
Wenkai Yin
6fe175550b update 2017-06-22 15:50:24 +08:00
Wenkai Yin
f40bdd2ea1 Merge remote-tracking branch 'upstream/master' into 170621_jobservice 2017-06-22 15:04:10 +08:00
Wenkai Yin
bdd49e51d5 call ui API to get project 2017-06-22 14:01:17 +08:00
Wenkai Yin
283792e7c3 Merge pull request #2589 from ywk253100/170621_secret_log 
Bug fix
 2017-06-21 20:18:41 +08:00
Wenkai Yin
4fe5881121 bug fix 2017-06-21 19:24:29 +08:00
Steven Zou
ed1263148f Merge pull request #2562 from steven-zou/master 
Refactor harnor portal with sharable components in harbor-ui lib
 2017-06-21 16:51:46 +08:00
Steven Zou
f2d659aebc remove clipboard dep from package.json 2017-06-21 14:57:56 +08:00
Steven Zou
0623ef460e add third party lib 2017-06-21 14:49:29 +08:00
Steven Zou
969066f2c7 Improve components and change package.json 2017-06-21 09:53:59 +08:00
Yan
38b09f9f3f Merge pull request #2579 from ywk253100/170620_pm 
Using project manager instead of DAO project methods
 2017-06-20 05:40:55 -07:00
Wenkai Yin
d0eec5bb0d Merge pull request #2558 from ywk253100/170618_auth 
Add security context based on admiral
 2017-06-20 17:18:28 +08:00
Wenkai Yin
3522332430 Merge pull request #2550 from ywk253100/170616_replication 
Fix bug: can not replicate repository with multiple namespaces
 2017-06-20 16:41:53 +08:00
Wenkai Yin
6aa3e51b40 update 2017-06-20 16:30:01 +08:00
Wenkai Yin
de2479edee update 2017-06-20 13:49:41 +08:00
Wenkai Yin
78366ad23a Merge remote-tracking branch 'upstream/master' into 170620_pm 
Conflicts:
	src/ui/service/notification.go
 2017-06-20 13:26:14 +08:00
Wenkai Yin
0aed9a1171 use project manager instead of dao method 2017-06-20 13:19:43 +08:00
Tan Jiang
a1a08ebed0 provide API to get vulnerability details 2017-06-20 12:10:55 +08:00
Daniel Jiang
269fa0a70a Merge pull request #2559 from reasonerjt/clair-integration 
enable auto scan in notification handler
 2017-06-20 11:04:06 +08:00
Archambault, Samuel
18cea61121 Allow 255 chars for Realname 2017-06-19 13:54:21 -04:00
Steven Zou
e60e4c12a6 integrate with vulnerability API 2017-06-20 00:51:08 +08:00
Steven Zou
ef4581449f update related package.json files 2017-06-19 12:35:56 +08:00
Daniel Jiang
6ee631d1eb Merge pull request #2536 from wy65701436/pms-interceptor 
notary interceptor
 2017-06-19 10:58:40 +08:00
Tan Jiang
80edade6a7 enable auto scan in notification handler 2017-06-18 23:58:16 +08:00
Wenkai Yin
8191f4a476 add security context based on admiral 2017-06-18 22:19:12 +08:00
Steven Zou
44e208f027 Refactor repo and tag view with components in harbor-ui lib 2017-06-18 21:59:56 +08:00
Wenkai Yin
6e89f11ffc Merge pull request #2551 from ywk253100/170616_tag 
Add get tag API
 2017-06-18 11:10:33 +08:00
Steven Zou
8e20e66f8c replace filter with hbr-filter from harbor-ui lib 2017-06-18 01:05:10 +08:00
Steven Zou
5657005701 Refactor endpoints and replication management view with harbor-ui library 2017-06-17 23:48:55 +08:00
Steven Zou
7cf6510e84 Refactor log component with harbor-ui lib 2017-06-17 00:05:16 +08:00
wangyan
0d5d63c236 notary inteceptor 
update etst

update

update

update

update

update

update

update

update

update

update

update

update

update

update

update

update

update
 2017-06-16 04:39:59 -07:00
Wenkai Yin
ea5de0adf2 add get tag API 2017-06-16 19:37:05 +08:00
Tan Jiang
7a57cb4c87 State machine recover from panic and set job state to error 2017-06-16 19:08:59 +08:00
Wenkai Yin
ec02cf54f0 fix #2508 2017-06-16 18:37:34 +08:00
Wenkai Yin
482f91d91a Merge pull request #2547 from ywk253100/170616_user 
Bug fix
 2017-06-16 18:12:21 +08:00
Wenkai Yin
df56010739 bug fix 2017-06-16 17:23:22 +08:00
Wenkai Yin
9fb0ad6c0d Merge pull request #2543 from reasonerjt/clair-integration 
provide POST api/repostitores/xxx/tags/xxx/scan to trigger image scan
 2017-06-16 17:04:34 +08:00
Wenkai Yin
b8d17eeb79 replace trimleft with trimprefix 2017-06-16 16:30:40 +08:00
Tan Jiang
ad7990b07c fix error 2017-06-16 15:15:40 +08:00
Tan Jiang
04b9ee5cfd api should return 503 when Harbor is not deployed with clair, and add more comments 2017-06-16 15:01:14 +08:00
Daniel Jiang
ae77753bf2 Merge pull request #2529 from reasonerjt/clair-integration 
add with_clair flag in systeminfo
 2017-06-16 13:42:06 +08:00
Steven Zou
6e789d7d46 Use service in harbor-ui library for i18n support 2017-06-15 23:27:54 +08:00
Tan Jiang
41346fe8c0 provide POST api/repostitores/xxx/tags/xxx/scan to trigger image scan 2017-06-15 20:23:55 +08:00
Steven Zou
ce19ba2889 Fix project role displaying issue 2017-06-15 18:17:00 +08:00
Daniel Jiang
2a0fdc4ed2 Merge pull request #2528 from ywk253100/170615_test_case 
Update test cases for PMS
 2017-06-15 16:34:51 +08:00
Tan Jiang
15384317e0 add with_clair flag in systeminfo 2017-06-15 16:15:46 +08:00
Wenkai Yin
49ddf27868 update test cases for PMS 2017-06-15 15:50:15 +08:00
Daniel Jiang
6a85012dbd Merge pull request #2525 from reasonerjt/clair-integration 
GET tags api includes scan overview
 2017-06-15 15:34:05 +08:00
Tan Jiang
0b145771c5 handle the case when scan job does not exist 2017-06-15 14:28:45 +08:00
Steven Zou
1df1a45270 Fix issues of public/private projects 2017-06-14 23:38:21 +08:00
Wenkai Yin
7d595c10c5 Merge pull request #2485 from ywk253100/170608_project 
Refactor GET /projects API
 2017-06-14 21:03:28 +08:00
Tan Jiang
f016dd113c GET tags api includes scan overview 2017-06-14 21:02:59 +08:00
Wenkai Yin
d6c084485b Merge pull request #2497 from ywk253100/170612_user 
Support pagination in GET /users API
 2017-06-14 20:49:59 +08:00
Wenkai Yin
fa0dec6c9c update 2017-06-14 20:48:43 +08:00
Wenkai Yin
aecfcef51a Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-14 20:46:23 +08:00
Wenkai Yin
421e9b114e update 2017-06-14 20:35:51 +08:00
Wenkai Yin
802a2fbcce update 2017-06-14 20:23:29 +08:00
Yan
1e0f48b8c5 Merge pull request #2389 from ywk253100/170526_bug_fix 
Checking whether the repo contains any tags when syncing repo between db and registry
 2017-06-14 20:05:43 +08:00
Wenkai Yin
4d0ae36d4e update test case 2017-06-14 17:01:41 +08:00
Daniel Jiang
e17b46b951 Merge pull request #2506 from reasonerjt/clair-integration 
handlers for image scan, store results overview in DB
 2017-06-14 16:31:34 +08:00
Tan Jiang
8590c8d6bb remove orm debug setting from test case 2017-06-14 16:11:23 +08:00
Steven Zou
78f8a09177 Merge pull request #2507 from steven-zou/master 
Improve components in UI library
 2017-06-14 15:03:32 +08:00
Steven Zou
23635b6966 add placeholders to the datagird 2017-06-14 00:00:22 +08:00
Tan Jiang
ae2d868fd4 handlers for image scan, store results overview in DB 2017-06-13 23:37:54 +08:00
Steven Zou
f981415b5b make tag name clickable in repo-tag-stack view 2017-06-13 22:24:38 +08:00
Steven Zou
1d543c9212 Improve components in UI library 2017-06-13 20:38:21 +08:00
Steven Zou
b695ec78db Merge pull request #2504 from steven-zou/master 
Improve repo-tag-stack view
 2017-06-13 17:04:12 +08:00
Steven Zou
71f3480932 Improve repo-tag-stack view 2017-06-13 16:09:46 +08:00
Wenkai Yin
f0c47b990b Merge pull request #2495 from ywk253100/170605_pm 
Implement project manager based on PMS
 2017-06-13 15:46:48 +08:00
Wenkai Yin
5a25445096 update according to the comments 2017-06-13 15:28:48 +08:00
Steven Zou
2b3d912f43 update i18n messages 2017-06-13 13:22:09 +08:00
Steven Zou
2072fc237e Implement tag detail component & refactor vul summary bar chart 2017-06-12 19:40:51 +08:00
Wenkai Yin
539c0375a1 support pagination 2017-06-12 18:36:10 +08:00
Wenkai Yin
0925fd35f1 implement project manager based on PMS 2017-06-12 14:43:26 +08:00
Steven Zou
4d2a2363a7 Merge fix code from 1.1.0 branch back to master 2017-06-12 13:43:44 +08:00
Wenkai Yin
6b4ae098db update 2017-06-09 18:24:52 +08:00
Wenkai Yin
20cf8de0f7 Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-09 16:41:13 +08:00
Wenkai Yin
e97d7dab85 refactor GET /projects 2017-06-09 16:41:02 +08:00
Steven Zou
3ebd4758c1 Merge pull request #2483 from wknet123/master-log-query-params 
Fix timestamp value in query params
 2017-06-09 16:33:41 +08:00
kun wang
603cc2bd28 Merge pull request #2484 from steven-zou/master 
add push-image button component
 2017-06-09 16:28:46 +08:00
kunw
93a8219108 Fix timestamp value in query params 2017-06-09 15:59:20 +08:00
Steven Zou
dc56b50b1e add push-image button component 2017-06-09 15:46:16 +08:00
Daniel Jiang
ba785357da Merge pull request #2481 from reasonerjt/clair-integration 
add handlers in statemachine
 2017-06-09 15:28:12 +08:00
Tan Jiang
58c4993974 add handlers in statemachine 2017-06-09 14:55:15 +08:00
kunw
85c9aeafad Update audit log query params. 2017-06-09 14:37:38 +08:00
Steven Zou
a66d2adfff Merge pull request #2478 from wknet123/master-update-rule-creation 
Update for rule creation and styles.
 2017-06-09 13:38:25 +08:00
Steven Zou
2583b19bcf remove Clarity-Angular module import 2017-06-09 13:37:15 +08:00
kunw
c342b6a560 Update for rule creation and styles. 2017-06-09 13:22:17 +08:00
Steven Zou
65ef1f70c1 Merge pull request #2470 from wknet123/master-endpoint-integration 
Fix global message display issue
 2017-06-09 13:09:50 +08:00
Steven Zou
58fc326fb2 use *ngFor to replace *clrDgItems in user datagird 2017-06-09 13:07:26 +08:00
Wenkai Yin
f700b1bfc6 Merge pull request #2461 from ywk253100/170607_log_api 
Support query logs according to different conditions
 2017-06-09 11:08:08 +08:00
Tan Jiang
a905d72c59 fix typo and refine message in content trust interceptor 2017-06-09 09:13:59 +08:00
kunw
0c15dac241 Fix global message display issue 2017-06-08 18:37:16 +08:00
Steven Zou
8fd327912d fix coflicts between 1.1.0 and master 2017-06-08 16:51:19 +08:00
Daniel Jiang
42984fe1c9 refactory for scan job service (#2459) 
* refactory for scan job service and implement ScanJob.
 2017-06-08 15:04:23 +08:00
Wenkai Yin
b2380818fd support query logs according to conditions 2017-06-08 14:44:08 +08:00
kun wang
dff382ccee Merge pull request #2455 from wknet123/master-systeminfo-service 
Add system info service to shareable components.
 2017-06-07 19:13:58 +08:00
kunw
79531972c0 Add system info service to shareable components. 2017-06-07 19:00:20 +08:00
Steven Zou
ef3cf7454f enable pagination for user list 2017-06-07 18:23:58 +08:00
Steven Zou
36bb7cc2e0 Merge pull request #2451 from steven-zou/master 
Enable server-driven pagination for recent logs
 2017-06-07 15:28:30 +08:00
Steven Zou
aa0212460d Enable server-driven pagination for recent logs 2017-06-07 14:36:55 +08:00
Wenkai Yin
9d3cb5d4b6 fix #2226 2017-06-06 18:05:15 +08:00
Daniel Jiang
3363a1f389 Fix 2411 on branch 1.1.0 (#2431) (#2434) 
* fixes #2411
 2017-06-06 14:53:51 +08:00
Daniel Jiang
b3b95fbf7b Fix 2411 on branch 1.1.0 (#2431) 
* fixes #2411
 2017-06-06 13:41:43 +08:00
Steven Zou
3e02f756a3 Fix conflicts of list-repository.component.spec.ts 2017-06-06 13:36:44 +08:00
Steven Zou
fdbf1b9813 Update readme 2017-06-06 13:29:35 +08:00
Steven Zou
ef21b7d3c2 Refactor i18n methods and update readme 2017-06-06 13:26:39 +08:00
Daniel Jiang
c099ccf02e fix #2382 (#2422) 
* fix #2382
 2017-06-05 21:51:50 +08:00
kunw
8eac6d0030 Merge latest updates. 2017-06-05 19:22:40 +08:00
kunw
ec38754297 Update for shareable replication component. 2017-06-05 19:18:08 +08:00
Steven Zou
1d3364c1a3 Merge pull request #2424 from wknet123/master-stackview-repo-tag 
Add stack view repo-tag component.
 2017-06-05 18:08:43 +08:00
Wenkai Yin
0679796528 Merge pull request #2386 from ywk253100/170525_log_pagination 
Support pagination in GET recent logs API
 2017-06-05 17:15:15 +08:00
Wenkai Yin
f03993a777 Merge pull request #2376 from ywk253100/170524_email 
Refactor email API
 2017-06-05 16:59:10 +08:00
kunw
9684f146b3 Update styles for stack view. 2017-06-05 16:58:16 +08:00
Wenkai Yin
9c4adbe8c9 Merge remote-tracking branch 'upstream/master' into 170525_log_pagination 
Conflicts:
	src/common/security/rbac/context_test.go
	src/ui/api/statistic.go
	src/ui/projectmanager/pm.go
 2017-06-05 16:53:15 +08:00
Yan
d00aba8de8 Merge pull request #2367 from ywk253100/170524_search 
Refactor search API
 2017-06-04 22:41:55 -07:00
Yan
1171e4c4d6 Merge pull request #2378 from ywk253100/170524_sync 
Refactor sync registry API
 2017-06-04 20:32:14 -07:00
Yan
158d14f559 Merge pull request #2358 from ywk253100/170523_replica 
Refactor policy, job, target API
 2017-06-04 20:29:05 -07:00
Yan
b1d09cdccb Merge pull request #2372 from ywk253100/170524_statistics 
Refactor statistics API
 2017-06-04 20:28:48 -07:00
Steven Zou
5e5a93d59b Add more usage info to readme 2017-06-05 10:19:13 +08:00
kunw
cc6571f0a2 Update styles for stack view. 2017-06-02 20:24:41 +08:00
kunw
4246f55180 Merge latest updates. 2017-06-02 16:53:03 +08:00
Steven Zou
8bc8aa43a4 Merge pull request #2415 from steven-zou/master 
Add integration guideline document for harbor UI library
 2017-06-02 16:50:07 +08:00
kunw
e7132c5252 Add stackview for repo-tags 2017-06-02 16:49:29 +08:00
Steven Zou
1d57e1b41c Add guideline for ui library integration 2017-06-02 16:27:51 +08:00
Steven Zou
55a39e9bf3 Add guideline for ui library integration 2017-06-02 16:06:13 +08:00
Wenkai Yin
e0fe068308 update 2017-06-02 14:17:01 +08:00
Wenkai Yin
95a2a01bb0 Merge pull request #2377 from ywk253100/170524_ldap 
Refactor ldap API
 2017-06-02 13:46:51 +08:00
Wenkai Yin
0ede4bca7b Merge pull request #2381 from ywk253100/170525_config 
Refactor config API
 2017-06-02 13:46:33 +08:00
kun wang
d7a39f2f9c Merge pull request #2395 from wknet123/master-enable-paging-sorting 
Update components for pagination and sorting.
 2017-06-02 13:07:19 +08:00
kun wang
2aaa53f22b Merge pull request #2398 from wknet123/master-tags-revised 
Update UI for revised tags API.
 2017-06-02 13:06:49 +08:00
kunw
2f21ab8442 Update for revised tags API. 2017-05-31 16:29:17 +08:00
kunw
e1df278ab5 Update components for pagination and sorting. 2017-05-31 16:21:29 +08:00
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
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