Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 12:46:03 +01:00
Code Issues Projects Releases Wiki Activity
4,185 Commits 53 Branches 317 Tags 334 MiB
30a64b1923
Commit Graph

1233 Commits

Author SHA1 Message Date
Fuhui Peng (c)
148c6ecc53 fix issue about replication rule delete and username autocomplete and… … 2017-09-21 15:45:42 +08:00
Wenkai Yin
dc4f2ece72 readjust package structure 2017-09-20 15:24:19 +08:00
Wenkai Yin
5cd55220c8 Merge pull request #3244 from ywk253100/170919_golint 
Fix code style issues reported by golint
 2017-09-20 10:31:28 +08:00
Wenkai Yin
f0946b63cf fix code style issues reported by golint 2017-09-19 17:16:54 +08:00
Wenkai Yin
82dc758064 Merge pull request #3213 from ywk253100/170914_image_size 
Return image size when getting detail information of tag
 2017-09-19 17:09:49 +08:00
Wenkai Yin
8d7644b8b5 Merge pull request #3151 from ywk253100/170830_email_insecure 
Expose the insecure flag for email configuration
 2017-09-15 15:01:30 +08:00
Wenkai Yin
2ebcc454ba support image size 2017-09-15 13:34:23 +08:00
weibaohui
84d66d85fa Correct spelling 
Correct spelling
 2017-09-11 15:13:24 +08:00
Steven Zou
9987d89705 enable server end pagination for project list 2017-09-08 19:15:50 +08:00
Wenkai Yin
bb77ceebae Merge remote-tracking branch 'upstream/master' into 170830_email_insecure 2017-09-04 15:10:24 +08:00
Wenkai Yin
923a8d65b1 expose insecure flag in api 2017-09-04 15:10:07 +08:00
Fuhui Peng (c)
c98e1cc29e harbor-ui version 2017-08-30 14:40:14 +08:00
Fuhui Peng (c)
7b0afc4032 Merge branch 'master' of https://github.com/vmware/harbor into uitest 2017-08-30 13:55:07 +08:00
Fuhui Peng (c)
2987eb3e28 fix issue about view log 2017-08-30 13:30:53 +08:00
Yan
1a71b13591 update error format (#3125) 
* update error format

update

update

update

update

update

update

* update

* update
 2017-08-29 19:17:08 +08:00
Fuhui Peng (c)
1d63deb742 fix issue about il8n about deleting repository 2017-08-28 11:25:17 +08:00
Yan
97f73dbf6c block pull scan failed image (#3119) 2017-08-28 10:30:59 +08:00
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