3365 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pengpengshui	ac2fc863cc	Merge branch 'master' of https://github.com/vmware/harbor	2017-07-26 03:54:52 +08:00
pengpengshui	30bd67748e	fix #2853 about replication rule link issue	2017-07-26 03:51:47 +08:00
Yan	fd473cbaa0	update DB Migrator according latest change. (#2763) ... * update DB Migrator according latest change. update format update add import update return the rc from container update update to false * add user_id	2017-07-24 19:48:12 -07:00
Yan	686b477775	update registry to 2.6.2 (#2851) ... rm dockerfile update add comments	2017-07-24 02:19:32 -07: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	45d583b171	Merge pull request #2837 from ywk253100/170721_integration ... Load absent property from env	2017-07-21 19:02:56 +08:00
Wenkai Yin	62c1bf5389	load absent property from env	2017-07-21 17:54:41 +08:00
Daniel Jiang	c68514bfb7	Merge pull request #2830 from reasonerjt/swagger-update-1.2.0 ... provide api to show log of scan job	2017-07-21 14:19:58 +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
Daniel Jiang	2a50559ff7	update swagger doc (#2822) ... * update swagger doc * remove unused definitions	2017-07-20 03:47:46 -07: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
Daniel Jiang	5c8be3502c	Merge pull request #2697 from yixingjia/rsyslog ... Prepare rsyslog docker based on photon	2017-07-19 18:08:05 +08: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	082f52fb7a	Merge pull request #2813 from ywk253100/170719_integration ... Update token file location	2017-07-19 14:37:07 +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
Steven Zou	73e95196df	Merge pull request #2802 from pengpengshui/master ... fix #2775 about create-rule modal connect test issue	2017-07-19 10:00:29 +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
Steven Zou	a9a79736b4	Merge pull request #2797 from pengpengshui/master ... fix #2662,#2795	2017-07-17 17:56:26 +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