Commit Graph

421 Commits

Author SHA1 Message Date
Steven Zou
7ee052b9dd Update policy scheduler according to comments 2017-07-11 15:22:00 +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
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
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
Wenkai Yin
94507fc8a1 fix bugs found in test 2017-07-04 17:18:24 +08:00
Wenkai Yin
aac742e8ba update 2017-07-04 12:33:11 +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
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
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
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
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
Tan Jiang
d31a25317e fix nil pointer in vulnerability/details api 2017-06-22 18:26:40 +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
4fe5881121 bug fix 2017-06-21 19:24:29 +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
6aa3e51b40 update 2017-06-20 16:30:01 +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