Commit Graph

3227 Commits

Author SHA1 Message Date
Yan
d849c36e3f Merge pull request #2570 from samifruit514/master
Allow 255 chars for Realname
2017-07-05 03:17:57 -07: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
Yan
2638e3dc7d Merge pull request #2682 from wy65701436/db-migrate
1.2.0 DB migrator
2017-07-03 22:51:31 -07:00
Wenkai Yin
7a85eef0ef Merge pull request #2685 from ywk253100/170630_integration
Update codes of auth context
2017-07-04 13:14:21 +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
Daniel Jiang
1ca1eddb0f Merge pull request #2676 from yixingjia/nginxonphoton
Move nginx to photon OS
2017-07-01 00:08:08 +08:00
wangyan
c986c33a6c 1.2.0 DB migration
update

update
2017-06-30 03:01:56 -07: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
6f5d936507 Merge pull request #2646 from wemeya/swagger
Update swagger.yaml
2017-06-30 16:30:26 +08:00
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
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