Commit Graph

2507 Commits

Author SHA1 Message Date
pengpengshui
4dda6d8875
Merge pull request #4784 from pengpengshui/labelFilter
Add sort fun when filter labels in tag page  #4617
2018-04-27 15:35:45 +08:00
pfh
b520addf08 Add sort fun when filter label in tag page #4617 2018-04-26 10:24:25 +08:00
Qian Deng
ac8e5d6e25
Merge pull request #4768 from ninjadq/fix_bug_search_result
Fix bug on search result ui
2018-04-25 15:55:48 +08:00
pengpengshui
888379dfb5
Merge pull request #4764 from pengpengshui/addLock
Fix issue about read only mode warning undisappear about #4741
2018-04-25 13:17:11 +08:00
Wenkai Yin
54d6b08e7c
Merge pull request #4777 from reasonerjt/fix-clair-sev
Fix mis-interpretation of severity in Clair
2018-04-25 12:27:40 +08:00
pengpengshui
585bde163f
Merge pull request #4767 from pengpengshui/stickLabel
Modify color panel and add labels to imgs frequently click problem
2018-04-25 11:34:48 +08:00
Tan Jiang
93c448d91b Fix mis-interpretation of severity in Clair
Currently "Critical" vulnerablity is treated as "Unknown" in Harbor.
This commit provides a quickfix that it will be interpret as "High".  In
future, we should consider introduce "Critical" and enable UI to handle
it to be more consistent with CVSS spec.
2018-04-25 10:31:12 +08:00
Deng, Qian
456b0c40cb Fix bug on search result ui
Fix issue #3852, After global search result returned if you research another item, the content will not refresh.
2018-04-23 19:58:22 +08:00
pfh
566e867984 Modify color panel and add labels to imgs click problem 2018-04-23 19:07:44 +08:00
pfh
9994ea6974 fix issue about read only mode warning undisappear about #4741 2018-04-23 11:24:31 +08:00
pfh
f72a41694a Modify tooltips size about authentication 2018-04-23 10:51:37 +08:00
pfh
cdcaff10bf Modify click to registry under project 2018-04-20 21:30:40 +08:00
Deng, Qian
de0927578f Fix bug sent multiple scan request
Every time after add lable or delte lable scan button will trigger multiple requests
2018-04-20 19:42:04 +08:00
Steven Zou
6bab3310ae
Merge pull request #4755 from pengpengshui/replication
Modify replication rule list not seleted when load first
2018-04-20 19:29:13 +08:00
pfh
e92ef72902 Modify replication rule list not seleted first 2018-04-20 18:58:37 +08:00
Daniel Jiang
641f01eb0e
Merge pull request #4738 from steven-zou/fix_nil_job_logger_issue
Return the logger.Interface instead of the pointer of logger to avoid nil checking issue
2018-04-20 18:53:44 +08:00
Steven Zou
a17436962f Return the logger.Interface instead of the pointer of logger to avoid nil checking issue 2018-04-20 14:59:28 +08:00
Tan Jiang
1fc4142e1a Do not call chown to config files
This commit fixes a recently discovered issue on Kubernetes #4496
It make necessary to avoid calling `chown` to config files during the
bootstrap of the containers.
2018-04-20 13:44:21 +08:00
Steven Zou
4da4dd6694
Merge pull request #4717 from pengpengshui/breadScrumb
Modify bread crumb for vic
2018-04-19 19:24:27 +08:00
Steven Zou
850c09f3f4
Merge pull request #4723 from pengpengshui/skinnable
Modify login bg image position about skinnable
2018-04-19 17:32:02 +08:00
Fuhui Peng (c)
890cbb727c Modify harbor-ui version 2018-04-19 15:52:30 +08:00
Fuhui Peng (c)
9082b50bb9 Merge branch 'master' of https://github.com/vmware/harbor into breadScrumb 2018-04-19 15:34:20 +08:00
Steven Zou
6f83b9e563 Fix the issue of causing the UI UT cases failed
downgrade the zone.js version to 0.8.19 and fix it
2018-04-19 15:30:12 +08:00
Fuhui Peng (c)
3c42277651 Modify loginBg position about skinnable 2018-04-19 14:03:19 +08:00
Steven Zou
9a2b522a2f
Merge pull request #4720 from ninjadq/fix_default_view_to_card_view
Fix default view problem and styles issues
2018-04-19 13:46:55 +08:00
Fuhui Peng (c)
cdefac82e7 Delete needless code about breadcrueb 2018-04-19 12:28:13 +08:00
Fuhui Peng (c)
e41db9469e Merge remote-tracking branch 'upstream/master' into breadScrumb 2018-04-19 11:11:43 +08:00
Daniel Jiang
f8d577994f
Merge pull request #4719 from reasonerjt/fix-db-broken-pipe
Fix intermittent `broken pipe` issue in log
2018-04-19 10:23:59 +08:00
Deng, Qian
ca9de64cdb Fix default view problem and styles issues
Set default view of repo to cardview
Fix card title style issue that break test
2018-04-18 21:16:06 +08:00
Fuhui Peng (c)
8a41bcab93 Modify bread crumb for vic 2018-04-18 18:29:06 +08:00
Daniel Jiang
5792829951
Merge pull request #4706 from ywk253100/180418_admiral
Fix bug #4688
2018-04-18 18:23:24 +08:00
Tan Jiang
7fa8261661 Fix intermittent broken pipe issue in log
This commit fixes #4713, by adopting the suggested fix in:
https://github.com/go-sql-driver/mysql/issues/529
When creating the DB instance in orm, call `SetConnMaxLifetime()`
2018-04-18 17:39:13 +08:00
stone
2f1989d211
Merge pull request #4672 from ninjadq/fix_bug_search_member_by_username
Add query string when get members
2018-04-18 16:42:28 +08:00
Wenkai Yin 79628
f6bd2f245d Fix bug #4688
Fix bug: the user can push images although he have no permisson by checking empty value before assign permissions.
2018-04-18 12:03:06 +08:00
Deng, Qian
02b00724f9 Fix readonly mode show in vic and rewording the tooltip
Hidden readonly mode on vic
Reword the tooltip
2018-04-18 12:02:54 +08:00
Deng, Qian
cb79d1c38b Fix bugs on configuration save
When configuration saving, an error undefined no atrribute toString will occur. This commit will fix it.
2018-04-17 20:12:34 +08:00
Deng, Qian
c31fb5ddf2 Fix UI/UX issues and manuely refresh component when fresh
1. Fix card-title text alignment
2. Trancate text in title if length greater then 29
3. Fix auto refresh data when loading next page in card-view
2018-04-17 19:50:23 +08:00
pengpengshui
813f6d2ed2
Merge pull request #4684 from pengpengshui/labelCase
Add filter images by label testcase
2018-04-17 18:17:10 +08:00
Deng, Qian
286defa367 Add query string when get members 2018-04-17 15:36:29 +08:00
pfh
2989ad6c92 Delete a unused file 2018-04-17 10:57:21 +08:00
Qian Deng
0f271710ae
Merge pull request #4673 from ninjadq/fix_bug_4665
Fix bug 4665 project admin can not change the role of some user
2018-04-17 10:47:03 +08:00
pfh
786a082fff Fix issue about label filter and I18n 2018-04-17 10:22:46 +08:00
pfh
e9052dd42a Merge remote-tracking branch 'upstream/master' into fixIssue 2018-04-17 10:19:16 +08:00
Steven Zou
ca8d3bdcc9
Merge pull request #4638 from vmware/use_redis_url_addr
Use redis URL address to replace host:port when connecting to redis server
2018-04-17 10:12:51 +08:00
pfh
bd28eb4541 Add Filter Label about imgs 2018-04-17 10:08:19 +08:00
Deng, Qian
9eec96afd6 Fix bug 4665 project admin can not change the role of some user 2018-04-16 18:57:26 +08:00
stonezdj
7e57c685ac Add project member search by name
Previous implementation contains the search user by name feature. This implementation can search user and user group by name.
2018-04-16 18:38:10 +08:00
Daniel Jiang
63ad0efd4f
Merge pull request #4637 from ywk253100/180412_bugfix
Bug fix
2018-04-13 19:39:50 +08:00
Yan
ab4018e967
Fix readonly error message and push existing image bug (#4654) 2018-04-13 19:22:28 +08:00
Steven Zou
adc2f8f124 Use redis URL address to replace host:port when connecting to redis server
replace tcp host:port with
'redis://arbitrary_usrname:password@ipaddress:port/database_index'

update prepare to generate config yaml file of job service based on harbor.cfg

update harbor.cfg default values
2018-04-13 19:19:56 +08:00
pengpengshui
4ab135a7ed
Merge pull request #4645 from pengpengshui/fixIssue
Fix issue about label filter #4636
2018-04-13 11:33:59 +08:00
Wenkai Yin 79628
ed0effb9c2 Bug fix
When deleting tags belonged to the same repository concurrently, the repository may be deleted by one API call and the other calls get 404. This commit logs a warning message and doesn't return 404.
2018-04-13 10:57:22 +08:00
pfh
9ebe8d64da Fix issue about label filter #4636 2018-04-13 09:49:17 +08:00
wangyan
04816222c0 Update ci test images to busybox 2018-04-12 18:21:20 -07:00
Steven Zou
b5b728bee3 Fix the vulnerability issues in the job service code
'Errors unhandled' in 'jobservice/job/impl/logger/job_logger.go'
'TLS InsecureSkipVerify set true' in 'jobservice/opm/hook_client.go'
2018-04-12 15:12:39 +08:00
stonezdj
de49165427 Refactor project member API
1) Remove the previous /api/projects/?:project_id/members/:userid
    2) Move the /api/projects/:project_id/projectmembers/?:pmid to
        /api/projects/:project_id/members/?:pmid
    3) Change the project member maintain ui to call new REST API
2018-04-11 17:49:33 +08:00
Daniel Jiang
1be9f9af20
Merge pull request #4627 from wy65701436/fix-readonly-issue
Log error when to write response body in readonly filter
2018-04-11 17:15:58 +08:00
pfh
8e4de81dfc Fix issue about links text and i18n 2018-04-11 14:50:55 +08:00
wangyan
d005ff941f log error when to write response body in readonly filter 2018-04-10 23:17:30 -07:00
Deng, Qian
4788a9fe3a Add deploy and add additional info on action bar 2018-04-10 20:50:51 +08:00
pengpengshui
0d576fb19b
Merge pull request #4610 from pengpengshui/fixIssue
Add bread crumb under project
2018-04-10 17:27:54 +08:00
pfh
5b6fe1fccc add bread crumb under project 2018-04-10 16:04:15 +08:00
Wenkai Yin
352c45b3ff Fix log API random failure on travis 2018-04-10 15:30:24 +08:00
pengpengshui
3cf075d9bb
Merge pull request #4602 from pengpengshui/labelCase
Label case
2018-04-09 18:07:36 +08:00
pfh
c80e33fd73 Midify label color panel about #4580 2018-04-09 15:54:30 +08:00
Steven Zou
2b799a576b
Merge pull request #4595 from vmware/enable_auth_checking
Apply auth checking to all the incoming requests
2018-04-09 12:50:34 +08:00
Steven Zou
85ae40f5ec Apply auth checking to all the incoming requests 2018-04-08 18:12:13 +08:00
pengpengshui
d94699dca3
Merge pull request #4585 from pengpengshui/fixIssue
Modify read only mode position, fix other issue
2018-04-08 17:46:06 +08:00
Steven Zou
529ad3e079
Merge pull request #4593 from vmware/add_more_log_2_js
Fix issue: failed to update the status of job if runtme error occurred
2018-04-08 14:03:34 +08:00
Daniel Jiang
9474a9773e
Merge pull request #4592 from reasonerjt/secret-in-header
Store secret in header instead of cookie
2018-04-08 13:32:10 +08:00
Steven Zou
233692c127 fix issue: job context may be nil pointer when trying to be closed in defer func 2018-04-08 13:03:23 +08:00
Deng, Qian
109c6a28fb Abstract repo click as a output event 2018-04-08 11:00:37 +08:00
Steven Zou
1cb40368f5 Fix issue: failed to update the status of job if runtme error occurred 2018-04-08 10:38:47 +08:00
Tan Jiang
ff06ec05c3 Store secret in header instead of cookie 2018-04-07 22:02:06 +08:00
Daniel Jiang
b5f52bc3fb
Merge pull request #4586 from reasonerjt/job-context-props
Read the system properties from scan job context
2018-04-07 10:23:30 +08:00
Daniel Jiang
b0860c9da0
Merge pull request #4584 from ywk253100/180404_dep
Update packages github.com/Sirupsen/logrus, github.com/gorilla/context and github.com/garyburd/redigo to new version
2018-04-05 12:25:22 +08:00
Tan Jiang
15580a5e8c Read the system properties from scan job context 2018-04-04 19:58:54 +08:00
pfh
9c5cc58f41 Modify read only mode position, fix other issue 2018-04-04 17:09:10 +08:00
stone
df63a73fd4
Merge pull request #4483 from stonezdj/api4assign_role_to_group4
Add REST API for assign role to group
2018-04-04 16:19:37 +08:00
stonezdj
9bcfaedc0e Add REST API for assign role to group 2018-04-04 13:39:42 +08:00
Qian Deng
1296a09034
Merge pull request #4577 from ninjadq/reduce_properties_in_hbr_repository
Reduce properties in hbr repository
2018-04-04 10:47:55 +08:00
Deng, Qian
0e3edeb0a8 Reduce properties in <hbr-repositry> 2018-04-03 19:55:31 +08:00
Deng, Qian
46ec21ae80 Fix bug vulnerability notification not showing 2018-04-03 18:00:09 +08:00
Steven Zou
44808650be Merge branch 'master' into job_service 2018-04-03 16:28:26 +08:00
Wenkai Yin
79f0ca96bc
Merge pull request #4572 from ywk253100/180402_job
Hide schedule job when listing replication jobs
2018-04-03 16:12:10 +08:00
Wenkai Yin
46ec8c70fa Update packages github.com/Sirupsen/logrus, github.com/gorilla/context and github.com/garyburd/redigo to new version 2018-04-03 11:48:06 +08:00
pengpengshui
73e32d1735
Merge pull request #4562 from pengpengshui/label
Modify label filter issue and add stick label to image case
2018-04-03 09:39:05 +08:00
Wenkai Yin
500651a5a1 Hide schedule job when listing replication jobs 2018-04-03 01:11:55 +08:00
Daniel Jiang
3af2b0caa5
Merge pull request #4568 from reasonerjt/scan-job-migrate
Scan job migrate
2018-04-02 21:40:30 +08:00
Tan Jiang
7aec4d9f21 Add UT and remove useless code. 2018-04-02 21:28:46 +08:00
Steven Zou
6c69a8cd05 Fix issue of stopping periodic job
improve op command by using cache
return 404 if no job found to stop
2018-04-02 18:08:03 +08:00
pfh
e5a757d78d Modify label filter issue and add stick label to image case 2018-04-02 14:45:52 +08:00
pengpengshui
6a1af52949
Merge pull request #4542 from pengpengshui/tagdetail
Add repo read only
2018-04-02 13:41:46 +08:00
Steven Zou
fee7f6ddef Merge branch 'job_service' into switch_job_service 2018-04-02 12:06:23 +08:00
Steven Zou
35fe857b07 Fix nil pointer issue in replication/target 2018-04-02 11:12:20 +08:00
Wenkai Yin
3436729d52
Merge pull request #4547 from ywk253100/180328_schedule_replication_job
Move schedule replication job to new jobservice
2018-03-30 21:03:45 +08:00
Steven Zou
0dd595ca63 Merge job_service into switch_job_service and fix conflicts 2018-03-30 19:30:56 +08:00
Steven Zou
ba91fc2861 Merge master into job_service and fix conflicts 2018-03-30 19:26:04 +08:00
Wenkai Yin
dd40f187ec Move schedule replication job to new jobservice 2018-03-30 17:44:05 +08:00
Steven Zou
250360307b Modify docker compose file template and make file to enable new job service
Fix typo in Makefile under photon

Fix version tag issue of redis container

Assign container name for redis container

Update docker compose template to enable network for redis

