Commit Graph

3242 Commits

Author SHA1 Message Date
Wenkai Yin
aecfcef51a Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-14 20:46:23 +08:00
Wenkai Yin
421e9b114e update 2017-06-14 20:35:51 +08:00
Wenkai Yin
802a2fbcce update 2017-06-14 20:23:29 +08:00
Yan
1e0f48b8c5 Merge pull request #2389 from ywk253100/170526_bug_fix
Checking whether the repo contains any tags when syncing repo between db and registry
2017-06-14 20:05:43 +08:00
Daniel Jiang
34f43e0542 Merge pull request #2511 from ywk253100/170614_test
Update test case for project manager based on admiral
2017-06-14 18:02:47 +08:00
wemeya
a091f6f935 modify prepare-swagger.sh and configure_swagger.md 2017-06-14 17:30:53 +08:00
wangyan
b71584457f udpate DB image version 2017-06-14 02:22:26 -07:00
Wenkai Yin
4d0ae36d4e update test case 2017-06-14 17:01:41 +08:00
Daniel Jiang
e17b46b951 Merge pull request #2506 from reasonerjt/clair-integration
handlers for image scan, store results overview in DB
2017-06-14 16:31:34 +08:00
Tan Jiang
8590c8d6bb remove orm debug setting from test case 2017-06-14 16:11:23 +08:00
Steven Zou
78f8a09177 Merge pull request #2507 from steven-zou/master
Improve components in UI library
2017-06-14 15:03:32 +08:00
Steven Zou
23635b6966 add placeholders to the datagird 2017-06-14 00:00:22 +08:00
Tan Jiang
ae2d868fd4 handlers for image scan, store results overview in DB 2017-06-13 23:37:54 +08:00
Steven Zou
f981415b5b make tag name clickable in repo-tag-stack view 2017-06-13 22:24:38 +08:00
Steven Zou
1d543c9212 Improve components in UI library 2017-06-13 20:38:21 +08:00
wangyan
02df58b4b6 clair integration 2017-06-13 02:13:24 -07:00
Steven Zou
b695ec78db Merge pull request #2504 from steven-zou/master
Improve repo-tag-stack view
2017-06-13 17:04:12 +08:00
Steven Zou
71f3480932 Improve repo-tag-stack view 2017-06-13 16:09:46 +08:00
Wenkai Yin
f0c47b990b Merge pull request #2495 from ywk253100/170605_pm
Implement project manager based on PMS
2017-06-13 15:46:48 +08:00
Steven Zou
95e4faa157 Merge pull request #2500 from steven-zou/master
update i18n messages
2017-06-13 15:30:53 +08:00
Wenkai Yin
5a25445096 update according to the comments 2017-06-13 15:28:48 +08:00
Steven Zou
2b3d912f43 update i18n messages 2017-06-13 13:22:09 +08:00
Steven Zou
1c9f5a4d8f Merge pull request #2498 from steven-zou/master
Implement tag detail component & refactor vul summary bar chart
2017-06-13 10:50:58 +08:00
Steven Zou
2072fc237e Implement tag detail component & refactor vul summary bar chart 2017-06-12 19:40:51 +08:00
Wenkai Yin
539c0375a1 support pagination 2017-06-12 18:36:10 +08:00
Wenkai Yin
0925fd35f1 implement project manager based on PMS 2017-06-12 14:43:26 +08:00
Steven Zou
83be92f1f0 Merge pull request #2493 from steven-zou/master
Merge fix code from 1.1.0 branch back to master
2017-06-12 13:59:26 +08:00
Steven Zou
4d2a2363a7 Merge fix code from 1.1.0 branch back to master 2017-06-12 13:43:44 +08:00
Wenkai Yin
6b4ae098db update 2017-06-09 18:24:52 +08:00
Wenkai Yin
20cf8de0f7 Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-09 16:41:13 +08:00
Wenkai Yin
e97d7dab85 refactor GET /projects 2017-06-09 16:41:02 +08:00
Steven Zou
3ebd4758c1 Merge pull request #2483 from wknet123/master-log-query-params
Fix timestamp value in query params
2017-06-09 16:33:41 +08:00
kun wang
603cc2bd28 Merge pull request #2484 from steven-zou/master
add push-image button component
2017-06-09 16:28:46 +08:00
kunw
93a8219108 Fix timestamp value in query params 2017-06-09 15:59:20 +08:00
Steven Zou
dc56b50b1e add push-image button component 2017-06-09 15:46:16 +08:00
Daniel Jiang
ba785357da Merge pull request #2481 from reasonerjt/clair-integration
add handlers in statemachine
2017-06-09 15:28:12 +08:00
Tan Jiang
58c4993974 add handlers in statemachine 2017-06-09 14:55:15 +08:00
Steven Zou
6cee61cb23 Merge pull request #2480 from wknet123/master-log-query-params
Update audit log query params.
2017-06-09 14:54:47 +08:00
kunw
85c9aeafad Update audit log query params. 2017-06-09 14:37:38 +08:00
Steven Zou
746d901397 Merge pull request #2479 from steven-zou/release-1.1.0
use *ngFor to replace *clrDgItems in user datagird
2017-06-09 13:49:38 +08:00
Steven Zou
a66d2adfff Merge pull request #2478 from wknet123/master-update-rule-creation
Update for rule creation and styles.
2017-06-09 13:38:25 +08:00
Steven Zou
2583b19bcf remove Clarity-Angular module import 2017-06-09 13:37:15 +08:00
kunw
c342b6a560 Update for rule creation and styles. 2017-06-09 13:22:17 +08:00
Steven Zou
65ef1f70c1 Merge pull request #2470 from wknet123/master-endpoint-integration
Fix global message display issue
2017-06-09 13:09:50 +08:00
Steven Zou
58fc326fb2 use *ngFor to replace *clrDgItems in user datagird 2017-06-09 13:07:26 +08:00
Wenkai Yin
f700b1bfc6 Merge pull request #2461 from ywk253100/170607_log_api
Support query logs according to different conditions
2017-06-09 11:08:08 +08:00
Daniel Jiang
e54be8862d Merge pull request #2474 from reasonerjt/comment-in-proxy
fix typo and refine message in content trust interceptor
2017-06-09 10:02:46 +08:00
Tan Jiang
a905d72c59 fix typo and refine message in content trust interceptor 2017-06-09 09:13:59 +08:00
kunw
0c15dac241 Fix global message display issue 2017-06-08 18:37:16 +08:00
Daniel Jiang
3586090bf6 Merge pull request #2467 from steven-zou/master
fix conflicts between 1.1.0 and master
2017-06-08 17:16:08 +08:00