Commit Graph

3515 Commits

Author SHA1 Message Date
Wenkai Yin
bdbdb383ac update 2017-06-30 16:21:55 +08:00
wemeya
ddee1ca7e8 Update swagger.yaml 2017-06-30 15:27:32 +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
yixingj
c3587389e9 fix nginx offiline package 2017-06-30 14:13:18 +08:00
yixingj
fc50fd51d5 Move nginx to photon OS 2017-06-30 14:03:42 +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
Daniel Jiang
fdef3258f1 Merge pull request #2667 from reasonerjt/configuration-api
Configuration api to handle scan all policy
2017-06-29 16:45:03 +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
yixingjia
b79b80c6ee Merge pull request #2657 from yixingjia/clairofflinedata
Support include offline data on clair startup
2017-06-28 18:01:34 +08:00
Daniel Jiang
e5e5e75768 Merge pull request #2656 from ywk253100/170628_pms
Update test cases of PMS project manager
2017-06-28 16:05:51 +08:00
yixingj
a23c6ee8c6 Support include offline data on clair startup 2017-06-28 15:45:16 +08: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
Daniel Jiang
476494d122 Merge pull request #2635 from reasonerjt/clair-integration
provide an API to scan all images, and some refactory
2017-06-27 21:45:02 +08:00
Steven Zou
c90dacb0ba Merge pull request #2648 from steven-zou/master
Upgrade UI builder to 1.2.7
2017-06-27 19:26:57 +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
Steven Zou
22a4e91a79 Upgrade UI builder to 1.2.7 2017-06-27 18:33:53 +08:00
yixingjia
a64926231d Merge pull request #2629 from yixingjia/postgresqlonphoton
Update clair postgresql to use photon os
2017-06-27 17:30:26 +08:00
Yan
73c44723f5 Merge pull request #2630 from yixingjia/fixcommonname
Fix common name issue.
2017-06-26 23:15:58 -07:00
Steven Zou
85db2ad892 fix issue of ui builder image entry command 2017-06-27 13:49:41 +08:00
yixingj
27670742b4 Change version fromat and add init db sql directory 2017-06-26 15:31:34 +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
Steven Zou
8a15a5002c update travis.yml 2017-06-26 13:13:10 +08:00
yixingj
4a583b0229 Fix common name issue.
The web server's cn name should be different with the CA's common name
other wise we cannot vew the harbor UI if we use this scripte to create
certificate.
2017-06-26 13:06:14 +08:00
Steven Zou
0dd38abe5a Update Makefile 2017-06-26 11:24:04 +08:00
yixingj
e0af9c036f Update clair postgresql to use photon os 2017-06-26 10:56:29 +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
Wenkai Yin
cf13b7bb68 Merge pull request #2588 from ywk253100/170621_auth
Implement admiral login
2017-06-26 10:17:09 +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