Remove exposed ports of redis from compose yaml tpl
2018-03-30 16:52:55 +08:00
Yan
892d9bf023
bypass docker client retry on push in readonly mode (#4524) 2018-03-29 23:49:00 -07:00
Daniel Jiang
07d7d467e7
Merge pull request #4539 from reasonerjt/trust-admiral-cert
Trust Root CA of VIC appliance when accessing Admiral
2018-03-30 13:30:15 +08:00
pfh
a43451c7ea Add repo read only and modify label issue 2018-03-30 11:38:45 +08:00
Steven Zou
013028ef4a Replace old job service package with V2 (rename packages) 2018-03-30 11:22:29 +08:00
Steven Zou
bfbb949034 Use the new job service(v2) to replace the old one 2018-03-29 23:30:03 +08:00
Steven Zou
d1899c840d Merge branch 'master' into job_service 2018-03-29 23:25:20 +08:00
Tan Jiang
5dd75bb0b0 Trust Root CA of VIC appliance when accessing Admiral 2018-03-29 19:53:41 +08:00
Steven Zou
9889d4badd Add UT cases for package pool 2018-03-29 19:50:44 +08:00
Deng, Qian
74cbfcb926 Add cardview for harbor 2018-03-29 19:37:23 +08:00
Deng, Qian
557c68a57c Abstract repo click as a output event 2018-03-29 19:37:23 +08:00
Steven Zou
e454456de2 Merge branch 'job_service' into add_ut_period 2018-03-28 19:54:03 +08:00
Qian Deng
6ca2f39186
Merge pull request #4491 from danielefranceschi/master
fix size suffix label for >1GB images
2018-03-28 18:44:43 +08:00
Steven Zou
d7aa1dacf0 Add UT cases for package period 2018-03-28 17:35:57 +08:00
Daniel Jiang
2c2cbd9c52
Merge pull request #4510 from reasonerjt/master
Add indexes to job tables and bump up schema version.
2018-03-28 16:58:16 +08:00
Steven Zou
75f4f7e0a4
Merge pull request #4513 from vmware/steven_job_service
Add UT cases for package opm (update travis yaml to start redis conta…
2018-03-28 16:30:03 +08:00
Tan Jiang
b6df6cf169 Add indexes to job tables and bump up schema version. 2018-03-28 16:15:54 +08:00
Wenkai Yin
22e06c46e3
Merge pull request #4512 from ywk253100/180328_replication_hook
Handle replication job status hook
2018-03-28 16:10:51 +08:00
Steven Zou
33c3603af2 Add waiting time before triggering http request 2018-03-28 15:57:59 +08:00
Steven Zou
d3909bb633 Add UT cases for package opm (update travis yaml to start redis container)
Fix data race issue in opm package
2018-03-28 15:28:34 +08:00
Wenkai Yin
55035ada2d
Merge pull request #4490 from ywk253100/180326_label
Delete the mapping relationship between resources and labels when the label is deleted
2018-03-28 14:38:01 +08:00
Steven Zou
d183226570
Merge pull request #4507 from vmware/steven_job_service
Fix the issue of causing config test failed
2018-03-28 14:16:09 +08:00
Qian Deng
a12c213cd1
Merge pull request #4494 from pengpengshui/tagdetail
Modify tag detail page and fix label bugs
2018-03-28 14:10:01 +08:00
Steven Zou
ee2da73c71 Refactor the job stats manager (remove useless object references) 2018-03-28 12:51:55 +08:00
Steven Zou
3ce31586df Fix the issue of causing config test failed 2018-03-28 12:40:36 +08:00
Steven Zou
b943bed6e6 Refactor redis pool and job stats manager for clarifying functions
also add UT cases for logger and part of opm package

Fix config test case issue
2018-03-28 12:11:45 +08:00
Daniel Jiang
0918a0ac7e
Merge pull request #4504 from reasonerjt/scan-job-migrate
Integrate with status hook of jobservice
2018-03-28 09:50:49 +08:00
Tan Jiang
0abf53c112 fix golint 2018-03-27 21:30:37 +08:00
Tan Jiang
be97a91650 Integrate with jobservice webhook 2018-03-27 21:27:52 +08:00
wangyan
01487b8221 Add readonly into systeminfo 2018-03-27 04:29:20 -07:00
Steven Zou
02b73b50f2 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-27 18:19:30 +08:00
Steven Zou
660d2610ba Add UT cases for api,core and config package
do changes to enable interfaces
2018-03-27 18:17:46 +08:00
pfh
22fa1ba189 Add control about label for admiral and standalone 2018-03-27 14:31:18 +08:00
pfh
42fa690f90 Modify tag detail page and fix label bugs 2018-03-27 10:12:37 +08:00
Tan Jiang
c859616e25 fix golint and go vet issue 2018-03-26 22:10:01 +08:00
Daniele Franceschi
71eeebec6f
fix rendering suffix for >1GB images 2018-03-26 14:48:13 +02:00
Tan Jiang
582deea9e7 resolve conflict 2018-03-26 18:11:39 +08:00
Tan Jiang
41ce0891ab Trigger scan job from UI. 2018-03-26 18:07:21 +08:00
Wenkai Yin
38568a1d2c
Merge pull request #4485 from ywk253100/180326_period_job
Create a job to call UI's replication API to do the period replication job
2018-03-26 17:31:10 +08:00
Steven Zou
e966698939 Extarct out redis pool initialization code to bootstrap 2018-03-26 16:38:53 +08:00
Tan Jiang
745b21abbc Merge remote-tracking branch 'upstream/master' into scan-job-migrate 2018-03-26 15:39:42 +08:00
Steven Zou
7663592551 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-26 15:30:36 +08:00
Steven Zou
5e2543833b Replace log in commmon package to logger in logger package for loose couple 2018-03-26 15:30:16 +08:00
stone
203b1b52bb
Merge pull request #4415 from stonezdj/user_group_and_project_member
Add DAO for user group and project member
2018-03-26 15:21:20 +08:00
stonezdj
49d960b060 Add DAO for project member and user group 2018-03-26 14:38:32 +08:00
yixingj
cb64ad96ff Make endpoint configurable
Move all the endpoint to harbor.cfg
2018-03-26 10:50:18 +08:00
Tan Jiang
381ecc3521 Merge with master 2018-03-26 10:37:17 +08:00
Wenkai Yin
dd156ca243 Handle replication job status hook 2018-03-24 21:18:58 +08:00
Wenkai Yin
1fea594c3d Trigger replication job from UI with new jobservice 2018-03-24 18:10:50 +08:00
Steven Zou
ba85378ac3 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-24 16:45:46 +08:00
Steven Zou
4cc9e0bf47 Close the open IO stream used by the job logger after job eixting 2018-03-24 16:45:26 +08:00
Wenkai Yin
85f357ec6b Delete the mapping relationship between resources and labels when the label is deleted 2018-03-24 02:22:51 +08:00
Wenkai Yin
e63d5a1c06 Create a job to call UI's replication API to do the period replication job 2018-03-23 23:53:15 +08:00
Wenkai Yin
837f46872a
Merge pull request #4463 from ywk253100/180313_replication_job
Migrate replication job to the new jobservice
2018-03-23 19:04:12 +08:00
Wenkai Yin
ed08a42e4b Migrate replication job to the new jobservice 2018-03-23 18:36:37 +08:00
Yan
cbcca015b0
add read only mode to stop docker push (#4433) 2018-03-23 03:16:08 -07:00
Steven Zou
75e29782f6 Implement job context for harbor jobs
initialize DAO
get configurations from admin server
2018-03-23 17:26:41 +08:00
Steven Zou
e160804be2 Fix nil job returned bug 2018-03-23 13:50:23 +08:00
pfh
71124d08dd Add label module 2018-03-23 09:58:06 +08:00
Steven Zou
49bb9bfceb Add logger sweeper to periodically clear outdated log files created by the jobs 2018-03-22 23:44:08 +08:00
Daniel Jiang
b4a4eb11c6
Merge pull request #4459 from ywk253100/180321_package_upgrade
Upgrade packages used by Harbor
2018-03-22 19:03:10 +08:00
Steven Zou
579b70c5e4 Inject logger into the execution context of running job for logging
define logger interface
implement a logger base on common log package
add getting log API
inject logger to the job execution context
2018-03-22 18:29:39 +08:00
Steven Zou
b001180d26 Merge branch 'job_service' of https://github.com/vmware/harbor into job_service 2018-03-22 13:43:12 +08:00
Steven Zou
e5f8beb35f Support status hook mechanism to report job status changes
refactor scheduler to extarct separate sub/pub system
fix bug in getJob
return all the stats data of running pools in the health check API
2018-03-22 13:41:00 +08:00
Wenkai Yin
c6e65d2ded Fuzzy matching repository name in GET repositories API 2018-03-22 13:38:26 +08:00
Wenkai Yin
0b7d4af4c1 Upgrade packages used by Harbor 2018-03-22 13:10:49 +08:00
Tan Jiang
b8ec419c8e Add missed package to fix compilation issue 2018-03-21 16:59:32 +08:00
Tan Jiang
483496ed93 remove swp file 2018-03-21 16:32:21 +08:00
Tan Jiang
613464bc16 Migrate scan job to job service V1 phase1 2018-03-21 16:25:32 +08:00
Tan Jiang
6303785b1b Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-21 13:06:40 +08:00
Yan
5edbd00318
Revise harbor build version (#4445) 2018-03-21 13:03:49 +08:00
Wenkai Yin
838b439560 Implement filter repository and tags by label API 2018-03-21 10:51:06 +08:00
Wenkai Yin
a7a72f78bd Return role and repository count info in GET project API 2018-03-20 19:09:06 +08:00
Steven Zou
ac544b3ead Support job related operational actions
support stop job
support cancel running generic job
support retry failed job
support checkin details progress of job
2018-03-20 18:03:04 +08:00
Tan Jiang
00825d3ca4 Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-20 17:37:27 +08:00
Steven Zou
fbc24d85db Support job operation actions like stop/cancel 2018-03-16 19:38:51 +08:00
Tan Jiang
b1d1e039dc Merge branch 'job_service' of https://github.com/vmware/harbor into scan-job-migrate 2018-03-16 15:30:53 +08:00
Daniel Jiang
cbedf099b5
Merge pull request #4342 from yixingjia/apimonitor
Add monitor API for Harbor components
2018-03-16 14:56:58 +08:00
Steven Zou
2f97970484 Support update job status for both generic and periodic job
refactor scheduler
refactor period.enqueuer
add stats manager component
2018-03-15 20:23:42 +08:00
Steven Zou
be75145858 Implement API service of getting job stats 2018-03-15 14:33:57 +08:00
Steven Zou
ea912729ec fix golint issues in code 2018-03-15 12:31:54 +08:00
Steven Zou
4b4e0ddfff Refactor job programming model
refine job context
remove setXXX injection methods in job.Interface
use parameters of Run to pass context and parameters
2018-03-15 12:26:01 +08:00
yixingj
4255ed167a Add monitor API for Harbor components.
1>AdminServer.
2>UI.
2018-03-15 10:39:55 +08:00
Steven Zou
28d02931d2 Support saving job stats to the baclend for the redis workerpool 2018-03-15 09:56:07 +08:00
stonezdj
44fc373c6d Add LDAP Group Search Configure Param 2018-03-15 06:16:47 +08:00
Steven Zou
b61dc39278 Refactor the job execution context interface 2018-03-14 19:17:38 +08:00
Steven Zou
5f5fb5b6ec Refine the context related things
change job context to interface
move job conetxt to the env package
move the concrete job implementation to separate folder
2018-03-14 18:24:53 +08:00
Steven Zou
414c36205c Support API service of checking stats of the worker pool 2018-03-14 16:59:00 +08:00
Steven Zou
6b46844565 Add sweeper to clear the outdated data before the workerpool is starting 2018-03-14 15:52:00 +08:00
Daniel Jiang
0efd8e3c54
Merge pull request #4396 from ywk253100/180309_label_resource
Implement adding/removing labels to/from repositories and images API
2018-03-14 14:15:31 +08:00
Wenkai Yin
bcf81224ad Update according to the comments 2018-03-14 13:42:19 +08:00
Steven Zou
7b8971e930 Implement periodically enqueue job feature
add scheduler based on redis
add job wrapper for redis driver
other necessary modules
2018-03-13 23:58:07 +08:00
Wenkai Yin
36b9c4e458 Implement adding/removing labels to/from repositories and images API 2018-03-12 19:30:05 +08:00
Tan Jiang
b81b55b0c1 Extend the length of project name in request validation 2018-03-12 16:07:06 +08:00
yixingjia
ac05806dec Reload the attributes of Harbor db and Clair db when restart Harbor. (#4349) 2018-03-12 15:40:45 +08:00
Wenkai Yin
379f113452 Implement label management API 2018-03-09 12:17:27 +08:00
Wenkai Yin
685140cda8
Merge pull request #4375 from ywk253100/180308_smtp_tls
Do the authentication with CRAM-MD5 when the connection is insecure
2018-03-08 17:42:18 +08:00
pfh
e017f63103 Modify pagenation in Use, project name exist issue #4350 #4205 #4177 2018-03-08 16:25:24 +08:00
Wenkai Yin
0a8929b85e Do the authentication with CRAM-MD5 when the connection is insecure 2018-03-08 14:21:44 +08:00
Steven Zou
7a3c35d178 Implement the base framework of job service V2
add API server
add redis worker pool
add configuration loader
add bootstrap process
add vendor via dep
2018-03-08 13:16:57 +08:00
pfh
805e4aa4db Modify fileter problem and input length #4185 #4264 2018-03-07 17:01:00 +08:00
pfh
b2fb33ba0d Modify replication rule from page to dialog #4296 2018-03-07 10:03:08 +08:00
Tan Jiang
2f2bc7f3ef add ut 2018-03-01 18:52:09 +08:00
Tan Jiang
3a5bff1615 Refine error returned by Authenticator
There has been inconsistency in terms of the error returned by
authenticator.
This commit introduces an error ErrAuth to explicitly flag an
authentication failure, which should be treated as user error such
as "invalid credentials", and other errors will be treated as system error.
2018-03-01 18:19:46 +08:00
Tan Jiang
fc4e427c41 Return zero instead of error if the volume directory is not found at admin server 2018-02-28 13:52:33 +08:00
Daniel Jiang
ef54647749
Merge pull request #4230 from stonezdj/project_member_refactor2
Refactor project member
2018-02-27 14:33:26 +08:00
patfrat
3159e2c514 Add French ui_ng translation 2018-02-26 14:53:59 +01:00
stonezdj
4c6d1488bd Add UT 2018-02-09 15:29:08 +08:00
stonezdj
f138067242 Refactor project member 2018-02-09 10:38:51 +08:00
Daniel Jiang
bd12a3f958
Merge pull request #4235 from ywk253100/180206_godep
Specify the versions of packages used in golang dep
2018-02-08 12:38:02 +08:00
Qian Deng
83ec190dbf
Merge pull request #4229 from ninjadq/fix_ui_test_case
Fix UI that break test case
2018-02-06 19:19:50 +08:00
Wenkai Yin
4e6800745b Specify the versions of packages used in golang dep 2018-02-06 18:49:40 +08:00
Deng, Qian
207ce035e1 Fix UI that break test case 2018-02-06 10:52:53 +08:00
Tan Jiang
40b6cb0d43 Return UAA error to Security Context layer 2018-02-05 21:00:19 +08:00
Daniel Jiang
87ca267b0f
Merge pull request #4221 from ywk253100/180131_beego_1.9.2
Upgrade beego 1.6.1 to 1.9.0
2018-02-05 19:17:44 +08:00
Wenkai Yin
10f56d26fe Change codes to make everything OK after upgrading to beego 1.9.0 2018-02-05 13:07:52 +08:00
Wenkai Yin
e7b431899e Upgrade beego from 1.6.1 to 1.9.0 2018-02-05 13:07:52 +08:00
Qian Deng
3b36236dc0
Merge pull request #4206 from ninjadq/open_add_member_modal_too_long
Fix bug open add member modal time too long
2018-02-01 14:57:47 +08:00
Wenkai Yin
58a3c590bd
Merge pull request #4207 from ywk253100/180131_beego_1.9.2
Ignore packages under tests in go dep
2018-02-01 13:51:48 +08:00
Wenkai Yin
ca92475fc2 Ignore packages under tests in go dep 2018-02-01 13:21:52 +08:00
Deng, Qian
26d6a04257 Fix bug open add member modal time too long 2018-02-01 12:57:40 +08:00
pfh
30a64b1923 Modify endpoint button name unsame with others issue 2018-01-31 16:43:22 +08:00
Deng, Qian
32793e2859 Add force refresh to new user form 2018-01-31 10:43:12 +08:00
Qian Deng
11288ccc0c
Merge pull request #4187 from ninjadq/leaving_repo_dialog
Fix open confirmation dialog when leving repo
2018-01-30 19:33:34 +08:00
pfh
09c1c39cd3 delete username and pwd in replication rule 2018-01-30 18:47:27 +08:00
Deng, Qian
f14bab1976 Fix open confirmation dialog when leving repo 2018-01-30 17:51:15 +08:00
pfh
715a49834b Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-30 13:22:06 +08:00
Qian Deng
ef1ed75ac9
Merge pull request #4175 from ninjadq/only_db_can_create_delete_user
Enhance Create && Delete button should diabled if not db auth
2018-01-30 13:13:05 +08:00
pfh
84c9a409ed Stop bubbling event in replication list 2018-01-30 11:53:53 +08:00
pfh
5e14601d2e Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-30 11:45:26 +08:00
pfh
008cf32bb3 Modify users about delete myself display issue #4164 2018-01-30 10:55:11 +08:00
Deng, Qian
b31a91b64a Fix UI bugs
Add deleting confirmation dialog back
Change buttons' style on tag component
2018-01-29 21:54:59 +08:00
Deng, Qian
afc56b0645 Enhance Create && Delete button should diabled if not db auth 2018-01-29 21:38:53 +08:00
Qian Deng
02554204e4
Merge pull request #4139 from ninjadq/fix_description_too_long
Fix description too long
2018-01-29 21:27:28 +08:00
pfh
63dcb27d08 Modify replication list unsave when modify username or pwd 2018-01-29 17:38:49 +08:00
Wenkai Yin
9022abfc13 Fix code issues found by Gas 2018-01-29 15:17:03 +08:00
Deng, Qian
8f1fa387c2 Fix admin rename tooltip 2018-01-29 10:33:03 +08:00
Deng, Qian
86dac8bbb9 Fix relication description too long to display 2018-01-26 18:10:39 +08:00
pfh
cc894a39bf Modify create endpoint ping icon undisappear auto about #4102 2018-01-26 15:44:10 +08:00
pfh
1dc6e57ffd Modify issue about endpoint delection unfreash page 2018-01-26 15:03:29 +08:00
pfh
791004c1b5 Add username adn pwd for target and unselected project name and target first time 2018-01-26 12:11:16 +08:00
Deng, Qian
d536c64566 Update test cases for UI changes 2018-01-25 20:36:03 +08:00
Deng, Qian
a1c850cfdb Display storage statistic only in filesystem mode 2018-01-25 20:36:03 +08:00
Deng, Qian
4a21f80b86 Add icon to buttons && change button group to buttons 2018-01-25 20:36:03 +08:00
Deng, Qian
bec2780576 Remove Confirmation on some simple batch actions 2018-01-25 20:36:02 +08:00
Deng, Qian
9a87c8b663 Fix bug tag size became exact number after reload data 2018-01-25 20:36:02 +08:00
Deng, Qian
08fd136c3c Enhance admin rename Logout after admin rename 2018-01-25 20:36:02 +08:00
Daniel Jiang
2519601d9f
Merge pull request #4121 from reasonerjt/add-go-redsync-vendor
Include go-redsync v1.0.1 in vendor
2018-01-25 17:58:15 +08:00
Daniel Jiang
5e5c0d4556
Merge pull request #4118 from reasonerjt/master
Fix Nil pointer issue in login function
2018-01-24 18:29:41 +08:00
Tan Jiang
ea38b7eefe Include go-redsync v1.0.1 in vendor 2018-01-24 15:30:20 +08:00
Tan Jiang
e9b656ce79 Fix Nil pointer issue in login function 2018-01-24 14:49:03 +08:00
pfh
5d35bed4d7 set replication list as single selection about #4107 2018-01-23 19:31:53 +08:00
pfh
f34ac6aa2b Modify package version 2018-01-23 14:47:33 +08:00
pfh
db670a2b09 Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-23 14:40:48 +08:00
Wenkai Yin
785fc57147
Merge pull request #4097 from ywk253100/180122_config_api
Convert struct to json string when storing it to database as a configuration item
2018-01-23 11:03:44 +08:00
Wenkai Yin
0165fcc82b Convert struct to json string when storing it to database as a configuration item 2018-01-22 20:01:28 +08:00
Qian Deng
bdb9d13590
Merge pull request #4072 from ninjadq/bugx_fix
Bugs fix
2018-01-22 17:56:02 +08:00
Tan Jiang
7ab1a2367a Update testify in vendor folder to v1.2.0 2018-01-21 21:52:46 +08:00
Fuhui Peng (c)
7d7620593d Modify create multiple replication rules with same name 2018-01-19 17:44:21 +08:00
Deng, Qian
e240290bc7 Merge branch 'master' into bugx_fix 2018-01-19 15:43:14 +08:00
Qian Deng
71baf937ea
Merge pull request #4057 from ninjadq/enhance_uaa_config
Fix UAA edit password bug
2018-01-19 15:34:43 +08:00
Wenkai Yin
515cac010a
Merge pull request #4071 from ywk253100/180117_policy_pagination
Add pagination support in listing replication policy API
2018-01-19 15:19:45 +08:00
stonezdj
b99a13cfa8 Fix bug 4073 2018-01-19 11:46:24 +08:00
Deng, Qian
86454d3e88 Fix project Name length issue
Extend the length of project name to 255
2018-01-18 18:51:16 +08:00
Wenkai Yin
69fa18c881
Merge pull request #4059 from ywk253100/180117_job_status
Support multiple status in query string of replication job listing API
2018-01-18 18:05:08 +08:00
Deng, Qian
873d537b17 Fix bug pull command not display regisrty ip or hostname 2018-01-18 17:58:17 +08:00
Deng, Qian
ea6fcd2aa1 Fix UAA edit password bug
Fix UAA edit password bug
Fix password edit bug
Remove unused code
Fix some tslint issue
2018-01-18 16:23:49 +08:00
Wenkai Yin
611709a7be Add pagination support in listing replication policy API 2018-01-18 15:54:12 +08:00
Fuhui Peng (c)
5b921d59aa Modify package.json 2018-01-18 15:08:45 +08:00
Fuhui Peng (c)
29e53817b9 Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-18 14:59:32 +08:00
Qian Deng
8f855ffc4e
Merge pull request #4037 from ninjadq/admin_rename_ui
add admin rename ui
2018-01-18 14:53:17 +08:00
Daniel Jiang
440f5e6364
Merge pull request #4039 from stonezdj/ldap_migrate_scope
Add update ldapScope for migrate
2018-01-18 14:12:06 +08:00
stone
c815dc01dd
Merge pull request #4043 from reasonerjt/uaa-bugfix
Read Email from UAA while onboarding user.
2018-01-18 14:04:35 +08:00
Deng, Qian
b884be3e72 Add admin rename ui Add UI Element for rename admin 2018-01-18 13:49:13 +08:00
Qian Deng
b61e0ec867
Merge pull request #3953 from ninjadq/fix_text_bugs
Fix bugs about i18n & text
2018-01-18 13:19:02 +08:00
pfh
757a99bc6e Add add endpoint button in replication rule
Modify stop job button privilege

Modify dispay issue about replication rule
2018-01-17 19:46:07 +08:00
Deng, Qian
ac34c2c1da Fix bugs about i18n & text 2018-01-17 17:24:07 +08:00
Wenkai Yin
9ec8b4d634 Support multiple status in query string of replication job listing API 2018-01-17 17:07:10 +08:00
stonezdj
01ba4e1ea8 Add update ldapScope for migrate 2018-01-17 14:01:57 +08:00
Tan Jiang
d5d913f51d Read Email from UAA while onboarding user.
Will call the userinfo API of UAA to get user info and generage user
model based on the response.  Also this commit include a change that
whenever the UAA Client is to be used it will update the configuraiton,
this is needed as we enable user to update the configuration of UAA via
UI.
2018-01-17 10:28:49 +08:00
Wenkai Yin
7ebcc82516 Fix bug: checking whether the status is null when listing replication jobs 2018-01-16 19:25:18 +08:00
Wenkai Yin
8cda2d8d65
Merge pull request #4036 from ywk253100/180116_s3
Propagate registry storage driver name to adminserver and return it in /api/systeminfo
2018-01-16 18:41:08 +08:00
pengpengshui
7537d0ff10
Merge pull request #4010 from pengpengshui/batchDelection
Modify replication list to batch delection mode
2018-01-16 17:59:20 +08:00
Qian Deng
5017670d00
Merge pull request #4005 from ninjadq/db_migrate_from_1_3_to_1_4
Update migration tool for v1.4
2018-01-16 17:04:54 +08:00
Wenkai Yin
53d5a2256a Propagate registry storage driver name to adminserver and return it in /api/systeminfo 2018-01-16 16:57:28 +08:00
pfh
78dcdc409f Modify replication list to batch delection mode and add admin privilege to project replication module
Modity text about new replication rule
2018-01-16 15:53:11 +08:00
Deng, Qian
b3e65ed71e Update migration tool for v1.4
1. Update database meta file
2. Add migration file for 1.4
2018-01-16 15:38:51 +08:00
Wenkai Yin
e1a5958258
Merge pull request #4013 from ywk253100/180112_property_name
Update the value of trigger type and schedule type
2018-01-16 13:26:33 +08:00
Daniel Jiang
a9fe5564df
Merge pull request #4011 from ywk253100/180112_fix_404
Handle /harbor/* with IndexController to fix UI 404 Page Not Found error
2018-01-15 17:10:43 +08:00
Wenkai Yin
a1dd8c3bff
Merge pull request #4004 from ywk253100/180111_jobservice
Provide a mechanism to stop pending and retrying jobs
2018-01-15 12:55:44 +08:00
Tan Jiang
bc1366c3e5 Enable user to edit UAA settings on UI 2018-01-14 11:47:45 +08:00
Wenkai Yin
af8dbff4ce Update the value of trigger type and schedule type 2018-01-12 16:19:41 +08:00
Tan Jiang
d6bf0ea11d Remove data generated by dao_test after the test. 2018-01-12 15:56:30 +08:00
Wenkai Yin
27b4197459 Handle /harbor/* with IndexController to fix UI 404 Page Not Found error 2018-01-12 15:48:42 +08:00
Wenkai Yin
4070ed5152 Provide a mechanism to stop pending and retrying jobs 2018-01-12 15:29:20 +08:00
Daniel Jiang
43afd426bb
Merge pull request #3995 from reasonerjt/admin-rename
Provide API to rename admin
2018-01-12 13:59:13 +08:00
stone
ec173305a3
Merge pull request #3974 from stonezdj/ldap_ping_timeout
Setting timeout for ldap ping
2018-01-12 11:22:27 +08:00
Tan Jiang
a392a8dc29 Provide API to rename admin
This is to provide a workaround for very corner case that in user's
authentication backend (LDAP, UAA) has a user called "admin" and because
Harbor's super user is hard coded to "admin" it's not possible to login
the "admin" with credentials in LDAP or UAA.

To minimize the impact, we'll provide an internal API for user to update
the super user's username from "admin" to "admin@harbor.local", this API
can be called by "admin" only, and is not reversible.
2018-01-11 23:01:06 +08:00
stonezdj
c48c7f7b6a Setting timeout for ldap ping 2018-01-10 15:14:30 +08:00
pengpengshui
7831a01f26
Merge pull request #3934 from pengpengshui/batchDelection
Modify filters' position and  modify member module switch members' ap…
2018-01-10 14:50:52 +08:00
Wenkai Yin
e26b442c9c
Merge pull request #3951 from ywk253100/180104_replicate_interval
Manual starting replication will be rejected if there are pending/running jobs
2018-01-10 10:56:45 +08:00
pfh
49160e6b13 Modify repository filter's position and inline alert text position
Modify issues about pagination and signed display

Modify test case about member
2018-01-09 14:48:25 +08:00
Wenkai Yin
7da89ec39b Passing tag as a parameter or the value will be overwritten 2018-01-08 15:23:35 +08:00
Daniel Jiang
f8af1f275e
Merge pull request #3911 from stonezdj/ldap_search_level
Ambiguous UI and internal values ldap_scope
2018-01-08 14:53:55 +08:00
Daniel Jiang
093e2bead2
Merge pull request #3950 from ywk253100/180105_ut
Add unit test for adding description of repository
2018-01-08 14:32:10 +08:00
pfh
93c524f5df Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-08 14:31:51 +08:00
pfh
9371bd41e8 Modify filters' position and modify member module switch members' apperence 2018-01-08 14:04:31 +08:00
Wenkai Yin
a9877c3e0a
Merge pull request #3905 from pengpengshui/repEnhance
Add new replication rule module
2018-01-05 18:19:11 +08:00
Wenkai Yin
87ce1c84d5 Manual starting replication will be rejected if there are pending/running jobs 2018-01-05 17:05:57 +08:00
Wenkai Yin
487c248227 Add unit test for adding description of repository 2018-01-05 16:52:48 +08:00
stonezdj
26b86984d2 Ambiguous UI and internal values ldap_scope #3764 2018-01-05 15:51:37 +08:00
pfh
162878a95c Modify test case and merge master 2018-01-05 15:39:52 +08:00
pfh
13308ce9d8 Merge remote-tracking branch 'upstream/master' into repEnhance 2018-01-05 14:09:03 +08:00
Qian Deng
f20103dc0c
Merge pull request #3906 from ninjadq/sidenav_to_verticalnav
Replace Navigation bar from Sidenav to Vertical Nav
2018-01-04 18:32:04 +08:00
Wenkai Yin
51297cdfd7
Merge pull request #3887 from ywk253100/171227_ssrf
Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs
2018-01-04 18:11:47 +08:00
Deng, Qian
2122503599 Replace Navigation bar from Sidenav to Vertical Nav
1. Replace Sidenav to VerticalNav
2. Update related test case
3. Move Endpoint and Repliction to two different label
2018-01-04 17:24:38 +08:00
pengpengshui
a75f347fd4
Merge pull request #3910 from pengpengshui/skinable
Modify skinnable json file and modify images path about #3909 #3879
2018-01-04 16:12:59 +08:00
Fuhui Peng (c)
7845405862 Modify skinnable json file and modify image path about #3909 #3879 2018-01-04 14:26:41 +08:00
Daniel Jiang
8e5115c832
Merge pull request #3870 from stonezdj/ldap_syncuser2
Sync user email in ldap #3663
2018-01-04 13:28:51 +08:00
Wenkai Yin
3448fd9a2d Fix SSRF security issue #3755 in ping target, email server and LDAP server APIs 2018-01-04 12:26:17 +08:00
Wenkai Yin
8e4e5e8b54 Add unit test cases for replication codes 2018-01-03 18:39:30 +08:00
Fuhui Peng (c)
bdd0664134 Merge master and modify package version 2018-01-03 17:52:22 +08:00
Daniel Jiang
1a7f6f36e2
Merge pull request #3903 from reasonerjt/uaa-ca-config
Enable configuring the CA Certificate for UAA
2018-01-03 17:28:39 +08:00
Tan Jiang
e02de2068a Enable configuring the CA Certificate for UAA
Enable configuring the path of root cert of UAA in harbor.cfg.  It only
takes effects if the verify_cert is set to "true" If the file does not
exist, the configuration is skipped.
The intention for this commit is to support integration with nested UAA
in PAS or PKS, we don't expect user to manually configure this value,
though he can do it if he wants.
2018-01-03 16:21:29 +08:00
Deng, Qian
a89678466e Enhancement of Metadata Descrition 2018-01-03 16:12:17 +08:00
Fuhui Peng (c)
31c3063783 Merge remote-tracking branch 'upstream/replication_enhancement' into repEnhance 2018-01-03 13:41:31 +08:00
Wenkai Yin
96a63c56b1 Merge remote-tracking branch 'upstream/master' into 180103_merge 2018-01-03 10:32:03 +08:00
pengpengshui
c5e434bd14
Merge pull request #3859 from pengpengshui/batch-delection
Add batch-delete operation in project module, replication module and user module
2018-01-03 10:27:55 +08:00
Fuhui Peng (c)
d7c0bc5168 Add batch delection operation in project module, replication module and user module
Modify privilege about project module

Modify package version about harbor-ui

Fix case failed in new batch delection UI
2018-01-02 19:42:44 +08:00
Daniel Jiang
5289ff8d5a
Merge pull request #3888 from stonezdj/ldap_security2
Do not display internal error message to user
2017-12-29 16:49:53 +08:00
Deng, Qian
ef045bb720 Add UI Component for UAA Auth 2017-12-29 12:02:13 +08:00
Tan Jiang
cae581979b Return UAA settings in configuration API
All the UAA settings will be read only as we expect user to modify it
via opsman instead of Harbor UI.
2017-12-28 11:30:18 +08:00
stonezdj
fba68ed000 Do not display internal error message to user 2017-12-27 19:22:17 +08:00
Wenkai Yin
4616153667
Merge pull request #3885 from ywk253100/171227_fix_update
Update project ID property if needed when updating replication policy
2017-12-27 15:45:53 +08:00
Wenkai Yin
a9d7403bee Update project ID property if needed when updating replication policy 2017-12-27 15:04:26 +08:00
Wenkai Yin
d36811ce52 Using the string trimmed the project name at the begining as the input of repository filter 2017-12-26 19:31:53 +08:00
stonezdj
35716dedd3 Sync user email in ldap #3663 2017-12-26 18:53:32 +08:00
stonezdj
9f99d0400c Call EscapeFilter for filter to avoid security issue 2017-12-26 15:34:14 +08:00
Fuhui Peng (c)
fb83f2433f Modify replication list datagrid 2017-12-26 14:54:59 +08:00
Fuhui Peng (c)
601c94d976 Merge remote-tracking branch 'upstream/replication_enhancement' into repEnhance
Update ui code to the latest
2017-12-26 14:06:55 +08:00
Daniel Jiang
94c78b3bee
Merge pull request #3858 from xuri/master
Simple code and typo fixed.
2017-12-26 12:06:27 +08:00
Daniel Jiang
8e53ca07c4
Merge pull request #3850 from reasonerjt/uaa-search
Search UAA when adding member to a project.
2017-12-26 09:51:50 +08:00
Tan Jiang
da20e4f11c Search UAA when adding member to a project.
1)Enable UAA client to search UAA by calling '/Users' API.
2)Implement 'SearchUser' in UAA auth helper, register it to auth
package.
2017-12-26 00:25:32 +08:00
Wenkai Yin
3be1d5a7fd Assign read-only privilege of replication policy to project admin and add stopping replication jobs API. 2017-12-25 23:49:21 +08:00
Fuhui Peng (c)
831f69595a Add ui code about replication enhancement 2017-12-25 17:02:21 +08:00
Qian Deng
36d4211aa7
Merge pull request #3806 from ninjadq/upgrade_clarity_to_0_10_x
Upgrade Clarity to 0.10.x and Angular To 4.3.0
2017-12-25 17:01:48 +08:00
Deng, Qian
3187dcb5ae Upgrade Clarity to 0.10.x and Angular To 4.3.0 2017-12-25 16:10:51 +08:00
pengpengshui
583ce589f1
Merge pull request #3815 from pengpengshui/uaa
Add ui control in uaa_auth #3803
2017-12-25 13:20:19 +08:00
Ri Xu
9adccd3723
Simple code and typo fixed.
Signed-off-by: Ri Xu <xuri.me@gmail.com>
2017-12-23 20:55:07 +08:00
yixingjia
7c510fa2c8
Merge pull request #3844 from yixingjia/addTest
Add test case for Clair DB configuration
2017-12-21 16:39:46 +08:00
Daniel Jiang
01ec0c7c17
Merge pull request #3841 from reasonerjt/dep-vendor
Switch to dep to manage the dependencies of source code
2017-12-21 13:20:39 +08:00
Tan Jiang
1bd7d5b719 Switch to golang/dep to manage the dependencies of source code
Used golang/dep to regenerate the code in /vendor directory.
Also edited `CONTRIBUTING.md` to explain the process for dependency
management.
2017-12-21 12:18:13 +08:00
yixingj
08a1b45b72 Add test case for Clair DB configuration
Add test case for validate Clair DB config
2017-12-21 11:39:53 +08:00
yixingjia
fa67e11680
Merge pull request #3831 from yixingjia/HA_Clair
Make Clair DB configurable
2017-12-21 11:31:26 +08:00
Daniel Jiang
60d2204f33
Merge pull request #3840 from ywk253100/171220_desc
Allow project developer to edit repository description
2017-12-21 02:17:58 +08:00
Tan Jiang
12cd733678 Remove useless code from UI router and API
Some URLs are not used on UI, so they are removed.  And the validation
code of API is removed as we use the security context approach.

fix test issue
2017-12-20 23:10:38 +08:00
yixingj
f63588855f Make Clair DB configurable
Make the HOST,PORT,USERNAME,DB configurable for
Clair
2017-12-20 18:29:50 +08:00
Wenkai Yin
73babbf1ab Modify unique constraint of table harbor_label
Add unique constraint to column name, scope and project_id  of table harbor_label to make creating same name labels under different projects valid
2017-12-19 22:15:56 +08:00
Steven Zou
2dd5b01fc4
Merge pull request #4773 from steven-zou/fix_js_restarting_issue
Fix the issue of intermittent restarting of job service
2018-04-26 15:05:32 +08:00
Steven Zou
e1b509e3f3 Fix the issue of intermittent restarting of job service
github issue: #4712
ping redis server before pool starting

Let worker pool to restart the message server if message server exits with error (controlled by max retries)
2018-04-25 17:02:16 +08:00
Wenkai Yin
8d62d989a5 Fix bug #4791
Remove the table join when querying repositories with project name
2017-12-19 21:47:39 +08:00
Daniel Jiang
052521b92c
Merge pull request #3821 from reasonerjt/uaa-restriction
Refactor the configuraiton of UAA
2017-12-19 19:36:09 +08:00
Daniel Jiang
c0c262cb53
Merge pull request #3790 from ywk253100/171214_author
Read image author from label 'maintainer' if author is null
2017-12-19 18:40:25 +08:00
Tan Jiang
2ffc58a5d4 Refactor the configuraiton of UAA
Remove the attribute "uaa_ca_root" from harbor.cfg and introduce
"uaa_verify_cert".  Similar to LDAP settings, this allow user to
explicitly turn of the cert verification against UAA server, such that
the code will work with self-signed certificate.
2017-12-19 14:42:07 +08:00
Daniel Jiang
62cebbdb5d
Merge pull request #3797 from reasonerjt/uaa-restriction
Disable user management features when auth mode is UAA.
2017-12-18 22:47:08 +08:00
Fuhui Peng (c)
fb794dac26 Add code about uaa_auth #3803 2017-12-18 18:52:18 +08:00
Daniel Jiang
cdadc94d0f
Merge pull request #3804 from ywk253100/171215_jobservice
Print stack trace when recover from panic and print warning message rather than returning an error when updating 0 records
2017-12-18 16:36:20 +08:00
Tan Jiang
224f75b9a6 Refactor /users API, add more restircation in password reset
Simplified the code when checking if a user is modiable in different
auth modes.
Also add restriction in password, such that when the auth mode is not DB
auth, only the super user can choose to reset his password.
2017-12-18 14:32:29 +08:00
Wenkai Yin
260ef561c4 Update the HTTP client for easy use by add more util functions 2017-12-16 06:45:59 +08:00
Wenkai Yin
42c9c439f9 Allow project developer to edit repository description 2017-12-15 20:30:39 +08:00
Daniel Jiang
7946b07fce
Merge pull request #3796 from stonezdj/ldap_3653
Fix ldap ping issue #3653
2017-12-15 16:12:36 +08:00
Qian Deng
40f766b29a
Merge pull request #3742 from ninjadq/metadata_description
Add UI for metadata description
2017-12-15 15:44:50 +08:00
stonezdj
9393d26fdc Fix ldap ping issue #3653 2017-12-15 14:47:54 +08:00
Wenkai Yin
d9b0f54c5e Split populating author as a method and add unit test 2017-12-15 10:40:24 +08:00
Wenkai Yin
a736cb7b09 Update the HTTP client according to the comments 2017-12-15 09:40:31 +08:00
Wenkai Yin
c4dc95f4f9 Add implement for supporting replicatie the existing images now 2017-12-15 09:40:31 +08:00
Wenkai Yin
b5e7de331e Delete enabled and start_time properties of replication rule 2017-12-15 09:40:31 +08:00
Wenkai Yin
055ab0ba15 Refine replication schedule trigger API 2017-12-15 09:40:31 +08:00
Wenkai Yin
1d2e206ce4 Refactor replication filter chain 2017-12-15 09:40:31 +08:00
Wenkai Yin
76c88d8d49 Fix bugs of replicaton 2017-12-15 09:40:31 +08:00
Wenkai Yin
fe10c2e7f5 Create replicator to submit replication job to jobservice 2017-12-15 09:40:31 +08:00
Wenkai Yin
8b4fdfc2cc Add unit tests for replication related methods 2017-12-15 09:40:31 +08:00
Wenkai Yin
c5ccb7e53c Enable filter chain in replication 2017-12-15 09:40:30 +08:00
Wenkai Yin
a384325a1e Publish replication notification for manual, scheduel and immediate trigger 2017-12-15 09:40:30 +08:00
Wenkai Yin
a54b7dd4c0 Merge remote-tracking branch 'upstream/master' into 171219_merge 2017-12-15 08:48:57 +08:00
Wenkai Yin
43489c2b67 Print stack trace when recover from panic and print warning message rather than returning an error when updating 0 records 2017-12-14 13:48:45 +08:00
Wenkai Yin
745d83e393 Read image author from label 'maintainer' if author is null 2017-12-13 23:28:01 +08:00
Tan Jiang
5da894bcf2 Small refactory. 2017-12-13 20:58:27 +08:00
stone
cbd1431333
Merge pull request #3726 from stonezdj/ldap_refactor2
Refactor LDAP code

Changes include:
1. Use session to manage the lifecycle of LDAP connections
2. Abstract common AuthenticateHelper interface for db_auth, ldap_auth, uaa_auth
2017-12-13 16:21:20 +08:00
Deng, Qian
a4bd27c7b0 Bump UI Lib version 2017-12-13 15:37:56 +08:00
Deng, Qian
ccfd206ae2 Merge branch 'master' into metadata_description 2017-12-13 15:21:57 +08:00
stonezdj
ec67974104 Refactor ldap
Changes include:

1. Use Session to manage the lifecycle of ldap connections
2. Abstract common AuthenticateHelper interface for db_auth, ldap_auth,
uaa_auth mode
2017-12-13 14:57:04 +08:00
Wenkai Yin
665a54edc3 Merge remote-tracking branch 'upstream/master' into 171213_merge 2017-12-13 13:40:24 +08:00
Fuhui Peng (c)
f179e09cd0 Fix Replication Rule Ping target issue about #3770 2017-12-12 18:05:03 +08:00
yixingjia
f4d0fd4d23
Merge pull request #3640 from yixingjia/moveconftoDB
Add database driver for Harbor configurations
2017-12-11 10:42:05 +08:00
Deng, Qian
b15acdf151 Add UI for metadata description 2017-12-08 15:05:52 +08:00
yixingj
9b03c93afd Add database driver for Harbor configurations
1>Add a new database driver for configurations
2> change the current default driver from json
to database
2017-12-06 13:06:54 +08:00
Qian Deng
5de872486c
Merge pull request #3692 from ywk253100/171127_repo_desc
Add update repository API to support description of repository
2017-12-04 17:25:38 +08:00
Wenkai Yin
594d213630 Publish replication notification for manual, scheduel and immediate trigger 2017-12-04 15:07:30 +08:00
Deng, Qian
092c19c666 Bump UI lib version to 0.5.16 2017-11-29 17:41:19 +08:00
Wenkai Yin
7ccdce33a0 Refactor ping target API
Merge ping target API by ID into ping target API
2017-11-29 17:15:03 +08:00
Wenkai Yin
34f70ff3b6
Merge pull request #3693 from ywk253100/171127_schedual_trigger
Implement schedual trigger for replication
2017-11-28 13:43:01 +08:00
Wenkai Yin
fa85ad6d28
Merge pull request #3687 from ywk253100/171123_trigger_api
Add replication manual trigger API & update replication/policy API docs
2017-11-28 13:38:53 +08:00
Daniel Jiang
d13321f2b5
Support getting user info via token in UAA Client (#3686) 2017-11-27 18:13:36 +08:00
Wenkai Yin
4902fdf2ef Implement schedual trigger for replication 2017-11-27 16:50:35 +08:00
Wenkai Yin
6b0ee138e5 Implement immediate trigger and the methods of WatchList 2017-11-27 14:23:21 +08:00
Wenkai Yin
8d9af50bbc Add update repository API to support description of repository 2017-11-27 14:18:57 +08:00
stonezdj
1179769e31 Update with PR review comment 2017-11-24 14:53:34 +08:00
stonezdj
16243cfbbc Add LDAP remote certifcate validation
push test

Add unit test for ldap verify cert

remove common.VerifyRemoteCert

Update code with PR review comments

Add change ldaps config and add UT testcase for TLS feature

add ldap verfiy cert checkbox about #3513

Draft harbor ova install guide

Search and import ldap user when add project members

Add unit test case for SearchAndImportUser

ova guide

Add ova install guide

Add ova install guide 2

Add ova install guide 3

Call ValidateLdapConf before search ldap

trim space in username

Remove leading space in openLdap username

Remove doc change in this branch

Update unit test for ldap search and import user

Add test case about ldap verify cert checkbox

Modify ldap testcase
2017-11-24 12:41:51 +08:00
Wenkai Yin
1c338ed30b Add replication manual trigger API & update replication/policy API docs 2017-11-24 10:50:10 +08:00
Deng, Qian
6b6cff0174 fix Chinese text of public policy 2017-11-22 20:15:08 +08:00
Tan Jiang
b3e0af2382 Fix permission issue in job_log directory 2017-11-21 19:31:15 +08:00
Wenkai Yin
59c1160edd Setup/Unset trigger when CURD policies 2017-11-20 17:09:46 +08:00
Fuhui Peng (c)
61cbab8ffe Delete verify remote cert in VIC mode about #3626 2017-11-17 17:01:23 +08:00
Fuhui Peng (c)
6fb9068034 Merge branch 'master' of https://github.com/vmware/harbor 2017-11-17 16:34:15 +08:00
Fuhui Peng (c)
2ff41664b2 Add setting.json about skinnable #3241 2017-11-16 15:36:46 +08:00
Wenkai Yin
31cf6c078e Implement replication policy manager 2017-11-16 10:55:03 +08:00
Deng, Qian
01390e2180 present config item based on installation of clair & notary 2017-11-14 15:11:37 +08:00
pengpengshui
91faac070f
Merge pull request #3598 from pengpengshui/master
Modiy test connection without verify cert value
2017-11-14 14:37:01 +08:00
Fuhui Peng (c)
f03a1b0f3e modiy test connection without verify cert value 2017-11-13 13:56:57 +08:00
Daniel Jiang
a2f20801c0
Merge pull request #3597 from ywk253100/171110_bug_fix
Add content-type header to the request when creating project during replication
2017-11-12 22:54:15 -06:00
Wenkai Yin
9889896e8a Add content-type header to the request when creating project during replication 2017-11-10 16:08:13 +08:00
Steven Zou
c2e0c8d1f2 Define the related interfaces for triggers and core controllers of replication service 2017-11-10 15:06:24 +08:00
Wenkai Yin
41c0ff66ce
Merge pull request #3534 from ywk253100/171101_poilicy
Update replication policy API to support trigger and filter
2017-11-10 14:00:17 +08:00
Wenkai Yin
ef0556d3f8
Merge pull request #3541 from ywk253100/171102_filter_chain
Implement filter chain
2017-11-10 10:42:25 +08:00
reasonerjt
19a13e8575 Deprivilege harbor-ui harbor-jobservice harbor-adminserver
Use non-root user to run the service within these docker images, and provide HEALTHCHECK
mechanism.
2017-11-09 03:09:09 -08:00
Wenkai Yin
149b628292 update 2017-11-09 16:20:56 +08:00
Wenkai Yin
3e3baa03f4 Merge remote-tracking branch 'upstream/replication_enhancement' into 171101_poilicy
Conflicts:
	src/replication/consts.go
2017-11-08 18:51:56 +08:00
Wenkai Yin
5cef58baa1 update according to the comments 2017-11-08 17:53:41 +08:00
Wenkai Yin
049642e894 Implement filter chain 2017-11-08 16:51:11 +08:00
Daniel Jiang
8dfe5f0bfc
Merge pull request #3536 from ywk253100/171102_fail_earlier
Fail earlier when found database schema dismatch
2017-11-07 15:01:14 +08:00
Wenkai Yin
f86a4be84d Implement Convert interface 2017-11-07 14:34:12 +08:00
Wenkai Yin
5293a9287b Fail earlier when found database schema dismatch 2017-11-07 13:07:56 +08:00
Tan Jiang
512384722a Make the internal URL of UI and JobService configurable 2017-11-03 20:43:25 +08:00
Daniel Jiang
795d33a45a
Add filter on API endpoints to mitigate XSRF (#3542)
Add filter for all API endpoints to allow the POST requests which have
application/json header.
Make update to UI code to make sure all requests contain the header.
2017-11-03 14:43:27 +08:00
Steven Zou
abe3d37a33 Add registry adaptor interface and sourcer definitions 2017-11-02 17:10:15 +08:00
Wenkai Yin
51d5df0849 Update replication policy API to support trigger and filter 2017-11-02 14:59:26 +08:00
Steven Zou
87d966e369
Merge pull request #3510 from steven-zou/master
Update the alternate policy and corresponding task to support byweekly
2017-11-01 21:51:04 -05:00
Fuhui Peng (c)
48cbdcbb08 change package version 2017-11-01 18:45:11 +08:00
Fuhui Peng (c)
30a60e6115 Merge branch 'master' of https://github.com/vmware/harbor 2017-11-01 18:36:37 +08:00
Deng, Qian
bd2bb0a697 fix project admin can view project config 2017-11-01 16:40:01 +08:00
Wenkai Yin
82b400c049 Add replication filter implement 2017-11-01 14:59:44 +08:00
Deng, Qian
091f68e5b0 fix tag vulnerability text to uppercase 2017-11-01 14:39:25 +08:00
Steven Zou
cee0bcec22 Update the alternate policy and corresponding task to support by weekly besides daily 2017-11-01 13:55:56 +08:00
Deng, Qian
0045b269db fix bug when save policies 2017-11-01 10:31:21 +08:00
Fuhui Peng (c)
29cf632de8 modify the remote cert checkbox value 2017-10-31 19:39:07 +08:00
Wenkai Yin
094a4f48ab
Merge pull request #3490 from ywk253100/171030_meta_id
Add column id to table project_metadagta as the primary key
2017-10-31 00:42:04 -05:00
pengpengshui
26cf27f327
Merge pull request #3475 from pengpengshui/master
add checkbox on config-email page and test code, modify project access level label
2017-10-31 10:42:07 +08:00
Wenkai Yin
0ddca31355 Add column id to table project_metadagta as the primary key 2017-10-30 17:37:25 +08:00
Deng, Qian
1840aefea9
Merge pull request #3461 from ninjadq/fix_scanning_bar_title
fix text of bar chart title
2017-10-30 00:02:08 -05:00
Steven Zou
3565f60f5b
Merge pull request #3473 from steven-zou/master
Define filter interfaces for replication service
2017-10-29 23:37:30 -05:00
Fuhui Peng (c)
ad38106642 modify label about project access level 2017-10-30 10:39:19 +08:00
Fuhui Peng (c)
a0172bc0c4 "add insecure checkbox to configure #3363" 2017-10-30 10:29:47 +08:00
Deng, Qian
fe4f611e73 fix text of bar chart title 2017-10-27 19:19:40 +08:00
Steven Zou
410908d863 Merge branch 'master' of https://github.com/steven-zou/harbor into fork_master 2017-10-27 18:19:39 +08:00
Wenkai Yin
5b2ececae8 Merge pull request #3436 from ywk253100/171020_meta_api
Add project metadata API
2017-10-27 05:16:50 -05:00
Steven Zou
e2242cffd2 define filter interfaces for replication service including:interface Filter,Converter and FilterChain and other supporting models 2017-10-27 18:16:16 +08:00
Wenkai Yin
c355034c14 Add project metadata API
Project metadata API can be used to integrated with project management
service which can not provide all metadatas needed by Harbor.
2017-10-27 17:05:15 +08:00
Deng, Qian
69ffd7117c add ui for project level policy 2017-10-27 15:18:00 +08:00
Daniel Jiang
d8634290e8 Merge pull request #3420 from reasonerjt/master
Add Unit test cases for Clair Client.
2017-10-23 12:18:05 +08:00
Tan Jiang
b925569767 Add Unit test cases for Clair Client. 2017-10-22 21:54:04 +08:00
Wenkai Yin
2156750b04 Move certificate verification to target level
The certificate verification is on system level before this commit. Moving it
to target level makes the configuration more flexible for different targets.
2017-10-20 15:36:56 +08:00
Wenkai Yin
66b2d0d3f3 Apply project level policies to standalone Harbor
The following features are only enabled in integration mode, this commit moves
these to standalone Harbor:
 - Content trust policy: only signed images can be pulled
 - Vulnerability policy: only images whose severity is below the threshold can be pulled
 - Automatic scan policy: automatic scan pushed images
2017-10-19 17:33:28 +08:00
Steven Zou
a5ca531819 Merge pull request #3338 from pengpengshui/master
fix issue about pull command in repository  #3275
2017-10-18 21:28:53 -05:00
Fuhui Peng (c)
a5a62e1b19 add customSkin about #3241 2017-10-17 10:46:23 +08:00
Tan Jiang
eab6b43d99 Make the root CA certificate of UAA should be configurable 2017-10-16 17:40:29 +08:00
Fuhui Peng (c)
eacb8e5658 Merge branch 'master' of https://github.com/vmware/harbor 2017-10-12 12:58:51 +08:00
Fuhui Peng (c)
54e0d34f7f fix issue about pull command in repository 2017-10-12 10:35:48 +08:00
Steven Zou
46814206bb Merge branch 'master' into master 2017-10-11 02:10:50 -05:00
Tan Jiang
51286d9baa Provide UAA authenticator for password based authentication. 2017-10-07 00:16:53 +08:00
Wenkai Yin
e495357d98 implement the default project metadata manager 2017-09-28 16:17:51 +08:00
Steven Zou
07b6934c9d add video demo references (both youtube and v.qq)to the readme.md and the user guide 2017-09-27 12:53:59 +08:00
Steven Zou
546a8327aa Merge remote-tracking branch 'upstream/master' 2017-09-27 10:59:15 +08:00
Wenkai Yin
e79334a445 Add interfaces to implement project level policy (#3271)
* add interfaces to implement project level policy
2017-09-26 16:41:08 +08:00
Deng, Qian
9e0961b3f4 fix_tag_link_and_scanning_state 2017-09-26 13:54:42 +08:00
Fuhui Peng (c)
148c6ecc53 fix issue about replication rule delete and username autocomplete and… … 2017-09-21 15:45:42 +08:00
Wenkai Yin
dc4f2ece72 readjust package structure 2017-09-20 15:24:19 +08:00
Wenkai Yin
5cd55220c8 Merge pull request #3244 from ywk253100/170919_golint
Fix code style issues reported by golint
2017-09-20 10:31:28 +08:00
Wenkai Yin
f0946b63cf fix code style issues reported by golint 2017-09-19 17:16:54 +08:00
Wenkai Yin
82dc758064 Merge pull request #3213 from ywk253100/170914_image_size
Return image size when getting detail information of tag
2017-09-19 17:09:49 +08:00
Wenkai Yin
8d7644b8b5 Merge pull request #3151 from ywk253100/170830_email_insecure
Expose the insecure flag for email configuration
2017-09-15 15:01:30 +08:00
Wenkai Yin
2ebcc454ba support image size 2017-09-15 13:34:23 +08:00
weibaohui
84d66d85fa Correct spelling
Correct spelling
2017-09-11 15:13:24 +08:00
Steven Zou
9987d89705 enable server end pagination for project list 2017-09-08 19:15:50 +08:00
Wenkai Yin
bb77ceebae Merge remote-tracking branch 'upstream/master' into 170830_email_insecure 2017-09-04 15:10:24 +08:00
Wenkai Yin
923a8d65b1 expose insecure flag in api 2017-09-04 15:10:07 +08:00
Fuhui Peng (c)
c98e1cc29e harbor-ui version 2017-08-30 14:40:14 +08:00
Fuhui Peng (c)
7b0afc4032 Merge branch 'master' of https://github.com/vmware/harbor into uitest 2017-08-30 13:55:07 +08:00
Fuhui Peng (c)
2987eb3e28 fix issue about view log 2017-08-30 13:30:53 +08:00
Yan
1a71b13591 update error format (#3125)
* update error format

update

update

update

update

update

update

* update

* update
2017-08-29 19:17:08 +08:00
Fuhui Peng (c)
1d63deb742 fix issue about il8n about deleting repository 2017-08-28 11:25:17 +08:00
Yan
97f73dbf6c block pull scan failed image (#3119) 2017-08-28 10:30:59 +08:00
Daniel Jiang
f41d2ff436 Merge pull request #3101 from ywk253100/170822_replica
Convert 500 error returned by Admiral to duplicate project error when creating duplicate project
2017-08-22 15:59:19 +08:00
Wenkai Yin
599d94be0c update 2017-08-22 15:22:25 +08:00
Steven Zou
749435ccf3 Merge pull request #3102 from steven-zou/master
Fix projetcId not ready and ca download link issues
2017-08-22 14:53:45 +08:00
Wenkai Yin
ffb2f4201b update 2017-08-22 14:28:45 +08:00
Steven Zou
d2540b71f5 fix ca download link issue 2017-08-22 13:57:23 +08:00
Wenkai Yin
bb958a7f4b convert 500 error returned by Admiral to duplicate project error when creating duplicate project 2017-08-22 13:34:06 +08:00
Steven Zou
3784c08e3d Fix the projectId not ready issue 2017-08-22 13:33:24 +08:00
Tan Jiang
c1bbcb5bab update the interval of clair updater to 12 hours, and update the interval for scan all to 2 hours 2017-08-21 13:45:23 +08:00
Steven Zou
5deff12550 update ui library version 2017-08-18 18:50:42 +08:00
Fuhui Peng (c)
45c4796486 '1918' 2017-08-18 17:42:50 +08:00
Fuhui Peng (c)
7393843bd0 '3022' 2017-08-18 17:41:03 +08:00
Fuhui Peng (c)
e4af0bdb10 Merge branch 'master' of https://github.com/vmware/harbor 2017-08-18 16:16:52 +08:00
Wenkai Yin
7296bdc131 increase length of username in database to 256 2017-08-17 15:24:34 +08:00
pengpengshui
b362e4d36a fix issue about cannot click add replication button , 3071 2017-08-17 14:59:25 +08:00
pengpengshui
160593a86a fix issue about no warn when deleting repository which contains signed tags, 3022 2017-08-17 14:45:13 +08:00
pengpengshui
78e1f8c8ce fix issues about image have no data an scan complete time in image detail ,3054,3023 2017-08-17 14:42:36 +08:00
pengpengshui
04929c98f7 fix issue about back to public project #1918 2017-08-17 14:29:23 +08:00
pengpengshui
613dfc597d fix #3046 about delete ID from 'copy Digest ID' 2017-08-17 13:02:07 +08:00
Tan Jiang
2ffcf10eaa restart scan jobs when jobservice is started 2017-08-16 17:24:41 +08:00
Wenkai Yin
bb00c2c2cf Merge pull request #3045 from ywk253100/170814_config
[BAT]Remove useless attributes in configuration API
2017-08-15 12:18:06 +08:00
Steven Zou
df6d37b9d5 Merge pull request #3043 from steven-zou/master
add CVE link
2017-08-14 17:57:19 +08:00
Wenkai Yin
0ffb74f261 remove useless attributes in configuration API 2017-08-14 16:42:25 +08:00
Steven Zou
4a543a3e52 add CVE link 2017-08-14 15:56:55 +08:00
Yan
d0103856f1 [BAT] fix issues (#3037)
* fix issues

* update
2017-08-14 15:19:48 +08:00
Wenkai Yin
c878a4df06 Merge pull request #3033 from ywk253100/170811_scope
Fix bug in parsing scope
2017-08-11 17:56:49 +08:00
Wenkai Yin
98d8b7e246 fix bug in parsing scope 2017-08-11 14:13:15 +08:00
Daniel Jiang
1403fe09ff Merge pull request #3030 from reasonerjt/fix-jobservice-update-vuln-bug
Do not throw error if the scan result is unchanged
2017-08-11 13:26:15 +08:00
Daniel Jiang
9b6ad0e90f Merge pull request #3027 from reasonerjt/add-vuln-link
add cve link in Harbor API
2017-08-10 19:44:06 +08:00
Tan Jiang
882683ae6f Do not throw error if the scan result is unchanged 2017-08-10 17:26:39 +08:00
Wenkai Yin
ec5c5514b5 Merge pull request #3025 from ywk253100/170808_bug_fix
Fix bug: can not display signed or not correctly
2017-08-10 17:11:27 +08:00
Tan Jiang
5846d7d28d add cve link in Harbor API 2017-08-10 15:27:30 +08:00
Wenkai Yin
c3c21586ea fix bug: can not display signed or not correctly 2017-08-10 15:12:52 +08:00
Wenkai Yin
9b9b5e414f Merge pull request #3021 from ywk253100/170808_bug_fix
[BAT] Fix bug: can delete repository contains signed tags
2017-08-10 13:28:45 +08:00
Wenkai Yin
7205d03106 bug fix 2017-08-10 11:09:04 +08:00
Wenkai Yin
9fc80a1731 Merge pull request #3014 from ywk253100/170808_bug_fix
Return isSystem when using ldap
2017-08-09 18:49:49 +08:00
Wenkai Yin
689994fa93 return isSystem when using ldap 2017-08-09 18:02:55 +08:00
Daniel Jiang
5ba363657f Merge pull request #3006 from ywk253100/170808_bug_fix
[BAT]Remove useless codes
2017-08-09 16:05:16 +08:00
Daniel Jiang
78bacbc80a Merge pull request #2978 from wy65701436/issue-2975
Issue 2975
2017-08-09 16:05:00 +08:00
Wenkai Yin
7fedca3a4a remove useless codes 2017-08-09 15:13:51 +08:00
Steven Zou
be0b621c65 update the library version 2017-08-09 15:03:33 +08:00
Wenkai Yin
3c64ae340e bug fix 2017-08-08 16:22:29 +08:00
Steven Zou
49f52ef8f8 Merge pull request #2987 from pengpengshui/master
[BAT]fix #2986 about configration save button issue
2017-08-08 16:10:08 +08:00
pengpengshui
700d3141b4 fix #2986 about configration save button issue 2017-08-08 15:13:58 +08:00
Daniel Jiang
383a09e21f Merge pull request #2982 from reasonerjt/tc-vuln-data
add tc for vulnerability transform
2017-08-08 12:15:54 +08:00
pengpengshui
fb8e700e30 fix bug about tooltips issues 2017-08-08 09:59:36 +08:00
Steven Zou
b6b232ce6a Merge pull request #2945 from vmware/fix_issue_#2762
Fix data race issues of go sources
2017-08-07 21:57:03 +08:00
Tan Jiang
5b6c53a1bf add the json file required by UT 2017-08-07 21:12:49 +08:00
wangyan
657d3c322f fix issue 2975
udpate

update

update

update

update

update
2017-08-07 18:01:37 +08:00
Tan Jiang
8f41be471d add tc for vulnerability transform 2017-08-07 17:14:51 +08:00
Steven Zou
21d3f4a549 Fix data race issues of go sources 2017-08-07 14:50:37 +08:00
Wenkai Yin
7800d2c2b2 check the existence of project when generating token 2017-08-07 13:30:16 +08:00
Steven Zou
43ca7e33fa Merge pull request #2971 from steven-zou/master
upgrade ui lib version to 0.4.2
2017-08-04 21:16:19 +08:00
Daniel Jiang
6bd622196e Merge pull request #2972 from reasonerjt/master
Fix perf issue and connection leak in Clair.
2017-08-04 19:48:26 +08:00
Tan Jiang
fa0cb8731c Fix performance issue and connection leakage 2017-08-04 19:22:52 +08:00
Steven Zou
373c6a3783 upgrade ui lib version to 0.4.2 2017-08-04 19:21:38 +08:00
Daniel Jiang
d4dce3bb60 Merge pull request #2970 from wy65701436/issue-2965
fix 2965
2017-08-04 19:17:01 +08:00
wangyan
5b54b554ab update 2017-08-04 18:59:16 +08:00
Steven Zou
325eb6bbc1 Merge pull request #2969 from pengpengshui/master
fix #2893 about add tooltips title
2017-08-04 18:58:23 +08:00
wangyan
bcc1a5c41d fix 2965
update package

update
2017-08-04 18:44:00 +08:00
pengpengshui
89b56eaea0 fix #2893 about add tooltips title 2017-08-04 18:34:12 +08:00
Steven Zou
39ffff7c84 update ui library version to 0.3.92 2017-08-04 10:37:38 +08:00
Wenkai Yin
d5a6d25082 Merge pull request #2923 from ywk253100/170728_registry
Remove useless insecure flag
2017-08-04 10:14:40 +08:00
Steven Zou
1c3830086a Merge pull request #2959 from pengpengshui/master
fix #2889 #2892 about tooltips of self-registration and member model add button problem
2017-08-04 10:03:26 +08:00
pengpengshui
21379a1d3d fix #2889 #2892 about tooltips of self-registration and member model add button problem 2017-08-04 09:44:20 +08:00
Steven Zou
baa863d026 Fix issue #2879 (#2953)
* Change vul result bar texts

* Support server-driven pagination for replication jobs
2017-08-03 15:09:13 +08:00
pengpengshui
0966887f98 fix #2909 about time can be empty 2017-08-03 13:38:27 +08:00
pengpengshui
3417ff731b fix #2910 about scan all position 2017-08-03 12:32:29 +08:00
pengpengshui
cd1077fa43 fix 2912 #2938 about save button in vul tag and signed icon 2017-08-02 19:07:30 +08:00
Daniel Jiang
6f8f765358 Merge pull request #2906 from ywk253100/170728_integration
Apply security filter to certain patterns and enable basic auth for deleting repo
2017-08-02 18:09:15 +08:00
pengpengshui
e76a76e60c fix #2890 about time in vulnerablity 2017-08-01 18:30:47 +08:00
Steven Zou
e7da22d812 fix issue #2840 and #2916 2017-08-01 15:49:50 +08:00
pengpengshui
87b0f3460e fix color about #2908 2017-08-01 12:34:08 +08:00
pengpengshui
d666574f66 fix #2903 #2908 about icons color and statistics style 2017-07-31 17:20:27 +08:00
pengpengshui
8ca28446d4 fix #2917 about scan error log does`t show 2017-07-31 17:15:36 +08:00
pengpengshui
39aaf2928f fix #2911 about spaces at the begin of log 2017-07-31 17:12:28 +08:00
Wenkai Yin
67200db678 update 2017-07-31 13:58:41 +08:00
Wenkai Yin
8963a15520 remove useless insecure flag 2017-07-31 13:45:49 +08:00
pengpengshui
52bcb8a643 Merge branch 'master' of https://github.com/vmware/harbor 2017-07-31 12:42:28 +08:00
pengpengshui
468257167a fix #2896 #2886 #2888 about tooltips,inline alert ,datagrid leftside style 2017-07-29 06:19:46 +08:00
Steven Zou
220e709530 support read-ony mode for replication list view (#2915) 2017-07-28 18:49:17 +08:00
Wenkai Yin
cdb75519a9 1. only apply security filter to /api/ and /service/ 2.support basic auth for deleting repository and tag in integration mode 2017-07-28 15:25:22 +08:00
Wenkai Yin
ce169e74dc Merge pull request #2878 from ywk253100/170724_registry
Refactor registry client
2017-07-28 13:40:32 +08:00
Wenkai Yin
eb9a4dfff9 update 2017-07-28 13:21:34 +08:00
Wenkai Yin
a8dc75dd15 update 2017-07-28 13:10:26 +08:00
Steven Zou
1467a8a5be Merge pull request #2900 from steven-zou/master
fix issue #2435
2017-07-28 12:43:42 +08:00
Steven Zou
d7eb8df28e Merge pull request #2885 from pengpengshui/master
fix 2869/2870 about the  log of a pending status replication job
2017-07-27 21:43:01 +08:00
pengpengshui
be9dd5cdc3 fix 2869/2870 about the log of a pending status replication job 2017-07-28 07:17:55 +08:00
Steven Zou
5f548ea49a fix issue #2435 2017-07-27 18:43:27 +08:00
Wenkai Yin
1da9b8653b update according to the comments 2017-07-27 18:23:55 +08:00
Daniel Jiang
8117e9ee79 Merge pull request #2884 from ywk253100/170726_api
Add API to check whether a project can be deleted or not
2017-07-27 10:29:03 +03:00
Wenkai Yin
9d7ad6de68 Add API to check whether a project can be deleted or not 2017-07-27 14:08:32 +08:00
Wenkai Yin
0a74a0f1e4 update 2017-07-27 08:17:29 +08:00
Wenkai Yin
71e4c3c447 Merge remote-tracking branch 'upstream/master' into 170724_registry
Conflicts:
	src/ui/utils/utils.go
2017-07-26 18:46:41 +08:00
Wenkai Yin
cc264f85e7 do not ping if using raw token authorizer 2017-07-26 18:41:36 +08:00
Steven Zou
f3c1caeb3c fix issue #2811 2017-07-26 17:58:43 +08:00
Steven Zou
ec7b5ccfea fix issue #2832 2017-07-26 16:55:20 +08:00
Steven Zou
5c32719590 Merge pull request #2872 from steven-zou/master
fix issue 2858
2017-07-26 16:09:42 +08:00
Daniel Jiang
69c49dd7d1 Merge pull request #2856 from reasonerjt/project-scan-all
Provide API for scanning images under a project
2017-07-26 10:58:58 +03:00
Daniel Jiang
9d02fc1c70 Merge pull request #2866 from reasonerjt/master
fix #1953, fail jobservice when configuration init encounters errors.
2017-07-26 10:58:04 +03:00
Steven Zou
7244134e50 fix issue 2858 2017-07-26 15:51:37 +08:00
Tan Jiang
10c8573464 provide API for scanning images under a projet 2017-07-26 15:19:17 +08:00
Steven Zou
7a0fe1034a Merge pull request #2871 from pengpengshui/master
fix #2839 about project log has no logs
2017-07-26 12:55:26 +08:00
pengpengshui
1fd68529ae fix #2839 about project log has no logs 2017-07-26 10:44:06 +08:00
pengpengshui
e4c21dc5de change code style again about replication rule link issue 2017-07-26 05:58:15 +08:00
pengpengshui
9c6c71ed72 modify code about replication rule link issue 2017-07-26 04:16:21 +08:00
pengpengshui
30bd67748e fix #2853 about replication rule link issue 2017-07-26 03:51:47 +08:00
Tan Jiang
97b334c3c0 fix #1953 2017-07-25 21:12:03 +08:00
Steven Zou
7c2699953d Fix config change watching issue 2017-07-25 20:27:25 +08:00
Steven Zou
a047c1fe96 Merge pull request #2850 from steven-zou/master
Enhance scanning status controlling
2017-07-24 14:26:29 +08:00
Steven Zou
598f2b43db add missing i18n message keys 2017-07-24 13:49:43 +08:00
Steven Zou
97a9052050 Enhance scanning status controlling 2017-07-24 13:39:49 +08:00
Yan
274f764622 update interceptor error code (#2836)
* update interceptor error code

* update

* update error string

* update interceptor error code

update

update error string
2017-07-23 18:34:44 -07:00
Wenkai Yin
62c1bf5389 load absent property from env 2017-07-21 17:54:41 +08:00
Tan Jiang
cd24c0f171 fix issue in golint 2017-07-21 00:07:42 +08:00
Tan Jiang
ea25c3cfe5 provide api to show log of scan job 2017-07-20 19:32:27 +08:00
Wenkai Yin
b127ba391d Merge pull request #2827 from ywk253100/170720_replic
Fix replicate issue
2017-07-20 18:48:33 +08:00
Wenkai Yin
1c4a42009d remove duplicate codes in notification handler (#2828) 2017-07-20 03:10:52 -07:00
Wenkai Yin
2e427bffe2 fix replicate issue 2017-07-20 16:47:14 +08:00
Wenkai Yin
e0040a09b6 Merge pull request #2821 from ywk253100/170719_integration
Refactor getting project logic according to the change of Admiral's API
2017-07-20 15:57:42 +08:00
Wenkai Yin
d36a7585c3 Merge pull request #2818 from ywk253100/170719_delete_getctxofuser
Delete the method of getting security context of specific user
2017-07-20 15:57:21 +08:00
Steven Zou
1b2a538aaf Fix scan now issue in the tag list (#2824)
* Provide 'Scan Now' menu in the tag list

* Fix scan now issue in the tag list
2017-07-20 00:08:56 -07:00
Wenkai Yin
1298d465da refactor GetPublic logic 2017-07-20 10:34:18 +08:00
Steven Zou
aa681eb018 Provide 'Scan Now' menu in the tag list (#2819) 2017-07-19 18:28:00 -07:00
Wenkai Yin
603d15671a delete the method of getting security context of specific user 2017-07-19 18:05:50 +08:00
Wenkai Yin
75c4d4a60a Merge pull request #2816 from ywk253100/170719_trim
Trim the new line in the end of token file
2017-07-19 17:51:49 +08:00
Wenkai Yin
e9a2ee779f trim the new line in the end of token file 2017-07-19 17:34:04 +08:00
Steven Zou
e6368ab8a0 Merge pull request #2799 from vmware/fix_issue_#2793
Fix issue of detecting configuration changes
2017-07-19 17:32:45 +08:00
Wenkai Yin
f57b9ae9d5 trim new line in the end of token file 2017-07-19 17:28:54 +08:00
Steven Zou
8f921db588 Refine scheduler 2017-07-19 16:57:22 +08:00
Steven Zou
3120abad8e Merge pull request #2809 from steven-zou/master
Add job log reviewer
2017-07-19 16:43:23 +08:00
Daniel Jiang
8a23f0e0a1 Merge pull request #2812 from reasonerjt/systeminfo-scan-all
add next_scan_all to systeminfo api response
2017-07-19 15:49:57 +08:00
Steven Zou
056b15c74b Force refresh user list view 2017-07-19 15:27:59 +08:00
Steven Zou
9057f751e3 Implement job log viewer 2017-07-19 15:27:32 +08:00
Wenkai Yin
7573d59624 update token file location 2017-07-19 13:46:10 +08:00
Tan Jiang
ad2cafe4d2 add next_scan_all to systeminfo api response 2017-07-19 13:33:42 +08:00
Steven Zou
5c876621ec Merge branch 'master' into fix_issue_#2793 2017-07-19 12:34:43 +08:00
Wenkai Yin
6e10a21871 Merge pull request #2774 from ywk253100/170713_integration
Trim last / in url
2017-07-19 10:15:05 +08:00
Wenkai Yin
44ad4581e5 Merge pull request #2807 from ywk253100/170718_integration
Support basic auth in integration mode
2017-07-19 10:14:44 +08:00
pengpengshui
b16c521e2f Merge remote-tracking branch 'upstream/master' 2017-07-18 19:12:06 -07:00
pengpengshui
1810b7ed42 fix #2800 about consistent datagrid footer indicate number of items and roll back connent-test issue 2017-07-18 19:10:16 -07:00
pengpengshui
34f9a3b911 fix issue about endpontUrl,username,password should have data when connent-test button could click #2435 2017-07-18 14:00:17 -07:00
pengpengshui
8236e0358e fix #2775 about create-rule modal connect test issue 2017-07-18 09:50:04 -07:00
Wenkai Yin
fc2bb51582 support basic auth in integration mode 2017-07-18 19:20:19 +08:00
Daniel Jiang
7d5fe961f3 Merge pull request #2798 from reasonerjt/master
The password to access clair db can be configured in harbor.cfg
2017-07-18 18:56:51 +08:00
Steven Zou
201095a259 Enhance scanning policy notify handler and add more testing cases 2017-07-17 23:43:24 +08:00
pengpengshui
47e24609b6 change the code style of the issue create-project modal submit button 2017-07-17 17:35:10 -07:00
pengpengshui
26154aae55 change the code style of the issue create-project modal submit button 2017-07-17 17:07:46 -07:00
pengpengshui
fc857a8928 fix create-project modal submit button issue 2017-07-17 15:28:31 -07:00
pengpengshui
74169e3021 fix issue about nav replicationManagement lose highlight 2017-07-17 12:46:01 -07:00
Steven Zou
db58ca673d Fix issue of detecting configuration changes 2017-07-17 17:39:41 +08:00
Tan Jiang
629cf29850 The password to access clair db can be configured in harbor.cfg, skip auto-scan if clair-db is not ready 2017-07-17 15:25:47 +08:00
Daniel Jiang
6f2ff672c4 Merge pull request #2789 from reasonerjt/master
fix nil pointer issue
2017-07-14 20:37:00 +08:00
Tan Jiang
473b85cffa fix nil pointer issue 2017-07-14 20:06:34 +08:00
Steven Zou
203b8a5bf0 Merge pull request #2790 from steven-zou/master
Fix issue #2688 and #2686
2017-07-14 19:14:27 +08:00
Steven Zou
de6300a3b2 Fix issue #2688 and #2686 2017-07-14 18:54:49 +08:00
Steven Zou
bf8a05615b fix issue 2772 (#2785) 2017-07-14 02:03:58 -07:00
Steven Zou
4e33bd9e46 fix issue 2772 2017-07-14 16:39:40 +08:00
Steven Zou
c91189a560 Merge pull request #2784 from steven-zou/master
fix issue 2759
2017-07-14 16:25:19 +08:00
Steven Zou
b69083ecd1 Merge pull request #2779 from pengpengshui/master
Fix the issue #2564,#2552 and #2758
2017-07-14 16:01:22 +08:00
pengpengshui
900837326a fix the issue about project name set private/pubulic alert problem 2017-07-14 14:11:42 -07:00
pengpengshui
8ec00c479e fix2552 connect button grayed out 2017-07-14 09:28:20 -07:00
Steven Zou
fae35add8f fix issue 2759 2017-07-14 15:58:35 +08:00
Daniel Jiang
22ba87338e Merge pull request #2777 from reasonerjt/fetch-timestamp-from-clairdb
provide default timestamp for all distros in system info api
2017-07-14 15:32:27 +08:00
Tan Jiang
771e26a188 fix bug 2017-07-14 14:53:12 +08:00
Steven Zou
a1a36a4cc4 Support backend server pagination in repo list (#2778)
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts

* support clair db timestamps

* Support backend pagination in repository list
2017-07-13 20:58:53 -07:00
pengpengshui
be6e265890 Merge remote-tracking branch 'upstream/master' 2017-07-13 17:14:31 -07:00
pengpengshui
ea07c211e2 fix2564 issue 2017-07-13 10:37:13 -07:00
pengpengshui
66bfc02d5b fix2564 issue 2017-07-13 09:37:15 -07:00
Tan Jiang
72b3a020e3 provide default timestamp for all distros in system info api 2017-07-13 18:48:05 +08:00
Wenkai Yin
5c965719a2 trim / in url 2017-07-13 17:12:53 +08:00
Daniel Jiang
920c41c204 Merge pull request #2769 from ywk253100/170713_integration
Bug fix
2017-07-13 16:47:43 +08:00
Daniel Jiang
0501f52cda Merge pull request #2765 from ywk253100/170712_member
Fix bug in GET member API
2017-07-13 16:47:19 +08:00
Wenkai Yin
c4fbc707af bug fix 2017-07-13 13:58:24 +08:00
Steven Zou
0ce74dd377 Support clair db timestamps (#2767)
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts

* support clair db timestamps
2017-07-12 22:04:42 -07:00
Wenkai Yin
d51b01c200 fix bug in GET member API 2017-07-12 19:17:26 +08:00
Daniel Jiang
ca6bd3b585 Merge pull request #2741 from reasonerjt/fetch-timestamp-from-clairdb
read last update from clair db, return in system info
2017-07-12 17:16:30 +08:00
Tan Jiang
7fdb77f6d2 fix tc 2017-07-12 16:48:57 +08:00
Tan Jiang
436f0efab8 overall timestamp returns 0 when error happens, split check and mark into two func 2017-07-12 15:57:57 +08:00
Wenkai Yin
ba22ee5022 Merge pull request #2738 from ywk253100/170711_integration
Disable some APIs in integration mode
2017-07-12 15:13:50 +08:00
Tan Jiang
5f233f3e21 address comment 2017-07-12 15:05:27 +08:00
Steven Zou
8ffb5593b9 Merge pull request #2749 from pengpengshui/fix2688
fixed issue #2688
2017-07-12 14:20:29 +08:00
pengpengshui
982263bd66 delete one line 2017-07-12 13:51:51 -07:00
Daniel Jiang
9c8c79db43 Merge pull request #2740 from reasonerjt/query-clair-db
enable security on jobservice scan api
2017-07-12 13:24:16 +08:00
Steven Zou
76bb28d3d0 UI: Support root cert downloading in configuration component (#2742)
* refine the test case of scheduler

* Fix bug

* Support root cert downloaded

* Fix code conflicts
2017-07-11 22:23:19 -07:00
Wenkai Yin
005d783463 Merge pull request #2732 from ywk253100/170710_bug_fix
Bug fix
2017-07-12 12:59:24 +08:00
pengpengshui
003ae3a14f fixed issue #2688 2017-07-11 21:23:32 -07:00
Yan
c1fc09a2d9 format error to make it readable for docker (#2731)
remove unneeded
2017-07-11 19:36:51 -07:00
Tan Jiang
543cf62e14 read last update from clair db, return in system info 2017-07-11 21:26:31 +08:00
Tan Jiang
92258cd012 enable security on jobservice scan api 2017-07-11 21:22:27 +08:00
Wenkai Yin
7e8468c302 update 2017-07-11 18:49:25 +08:00
Wenkai Yin
52f9e5f1c8 disable some APIs in integration mode 2017-07-11 18:13:48 +08:00
Steven Zou
35c62da69c remove watch testing case 2017-07-11 15:53:04 +08:00
Steven Zou
cbdf49c8e9 Merge remote-tracking branch 'upstream/master' 2017-07-11 15:44:32 +08:00
Steven Zou
7ee052b9dd Update policy scheduler according to comments 2017-07-11 15:22:00 +08:00
Wenkai Yin
0de64ed139 bug fix 2017-07-10 18:38:21 +08:00
Daniel Jiang
6fa12cdb1e Merge pull request #2730 from reasonerjt/scan-all-control
restrict scan all API, it should be called once every a period of time
2017-07-10 16:17:26 +08:00
Tan Jiang
fb07b544ab address comment 2017-07-10 13:53:21 +08:00
Wenkai Yin
0b282039e9 Merge pull request #2725 from ywk253100/170707_status_code
Return real status code returned by admiral APIs
2017-07-10 10:12:50 +08:00
Tan Jiang
eb11cda596 restrict scan all API, it should be called once every a period of time 2017-07-09 22:06:13 +08:00
Tan Jiang
e1e975096c add int id for scan overview and revoke the change in beego 2017-07-09 12:37:08 +08:00
Daniel Jiang
43734bfb90 Merge pull request #2726 from reasonerjt/clair-notification
clair notification handler enhancements
2017-07-09 12:29:19 +08:00
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
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
Tan Jiang
b84c7c25f1 return the status only when deployed with Clair 2017-07-07 19:04:00 +08:00
Wenkai Yin
d668730ffa return real status code returned by admiral APIs 2017-07-07 18:40:57 +08:00
Tan Jiang
ca805759d9 update scan overview in notification handler, and return clair vuln timestamp in system info 2017-07-07 17:47:52 +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
Steven Zou
82e17fade1 refine scheduler according to review comments 2017-07-05 19:13:49 +08:00
Yan
d849c36e3f Merge pull request #2570 from samifruit514/master
Allow 255 chars for Realname
2017-07-05 03:17:57 -07:00
Steven Zou
4b2bae4558 Merge branch 'master' of https://github.com/steven-zou/harbor 2017-07-05 17:57:31 +08:00
Steven Zou
5a5eb1d377 Update commnets of exported methods and structs 2017-07-05 17:57:20 +08:00
Wenkai Yin
b866200e4f Move some method of project manager to security context 2017-07-05 17:41:58 +08:00
Steven Zou
a477cb1a3e Merge branch 'master' of github.com:steven-zou/harbor 2017-07-05 17:04:43 +08:00
Steven Zou
c3dd5e6d12 Enhancements to configuration sharable component 2017-07-05 16:10:47 +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
Steven Zou
2bc557b559 Implement policy scheduler 2017-07-05 02:41:52 +08:00
root
f2d02848db change tag retrive's timeout 2017-07-04 10:03:38 +00: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
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
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
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
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
Wenkai Yin
4770aeba90 provide a method to get token from token service 2017-06-28 12:23:14 +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
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
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
Tan Jiang
ed296812f0 small refinement to clair client 2017-06-25 11:44:56 +08:00
Steven Zou
7c68c1ca69 Enhance script in make/dev/nodeclarity/entrypoint.sh 2017-06-23 18:58:58 +08:00
Steven Zou
a12ec997cc Fix tooltip cut issue
Change Dockerfile of UI builder
2017-06-23 18:58:43 +08:00
Steven Zou
7c0e79d10a update ui builder to 1.2.6 2017-06-23 18:58:14 +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
Wenkai Yin
93924c092d Merge pull request #2597 from ywk253100/170621_jobservice
Call UI's API to get project information in Jobservice
2017-06-23 10:23:26 +08:00
Tan Jiang
d31a25317e fix nil pointer in vulnerability/details api 2017-06-22 18:26:40 +08:00
Steven Zou
fde171bcb3 Fix UI issues 2017-06-22 16:44:34 +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
283792e7c3 Merge pull request #2589 from ywk253100/170621_secret_log
Bug fix
2017-06-21 20:18:41 +08:00
Wenkai Yin
4fe5881121 bug fix 2017-06-21 19:24:29 +08:00
Steven Zou
ed1263148f Merge pull request #2562 from steven-zou/master
Refactor harnor portal with sharable components in harbor-ui lib
2017-06-21 16:51:46 +08:00
Steven Zou
f2d659aebc remove clipboard dep from package.json 2017-06-21 14:57:56 +08:00
Steven Zou
0623ef460e add third party lib 2017-06-21 14:49:29 +08:00
Steven Zou
969066f2c7 Improve components and change package.json 2017-06-21 09:53:59 +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
3522332430 Merge pull request #2550 from ywk253100/170616_replication
Fix bug: can not replicate repository with multiple namespaces
2017-06-20 16:41:53 +08:00
Wenkai Yin
6aa3e51b40 update 2017-06-20 16:30:01 +08:00
Wenkai Yin
de2479edee update 2017-06-20 13:49:41 +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
Tan Jiang
a1a08ebed0 provide API to get vulnerability details 2017-06-20 12:10:55 +08:00
Daniel Jiang
269fa0a70a Merge pull request #2559 from reasonerjt/clair-integration
enable auto scan in notification handler
2017-06-20 11:04:06 +08:00
Archambault, Samuel
18cea61121 Allow 255 chars for Realname 2017-06-19 13:54:21 -04:00
Steven Zou
e60e4c12a6 integrate with vulnerability API 2017-06-20 00:51:08 +08:00
Steven Zou
ef4581449f update related package.json files 2017-06-19 12:35:56 +08:00
Daniel Jiang
6ee631d1eb Merge pull request #2536 from wy65701436/pms-interceptor
notary interceptor
2017-06-19 10:58:40 +08:00
Tan Jiang
80edade6a7 enable auto scan in notification handler 2017-06-18 23:58:16 +08:00
Wenkai Yin
8191f4a476 add security context based on admiral 2017-06-18 22:19:12 +08:00
Steven Zou
44e208f027 Refactor repo and tag view with components in harbor-ui lib 2017-06-18 21:59:56 +08:00
Wenkai Yin
6e89f11ffc Merge pull request #2551 from ywk253100/170616_tag
Add get tag API
2017-06-18 11:10:33 +08:00
Steven Zou
8e20e66f8c replace filter with hbr-filter from harbor-ui lib 2017-06-18 01:05:10 +08:00
Steven Zou
5657005701 Refactor endpoints and replication management view with harbor-ui library 2017-06-17 23:48:55 +08:00
Steven Zou
7cf6510e84 Refactor log component with harbor-ui lib 2017-06-17 00:05:16 +08:00
wangyan
0d5d63c236 notary inteceptor
update etst

update

update

update

update

update

update

update

update

update

update

update

update

update

update

update

update

update
2017-06-16 04:39:59 -07:00
Wenkai Yin
ea5de0adf2 add get tag API 2017-06-16 19:37:05 +08:00
Tan Jiang
7a57cb4c87 State machine recover from panic and set job state to error 2017-06-16 19:08:59 +08:00
Wenkai Yin
ec02cf54f0 fix #2508 2017-06-16 18:37:34 +08:00
Wenkai Yin
482f91d91a Merge pull request #2547 from ywk253100/170616_user
Bug fix
2017-06-16 18:12:21 +08:00
Wenkai Yin
df56010739 bug fix 2017-06-16 17:23:22 +08:00
Wenkai Yin
9fb0ad6c0d Merge pull request #2543 from reasonerjt/clair-integration
provide POST api/repostitores/xxx/tags/xxx/scan to trigger image scan
2017-06-16 17:04:34 +08:00
Wenkai Yin
b8d17eeb79 replace trimleft with trimprefix 2017-06-16 16:30:40 +08:00
Tan Jiang
ad7990b07c fix error 2017-06-16 15:15:40 +08:00
Tan Jiang
04b9ee5cfd api should return 503 when Harbor is not deployed with clair, and add more comments 2017-06-16 15:01:14 +08:00
Daniel Jiang
ae77753bf2 Merge pull request #2529 from reasonerjt/clair-integration
add with_clair flag in systeminfo
2017-06-16 13:42:06 +08:00
Steven Zou
6e789d7d46 Use service in harbor-ui library for i18n support 2017-06-15 23:27:54 +08:00
Tan Jiang
41346fe8c0 provide POST api/repostitores/xxx/tags/xxx/scan to trigger image scan 2017-06-15 20:23:55 +08:00
Steven Zou
ce19ba2889 Fix project role displaying issue 2017-06-15 18:17:00 +08:00
Daniel Jiang
2a0fdc4ed2 Merge pull request #2528 from ywk253100/170615_test_case
Update test cases for PMS
2017-06-15 16:34:51 +08:00
Tan Jiang
15384317e0 add with_clair flag in systeminfo 2017-06-15 16:15:46 +08:00
Wenkai Yin
49ddf27868 update test cases for PMS 2017-06-15 15:50:15 +08:00
Daniel Jiang
6a85012dbd Merge pull request #2525 from reasonerjt/clair-integration
GET tags api includes scan overview
2017-06-15 15:34:05 +08:00
Tan Jiang
0b145771c5 handle the case when scan job does not exist 2017-06-15 14:28:45 +08:00
Steven Zou
1df1a45270 Fix issues of public/private projects 2017-06-14 23:38:21 +08:00
Wenkai Yin
7d595c10c5 Merge pull request #2485 from ywk253100/170608_project
Refactor GET /projects API
2017-06-14 21:03:28 +08:00
Tan Jiang
f016dd113c GET tags api includes scan overview 2017-06-14 21:02:59 +08:00
Wenkai Yin
d6c084485b Merge pull request #2497 from ywk253100/170612_user
Support pagination in GET /users API
2017-06-14 20:49:59 +08:00
Wenkai Yin
fa0dec6c9c update 2017-06-14 20:48:43 +08:00
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
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
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
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
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
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
kunw
85c9aeafad Update audit log query params. 2017-06-09 14:37: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
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
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
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
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
Wenkai Yin
9d3cb5d4b6 fix #2226 2017-06-06 18:05:15 +08:00
Daniel Jiang
3363a1f389 Fix 2411 on branch 1.1.0 (#2431) (#2434)
* fixes #2411
2017-06-06 14:53:51 +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
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
Wenkai Yin
0679796528 Merge pull request #2386 from ywk253100/170525_log_pagination
Support pagination in GET recent logs API
2017-06-05 17:15:15 +08:00
Wenkai Yin
f03993a777 Merge pull request #2376 from ywk253100/170524_email
Refactor email API
2017-06-05 16:59:10 +08:00
kunw
9684f146b3 Update styles for stack view. 2017-06-05 16:58:16 +08:00
Wenkai Yin
9c4adbe8c9 Merge remote-tracking branch 'upstream/master' into 170525_log_pagination
Conflicts:
	src/common/security/rbac/context_test.go
	src/ui/api/statistic.go
	src/ui/projectmanager/pm.go
2017-06-05 16:53:15 +08:00
Yan
d00aba8de8 Merge pull request #2367 from ywk253100/170524_search
Refactor search API
2017-06-04 22:41:55 -07:00
Yan
1171e4c4d6 Merge pull request #2378 from ywk253100/170524_sync
Refactor sync registry API
2017-06-04 20:32:14 -07:00
Yan
158d14f559 Merge pull request #2358 from ywk253100/170523_replica
Refactor policy, job, target API
2017-06-04 20:29:05 -07:00
Yan
b1d09cdccb Merge pull request #2372 from ywk253100/170524_statistics
Refactor statistics API
2017-06-04 20:28:48 -07:00
Steven Zou
5e5a93d59b Add more usage info to readme 2017-06-05 10:19:13 +08:00
kunw
cc6571f0a2 Update styles for stack view. 2017-06-02 20:24:41 +08:00
kunw
4246f55180 Merge latest updates. 2017-06-02 16:53:03 +08:00
Steven Zou
8bc8aa43a4 Merge pull request #2415 from steven-zou/master
Add integration guideline document for harbor UI library
2017-06-02 16:50:07 +08:00
kunw
e7132c5252 Add stackview for repo-tags 2017-06-02 16:49:29 +08:00
Steven Zou
1d57e1b41c Add guideline for ui library integration 2017-06-02 16:27:51 +08:00
Steven Zou
55a39e9bf3 Add guideline for ui library integration 2017-06-02 16:06:13 +08:00
Wenkai Yin
e0fe068308 update 2017-06-02 14:17:01 +08:00
Wenkai Yin
95a2a01bb0 Merge pull request #2377 from ywk253100/170524_ldap
Refactor ldap API
2017-06-02 13:46:51 +08:00
Wenkai Yin
0ede4bca7b Merge pull request #2381 from ywk253100/170525_config
Refactor config API
2017-06-02 13:46:33 +08:00
kun wang
d7a39f2f9c Merge pull request #2395 from wknet123/master-enable-paging-sorting
Update components for pagination and sorting.
2017-06-02 13:07:19 +08:00
kun wang
2aaa53f22b Merge pull request #2398 from wknet123/master-tags-revised
Update UI for revised tags API.
2017-06-02 13:06:49 +08:00
kunw
2f21ab8442 Update for revised tags API. 2017-05-31 16:29:17 +08:00
kunw
e1df278ab5 Update components for pagination and sorting. 2017-05-31 16:21:29 +08:00
kunw
963efc5253 Update components for pagination and sorting. 2017-05-31 11:31:56 +08:00
Wenkai Yin
1b83c0b076 support pagination in GET recent logs API 2017-05-26 17:51:20 +08:00
Wenkai Yin
1dffe91f91 bug fix 2017-05-26 17:23:01 +08:00
Wenkai Yin
8ae5e46d63 refactor config API 2017-05-25 14:44:05 +08:00
Wenkai Yin
2e059eb85a refactor sync registry API 2017-05-25 13:42:25 +08:00
kun wang
565110d9f1 Merge pull request #2375 from steven-zou/master
Implement vulnerability scanning components [unstable]
2017-05-25 12:07:00 +08:00
Steven Zou
7a0a423cc8 Implement vulnerability scanning components 2017-05-24 17:44:47 -07:00
Wenkai Yin
79e80aad67 Merge pull request #2359 from ywk253100/170523_log
Refactor log API
2017-05-24 18:32:44 +08:00
Wenkai Yin
0d3c25e2a5 refactor ldap API 2017-05-24 18:32:02 +08:00
Wenkai Yin
6ee64ba83a refactor email API 2017-05-24 18:31:01 +08:00
Wenkai Yin
1314ff92f5 refactor sync registry API 2017-05-24 18:29:24 +08:00
Wenkai Yin
cf306ec66e refactor statistics API 2017-05-24 16:34:33 +08:00
Wenkai Yin
a901297859 Merge pull request #2341 from ywk253100/170519_member
Refactor member API
2017-05-24 14:32:06 +08:00
Wenkai Yin
97972028e1 refactor search API 2017-05-24 13:33:46 +08:00
Wenkai Yin
924a62df7e Merge pull request #2355 from ywk253100/170522_repo
Return signatures in GET tags API
2017-05-24 10:30:58 +08:00
Wenkai Yin
30316a2b94 return signatures in GET tags API 2017-05-24 10:15:39 +08:00
Wenkai Yin
577eadf9f1 Merge pull request #2361 from ywk253100/170523_systeminfo
Refactor system info API
2017-05-24 10:10:14 +08:00
Steven Zou
12660e0ea6 Merge pull request #2347 from wknet123/master-replication
Add shareable replication components
2017-05-23 14:58:41 -07:00
Wenkai Yin
33e2e87b62 refactor system info API 2017-05-23 18:40:09 +08:00
Wenkai Yin
e8572545c1 refactor log API 2017-05-23 18:17:12 +08:00
Wenkai Yin
92dcf4bfd3 refactor policy, job, target API 2017-05-23 16:57:25 +08:00
Wenkai Yin
0e237d8cab fix bug 2017-05-23 16:28:10 +08:00
Daniel Jiang
1c441b17be refactor job service (#2348) 2017-05-22 22:33:20 -07:00
kunw
5d3ed05a09 Update per comments. 2017-05-22 16:59:40 +08:00
Wenkai Yin
4884ec7835 Merge pull request #2335 from ywk253100/170518_user_api
Refactor user API
2017-05-22 11:43:34 +08:00
kunw
227b440956 Updates for replication spec. 2017-05-19 18:44:07 +08:00
Wenkai Yin
17813a75f0 refactor member API 2017-05-19 17:35:08 +08:00
Wenkai Yin
d45ef78eaf Merge pull request #2316 from ywk253100/170512_project
Refactor project API
2017-05-19 16:28:32 +08:00
Wenkai Yin
7df2be19de update 2017-05-19 13:24:31 +08:00
Wenkai Yin
3287bf6f9e refactor user API 2017-05-18 15:43:29 +08:00
Steven Zou
588bcf7d6c To fix intl not found issue in Safari 2017-05-17 11:05:28 -07:00
kunw
b26902448d Update for date-validators. 2017-05-17 18:38:19 +08:00
Wenkai Yin
b5279ea1f1 update 2017-05-17 17:54:10 +08:00
kunw
45ef8adca2 Merge remote-tracking branch 'upstream/master' into master-replication 2017-05-17 15:03:33 +08:00
kun wang
ed63c916bf Merge pull request #2310 from wknet123/master-repo-tags
Add shareable repo and tag component.
2017-05-17 14:33:51 +08:00
kunw
833c9f8f2e Refine spec of repository. 2017-05-17 13:33:31 +08:00
kunw
2da0bfa8b9 Add shareable replication component 2017-05-17 13:29:27 +08:00
Steven Zou
755654615e Modify project name checking 2017-05-16 18:23:09 -07:00
Steven Zou
26d20bd9aa Modify member name checking 2017-05-16 18:01:54 -07:00
Steven Zou
cf65c39cef Change the validation way of project name 2017-05-16 12:17:18 -07:00
Steven Zou
5744b83989 Modify password tips to add max length of pwd 2017-05-16 09:56:59 -07:00
Wenkai Yin
e1c1b8ec34 refactor project api 2017-05-16 15:02:37 +08:00
kunw
de88cccf77 Fix per comments. 2017-05-16 11:00:37 +08:00
Steven Zou
153d807fca Refine the access level of project creation 2017-05-15 17:57:20 -07:00
Daniel Jiang
4f66279c33 Fail authentication when username is empty (#2300) (#2303) 2017-05-15 14:35:38 -07:00
kunw
30a7a216c6 Add shareable repo and tag component. 2017-05-15 18:54:45 +08:00
Steven Zou
de8e0091f9 Merge pull request #2299 from wknet123/master-endpoint
Update for restriction check.
2017-05-12 22:35:52 +08:00
Daniel Jiang
7b0646760c Fail authentication when username is empty (#2300) 2017-05-12 06:12:36 -04:00
kunw
3b0bd2e700 Update for restriction check. 2017-05-12 17:38:09 +08:00
Wenkai Yin
e28ad39430 Merge pull request #2290 from ywk253100/170511_merge
Refactor auth of token service
2017-05-12 16:42:23 +08:00
Wenkai Yin
7e805b2dd4 refactor auth of token service 2017-05-12 16:27:13 +08:00
kun wang
da7fe47924 Merge pull request #2289 from wknet123/master-endpoint
Add shareable endpoint components.
2017-05-12 15:40:38 +08:00
kunw
900854128a Update for shareable endpoint. 2017-05-12 15:03:07 +08:00
Daniel Jiang
5892ef29c2 Merge pull request #2291 from reasonerjt/vulscan-job-refactory
add scan job table and dao functions
2017-05-12 02:45:55 -04:00
Tan Jiang
7d7d0c48f4 fix golin, add update status 2017-05-11 23:47:12 +08:00
Tan Jiang
dcbfb4d309 add scan job table and dao functions 2017-05-11 21:41:57 +08:00
Wenkai Yin
161cbea40b Merge pull request #2283 from ywk253100/170509_repo_api
Refactor repository API
2017-05-11 18:01:14 +08:00
Wenkai Yin
f1f302ec29 update 2017-05-11 17:02:01 +08:00
kunw
5071dcf304 Add shareable endpoint components. 2017-05-11 14:59:12 +08:00
Wenkai Yin
06ba7e0de0 update 2017-05-11 12:34:14 +08:00
kun wang
c3c7b540f1 Merge pull request #2278 from steven-zou/master
Implement replication service interface
2017-05-10 16:07:55 +08:00
Wenkai Yin
8f396b44f3 Merge remote-tracking branch 'upstream/master' into 170509_repo_api
Conflicts:
	src/ui/api/repository.go
2017-05-10 15:53:24 +08:00
Wenkai Yin
b02bbc0adf refactor repository API 2017-05-10 15:43:45 +08:00
Steven Zou
e3929f0e95 Implement replication service interface 2017-05-10 15:41:20 +08:00
Yan
8db1b2807e Merge pull request #2197 from ywk253100/170502_change_userid
Delete column user_id from table access_log
2017-05-10 00:02:54 -07:00
Steven Zou
b354653735 Merge pull request #2269 from steven-zou/master
Implement tag service interface
2017-05-10 14:37:22 +08:00
Wenkai Yin
01066c72b5 update 2017-05-10 13:11:09 +08:00
Steven Zou
54df5ec053 Implement tag service interface 2017-05-09 20:32:10 +08:00
Steven Zou
79544d39e0 Merge pull request #2268 from steven-zou/master
Implement repository service interface
2017-05-09 17:49:20 +08:00
Wenkai Yin
b5ef2c231d Merge pull request #2254 from ywk253100/170504_security_context
Create different security contexts and project managers according to the request
2017-05-09 17:41:19 +08:00
Steven Zou
3044a154b1 Implement repository service interface 2017-05-09 17:18:49 +08:00
Wenkai Yin
f8615e4746 create different security context according to the rquest 2017-05-09 17:02:29 +08:00
Steven Zou
68cc911373 Merge pull request #2264 from steven-zou/master
Use local json loader for ngx-translate
2017-05-09 16:24:24 +08:00
Steven Zou
28eafd2f30 Use local json loader for ngx-translate 2017-05-09 16:09:03 +08:00
Tan Jiang
fd8fd2fbe1 Enable project level content trust, controlled by environment variable 2017-05-09 15:36:58 +08:00
Daniel Jiang
7b0daca06a Merge pull request #2218 from ywk253100/170503_pms_db
Implement the project manager based on database
2017-05-07 22:54:37 -04:00
Daniel Jiang
b9b7e2f5e1 Merge pull request #2244 from vmware/release-1.1.0
Merge latest code from release-1.1.0 branch
2017-05-07 22:48:08 -04:00
Wenkai Yin
017e650b5b fix bug 2017-05-05 18:11:16 +08:00
wangyan
045b5a1c63 Fix permission issue catched by GAS Scanner 2017-05-05 00:20:35 -07:00
kun wang
a4a5ff6c60 Merge pull request #2233 from steven-zou/master
Add test spec for log component
2017-05-05 10:59:01 +08:00
Steven Zou
c837a1fb9e Add test spec for log component 2017-05-05 10:41:42 +08:00
kun wang
b7e1df7e1c Merge pull request #2222 from steven-zou/master
Build code base for shareable UI components
2017-05-04 17:50:24 +08:00
Steven Zou
6415689d56 Replace cookie service to ngx-cookie 2017-05-04 17:28:47 +08:00
Steven Zou
e057117d2e Build code base for shareable UI components 2017-05-04 17:09:55 +08:00
Steven Zou
0ae0c31168 Merge changes of rel 1.1.0 back to master 2017-05-04 15:47:02 +08:00
Wenkai Yin
b4c172b754 update 2017-05-04 12:28:00 +08:00
Wenkai Yin
3591086259 update 2017-05-04 12:27:14 +08:00
Wenkai Yin
92aa8ac15b implement PMS based on database 2017-05-04 12:17:32 +08:00
Wenkai Yin
13d9b05dcb Merge pull request #2193 from ywk253100/170502_security_ctx_db
Implement security context interface
2017-05-04 12:15:44 +08:00
Daniel Jiang
c97d349fa8 Merge pull request #2204 from reasonerjt/release-1.1.0
handle unexpected error in ldap search
2017-05-03 19:17:17 +08:00
kun wang
11beddaaf9 Merge pull request #2198 from wknet123/release-1.1.0-fix
Encode sign-in params.
2017-05-03 19:05:30 +08:00
Tan Jiang
7487095dd8 handle unexpected error in ldap search 2017-05-03 18:54:41 +08:00
kun wang
a519534bd1 Merge branch 'release-1.1.0' into release-1.1.0-fix-notary 2017-05-03 18:43:43 +08:00
kunw
e5a17418c8 Fix sign-in encode issue. 2017-05-03 18:32:48 +08:00
kunw
db504068a6 Fix tags action display issue. 2017-05-03 18:09:27 +08:00
kunw
e44c0c8af9 Fix notary signature issue. 2017-05-03 18:01:04 +08:00
Wenkai Yin
22826b5309 update 2017-05-03 17:22:19 +08:00
Wenkai Yin
d5db9db00b update 2017-05-03 17:21:38 +08:00
kunw
2f526e2b5f Encode sign-in params. 2017-05-03 16:03:27 +08:00
Steven Zou
dd80ea48bb Merge pull request #2192 from wknet123/master-fix-tags-action
Fix issues about tags action.
2017-05-03 15:23:19 +08:00
Daniel Jiang
79903ca3f3 Merge pull request #2194 from reasonerjt/create-reverse-proxy
create reverse proxy
2017-05-03 15:09:11 +08:00
Wenkai Yin
3be9cca0f5 delete column user_id from table accesslog 2017-05-03 14:18:07 +08:00
Tan Jiang
785298e6b9 create reverseproxy 2017-05-02 20:27:45 +08:00
kunw
bcb1dff59d Fix issues about tags action. 2017-05-02 17:49:21 +08:00
kun wang
f7a4a21066 Merge pull request #2191 from steven-zou/master
Enhance the module configuration of harbor ui
2017-05-02 17:40:38 +08:00
Wenkai Yin
ac7256efbd implement security context interface for database 2017-05-02 17:36:38 +08:00
Steven Zou
25004bbd1f Enhance the module configuration of harbor ui 2017-05-02 15:12:39 +08:00
Wenkai Yin
4eca617916 Merge remote-tracking branch 'upstream/master' into 170427_delete_ownerid 2017-05-02 14:58:36 +08:00
Wenkai Yin
4f9d9ed5d8 delete owner_id column from table repository 2017-05-02 14:57:07 +08:00
kunw
5ed47c0316 Merge release-1.1.0 2017-05-02 13:27:06 +08:00
Wenkai Yin
80d83d97bd Merge pull request #2158 from ywk253100/170427_pm
Implement security context for secret
2017-05-02 13:12:20 +08:00
Daniel Jiang
97e214c3d3 bypass some email test (#2184) 2017-05-02 12:48:44 +08:00
kun wang
89f5905f34 Update for member guard. (#2182) 2017-04-28 18:44:44 +08:00
kun wang
edbd4a8973 Update messages for access level. (#2176) 2017-04-28 17:11:03 +08:00
kun wang
62f9f842d4 Revert changes to tags route. (#2179) 2017-04-28 16:55:44 +08:00
kun wang
d03657e1d0 Update statistic label messages. (#2174) 2017-04-28 13:36:29 +08:00
kun wang
5e0805bd99 Update messages for access level. (#2175) 2017-04-28 13:16:15 +08:00
kunw
ed488e683d Update for tags route. 2017-04-28 11:04:45 +08:00
Wenkai Yin
e08b8217c3 implement security context for secret 2017-04-27 17:33:24 +08:00
Daniel Jiang
eb39fbf814 Merge pull request #2157 from vmware/release-1.1.0
merge 1.1.0 fix code into master
2017-04-27 17:27:23 +08:00
Daniel Jiang
e4af15048d Merge pull request #2148 from ywk253100/170425_authN_interface
Abstract security context interface and enable security filter
2017-04-27 11:35:22 +08:00
Steven Zou
fc47d3932c Merge pull request #2136 from wknet123/master-ui-aot
Fix issue about UX.
2017-04-26 22:22:09 +08:00
Wenkai Yin
f8f56ad555 auth integration 2017-04-26 18:54:46 +08:00
kunw
fc6d3cd9b9 Update per comments. 2017-04-26 18:34:18 +08:00
Steven Zou
bed7b584ab fix nav divider style issue 2017-04-26 18:18:35 +08:00
Tan Jiang
2f6dd6f102 do not return error when ldap bind failed 2017-04-26 16:29:00 +08:00
Wenkai Yin
f92b17e8b9 Merge remote-tracking branch 'upstream/release-1.1.0' into 170424_ldap_fix 2017-04-26 15:29:04 +08:00
kunw
1d98212d60 Fix UI compile issues. 2017-04-25 21:28:31 +08:00
kunw
e8113fa3fa Merge remote-tracking branch 'upstream/master' into master-ui-aot 2017-04-25 20:34:44 +08:00
kunw
adee392c3c Fix issues about confirm buttons and date validation. 2017-04-25 20:34:28 +08:00
Steven Zou
91f75f6395 Merge pull request #2135 from steven-zou/master
Change the alert style to global style
2017-04-25 19:45:51 +08:00
Steven Zou
dfadb70cc0 Change the alert style to global style 2017-04-25 19:27:28 +08:00
Daniel Jiang
ff4ba7d124 Merge pull request #2130 from reasonerjt/use-crypto-rand
replace math/rand with crypto/rand
2017-04-25 18:07:00 +08:00
Tan Jiang
da19700a1e replace math/rand with crypto/rand 2017-04-25 17:47:40 +08:00
Tan Jiang
e17526a495 fix ldap issue 2017-04-25 16:33:01 +08:00
Steven Zou
95c4994737 fix issue:#2012 2017-04-25 16:28:45 +08:00
Steven Zou
ba18333405 fix issue:#2011 2017-04-25 15:27:19 +08:00
Steven Zou
bb6cd5b17a remove ‘required’ flag from 'searchDN and search password' of ldap 2017-04-25 14:17:09 +08:00
Wenkai Yin
b9833990c4 bug fix 2017-04-25 14:13:03 +08:00
Steven Zou
e31bab435b Enable UI UT test framework (karma and jasmine) 2017-04-24 19:44:12 +08:00
kunw
35489e40ff Fix UI defered issues. 2017-04-24 18:48:35 +08:00
kunw
0c0db587ec Updates per comments. 2017-04-24 16:07:07 +08:00
kunw
1018d1a1c0 Merge remote-tracking branch 'upstream/master' into master-ui-aot 2017-04-24 15:05:38 +08:00
BhEaN
54bcb1fbe1 Added Spanish language 2017-04-22 00:29:27 +02:00
kunw
ba49eb79f1 Update for ui image building. 2017-04-21 19:34:57 +08:00
Tan Jiang
480bbc1a0d fix issue in LDAP support 2017-04-21 19:06:10 +08:00
Steven Zou
543a960ca2 Allow admin to change password when auth mode is 'ldap_auth' 2017-04-21 18:27:32 +08:00
kunw
f4ef4eda02 Merge latest updates. 2017-04-20 23:49:13 +08:00
kunw
b42f8935e2 Fix and update codes for AoT. 2017-04-20 23:47:06 +08:00
Steven Zou
30254f0d89 Setup UI shared components libarary 2017-04-20 14:58:31 +08:00
kunw
012a42a6a2 Merged latest updates. 2017-04-19 12:09:23 +08:00
kunw
3ca69d7596 Upgrade to Angular 4 and Clarity 0.9.0 2017-04-19 12:05:58 +08:00
wy65701436
d983e9d4fe update ignore file
rm unused langagues files.
2017-04-14 02:49:16 -07:00
wy65701436
b9c8fe51b5 replace header of ts files 2017-04-13 19:06:23 -07:00
wy65701436
22a540ea30 fix golint issue 2017-04-13 04:16:51 -07:00
wy65701436
53f7cfb967 replace go header 2017-04-13 03:54:58 -07:00
Steven Zou
7247fe3924 Fix language switching issue 2017-04-12 17:38:28 +08:00
Steven Zou
3171e43e66 override page title and search placeholder when in VIC mode 2017-04-12 08:55:39 +08:00
Steven Zou
3f8dd77eeb amend typo in copyright declearation 2017-04-11 22:19:30 +08:00
Steven Zou
73fa73c21d Merge pull request #1995 from wknet123/master-jit
Fix invisible action for sysadmin.
2017-04-11 18:50:45 +08:00
kunw
9427629267 Fix invisible action for sysadmin. 2017-04-11 18:35:47 +08:00
Yan
9a624c1dfc Merge pull request #1990 from wy65701436/master
customize beego 404
2017-04-11 16:12:02 +08:00
kun wang
28cd538954 Merge pull request #1984 from wknet123/master-jit
Update endpoint interaction of UI.
2017-04-11 15:37:02 +08:00
wy65701436
1bbe14fc9e add comment for source code 2017-04-11 00:30:36 -07:00
wy65701436
a1c20dd666 update template 2017-04-11 00:13:37 -07:00
wy65701436
c63addebb8 add 4040 2017-04-11 00:06:26 -07:00
wy65701436
a8aa0ad9b3 add customize 404 2017-04-11 00:05:28 -07:00
Steven Zou
6664b57365 Merge branch 'master' into master 2017-04-11 14:20:07 +08:00
kunw
9c6e49c5dd Update endpoint interaction of UI. 2017-04-11 11:42:56 +08:00
Wenkai Yin
228ecf9b78 bug fix 2017-04-10 17:25:10 +08:00
Wenkai Yin
ac77ee3bc4 modify ping targat and put target api 2017-04-10 13:45:24 +08:00
Steven Zou
7325572f38 Refine sign-in form validation behavior 2017-04-10 10:58:10 +08:00
Steven Zou
a385684983 translate copyright to zh 2017-04-10 10:39:43 +08:00
Daniel Jiang
3543a4742f Merge pull request #1967 from ywk253100/170407_role
Fixes out of range bug when listing projects
2017-04-07 20:09:30 +08:00
Wenkai Yin
5c2bd7eecc fix bug 2017-04-07 19:47:08 +08:00
Daniel Jiang
49377c5bc8 Merge pull request #1962 from ywk253100/170407_adminserver_log_leak
Fix logs leak
2017-04-07 19:19:17 +08:00
Daniel Jiang
642dbe329e Merge pull request #1961 from wknet123/master-new
Make role name consistent.
2017-04-07 19:18:58 +08:00
Daniel Jiang
9327fd2c66 Merge pull request #1960 from ywk253100/170407_role
Donot add projectadmin role to sysadmin when return roles, fix #1957
2017-04-07 19:16:33 +08:00
Daniel Jiang
554c57fc19 Merge pull request #1958 from steven-zou/master
update message files
2017-04-07 19:15:46 +08:00
Wenkai Yin
746667bb38 donot add projectadmin role to sysadmin when return roles, fix #1957 2017-04-07 19:09:59 +08:00
Steven Zou
c5f88d6085 Fix UI related issue and update message files:
- update message files
 - fix minor UI/UX issues
 - revoke inline alert fix css
 - fix css style
2017-04-07 18:30:58 +08:00
kunw
3c95bbd53a Make role name consistent. 2017-04-07 18:28:37 +08:00
Wenkai Yin
cd86c50e29 donot dump response to log, fix #1950 2017-04-07 18:14:22 +08:00
Wenkai Yin
ff9a64c631 donot log sensitive message to logs, fix #1949 2017-04-07 17:58:57 +08:00
Fangyuan Li
bc30341a76 Merge branch 'master' into fix_typo 2017-04-07 00:22:53 -07:00
maplain
be96a3b17c add a missing format string argument 2017-04-07 00:21:08 -07:00
Daniel Jiang
93f5c78b4b Merge pull request #1948 from ywk253100/170406_secretkey
Mount config to another dir, fix #1939
2017-04-07 11:35:58 +08:00
Daniel Jiang
4dddd5e9b4 Merge pull request #1944 from ywk253100/170406_ping_target
Do not return password of target
2017-04-07 11:35:07 +08:00
Daniel Jiang
1b2ad034a4 Merge pull request #1943 from ywk253100/170405_member_api
Return createtime and updatetime in GET members API
2017-04-07 11:34:44 +08:00
Daniel Jiang
dcda6fe72c Merge pull request #1942 from steven-zou/master
adjust the size of inputbox in related forms
2017-04-07 11:34:06 +08:00
Daniel Jiang
7bf124735a Merge pull request #1929 from ywk253100/170405_subject
Modify the subject of resetting password email
2017-04-07 11:33:29 +08:00
Wenkai Yin
e60fd0530f mount config to another dir, fix #1939 2017-04-07 09:14:41 +08:00
Steven Zou
0c9e6755db adjust gauge css style 2017-04-06 19:12:29 +08:00
Steven Zou
74a4de6868 Merge remote-tracking branch 'upstream/master' 2017-04-06 19:08:48 +08:00
kunw
559011ce93 Update for hidding password in target. 2017-04-06 19:05:44 +08:00
Wenkai Yin
488e19f514 donot return password of target 2017-04-06 18:48:43 +08:00
ywk253100
7c64709402 modify the subject of resetting password email, fix #1919 2017-04-06 18:40:50 +08:00
Steven Zou
b640a22a66 adjust the size of inputbox in related forms 2017-04-06 18:33:00 +08:00
Wenkai Yin
3b56893f3c return createtime and updatetime, fix #1924 2017-04-06 18:18:15 +08:00
Daniel Jiang
d8a0e01214 Merge pull request #1926 from wknet123/master-new
Fix UX issues.
2017-04-06 17:59:17 +08:00
Steven Zou
4d3b0b99ef Shrink gauge size 2017-04-06 17:25:50 +08:00
Steven Zou
0d9934aa40 uncomment alert close timer 2017-04-06 16:21:57 +08:00
Steven Zou
8f0285b4cb Fix UI/UX issues:
Use blur event to instead focusout
Fix mail/ldap server testing spinner and button disabling issues
Fix content area/more info margins and make alert as overlay
fix reset password form issues
fix reset password style issue
fix tootip display inssue on reset form
commit index.html change
2017-04-06 16:12:22 +08:00
kunw
26a2582553 Refine expression. 2017-04-06 15:06:05 +08:00
Steven Zou
d7f8317382 change free to used 2017-04-06 15:06:05 +08:00
Steven Zou
a1769ac6dc fix free storage info bug 2017-04-06 15:06:05 +08:00
Steven Zou
dfda6b4772 fix gauge bug 2017-04-06 15:06:04 +08:00
Steven Zou
b361e6332d change free to used 2017-04-05 19:11:16 +08:00
Steven Zou
39cfaf4be3 fix free storage info bug 2017-04-05 19:00:02 +08:00
kunw
503a332937 Fix UX issues. 2017-04-05 18:51:37 +08:00
Steven Zou
9afd0c9c3c fix gauge bug 2017-04-05 18:37:27 +08:00