Commit Graph

3243 Commits

Author SHA1 Message Date
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
Wenkai Yin
186538010d Merge pull request #2717 from ywk253100/170706_integration
Update auth context as Admiral's API changed
2017-07-07 11:03:13 +08:00
Wenkai Yin
f7412b0c31 update auth context as Admiral's API changed 2017-07-06 18:32:22 +08:00
Yan
c0f1e7f419 Merge pull request #2714 from wy65701436/DB-update
update user realname
2017-07-06 00:26:20 -07: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
yixingjia
326b65ef23 Merge pull request #2700 from yixingjia/upgradeclair
Update Clair to 2.0.1
2017-07-06 11:02:56 +08:00
Daniel Jiang
b96770b90a Merge pull request #2693 from reasonerjt/clair-notification
Clair notification handler
2017-07-05 20:18:34 +08:00
wangyan
bdf4641c43 update user realname
update
2017-07-05 03:43:21 -07:00
yixingj
b2ac6c37d2 Also update clair in offline package 2017-07-05 18:28:41 +08:00
Yan
d849c36e3f Merge pull request #2570 from samifruit514/master
Allow 255 chars for Realname
2017-07-05 03:17:57 -07:00
Wenkai Yin
b866200e4f Move some method of project manager to security context 2017-07-05 17:41:58 +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
root
f2d02848db change tag retrive's timeout 2017-07-04 10:03:38 +00:00
yixingj
34c812243e Update Clair to 2.0.1
fix the Debian mapping issue.
2017-07-04 17:44:10 +08: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
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