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 |
|
Steven Zou
|
8fd327912d
|
fix coflicts between 1.1.0 and master
|
2017-06-08 16:51:19 +08:00 |
|
Daniel Jiang
|
42984fe1c9
|
refactory for scan job service (#2459)
* refactory for scan job service and implement ScanJob.
|
2017-06-08 15:04:23 +08:00 |
|
Wenkai Yin
|
b2380818fd
|
support query logs according to conditions
|
2017-06-08 14:44:08 +08:00 |
|
Daniel Jiang
|
2e5a4003a8
|
Merge pull request #2401 from wemeya/master
modify swagger.yaml
|
2017-06-08 11:16:52 +08:00 |
|
kun wang
|
dff382ccee
|
Merge pull request #2455 from wknet123/master-systeminfo-service
Add system info service to shareable components.
|
2017-06-07 19:13:58 +08:00 |
|
kunw
|
79531972c0
|
Add system info service to shareable components.
|
2017-06-07 19:00:20 +08:00 |
|
Steven Zou
|
0eaa6a4868
|
Merge pull request #2454 from steven-zou/release-1.1.0
enable pagination for user list
|
2017-06-07 18:50:22 +08:00 |
|
Steven Zou
|
ef3cf7454f
|
enable pagination for user list
|
2017-06-07 18:23:58 +08:00 |
|
Steven Zou
|
36bb7cc2e0
|
Merge pull request #2451 from steven-zou/master
Enable server-driven pagination for recent logs
|
2017-06-07 15:28:30 +08:00 |
|
Steven Zou
|
aa0212460d
|
Enable server-driven pagination for recent logs
|
2017-06-07 14:36:55 +08:00 |
|
Daniel Jiang
|
21a28e3fe6
|
Merge pull request #2442 from ywk253100/170606_user_api
Keep the same behavior with UI, fix #2226
|
2017-06-07 10:57:22 +08:00 |
|
Wenkai Yin
|
9d3cb5d4b6
|
fix #2226
|
2017-06-06 18:05:15 +08:00 |
|
Daniel Jiang
|
39b4055d47
|
Merge pull request #2436 from reasonerjt/fix-2411-master
Fix 2411 master
|
2017-06-06 15:34:51 +08:00 |
|
Daniel Jiang
|
3363a1f389
|
Fix 2411 on branch 1.1.0 (#2431) (#2434)
* fixes #2411
|
2017-06-06 14:53:51 +08:00 |
|
Steven Zou
|
428268f0d5
|
Merge pull request #2432 from steven-zou/master
Make i18n configurable and update related readme parts
|
2017-06-06 13:59:06 +08:00 |
|
Tan Jiang
|
6e25fb69c2
|
merge code change in branch 1.1.0 to fix 2411
|
2017-06-06 13:57:48 +08:00 |
|
Daniel Jiang
|
b3b95fbf7b
|
Fix 2411 on branch 1.1.0 (#2431)
* fixes #2411
|
2017-06-06 13:41:43 +08:00 |
|
Steven Zou
|
3e02f756a3
|
Fix conflicts of list-repository.component.spec.ts
|
2017-06-06 13:36:44 +08:00 |
|
Steven Zou
|
fdbf1b9813
|
Update readme
|
2017-06-06 13:29:35 +08:00 |
|
Steven Zou
|
ef21b7d3c2
|
Refactor i18n methods and update readme
|
2017-06-06 13:26:39 +08:00 |
|
Daniel Jiang
|
c099ccf02e
|
fix #2382 (#2422)
* fix #2382
|
2017-06-05 21:51:50 +08:00 |
|
Steven Zou
|
5512478593
|
Merge pull request #2427 from wknet123/master-shareable-list-rule
Update for shareable replication component.
|
2017-06-05 19:39:37 +08:00 |
|
kunw
|
8eac6d0030
|
Merge latest updates.
|
2017-06-05 19:22:40 +08:00 |
|
kunw
|
ec38754297
|
Update for shareable replication component.
|
2017-06-05 19:18:08 +08:00 |
|
Steven Zou
|
1d3364c1a3
|
Merge pull request #2424 from wknet123/master-stackview-repo-tag
Add stack view repo-tag component.
|
2017-06-05 18:08:43 +08:00 |
|