Commit Graph

2557 Commits

Author SHA1 Message Date
Steven Zou
e115f8b577 merge latest ui_ng code in 2017-03-09 10:18:03 +08:00
Wenkai Yin
18402f84f0 modify test cases 2017-03-08 20:42:40 +08:00
Daniel Jiang
2006466814 Merge pull request #1544 from reasonerjt/notary-integration
notary containers should use syslog as log driver
2017-03-08 19:46:31 +08:00
Tan Jiang
04a5eb6606 notary containers should use syslog as log driver 2017-03-08 17:24:32 +08:00
wy65701436
f50b5bbbaa modify nortary => notary 2017-03-08 00:30:59 -08:00
wy65701436
371929499a to support nortary 2017-03-08 00:12:13 -08:00
Daniel Jiang
3718ee4177 Merge pull request #1539 from wy65701436/dev
make support clarity
2017-03-08 16:03:59 +08:00
wy65701436
9441b2711f make support clarity 2017-03-07 23:43:07 -08:00
Daniel Jiang
8b69157f04 Merge pull request #1538 from reasonerjt/notary-integration
update swagger, fix minor issues in test
2017-03-08 15:42:45 +08:00
kunw
f2a1659d96 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-03-08 15:36:05 +08:00
Tan Jiang
42bc430cfd update swagger, fix minor issues in test 2017-03-08 13:57:34 +08:00
Daniel Jiang
282c7f61c4 Merge pull request #1536 from ywk253100/170307_repo_api
Refactor get repo API
2017-03-08 12:31:05 +08:00
Wenkai Yin
f7fe063436 fix conflict 2017-03-08 10:57:17 +08:00
Wenkai Yin
aaa27386c9 Merge pull request #1534 from reasonerjt/notary-integration
Provide a api for retrieving the signature of a repo.
2017-03-07 21:11:03 +08:00
Daniel Jiang
b744064008 Merge pull request #1535 from ywk253100/170307_swagger
fix bug in swagger
2017-03-07 21:05:30 +08:00
Wenkai Yin
b4f8fdf563 fix bug in swagger 2017-03-07 20:34:43 +08:00
Tan Jiang
8ec94a6d0a fix golint issue 2017-03-07 19:34:02 +08:00
Tan Jiang
d983982d19 provide api to fetch repository's signature information from Harbor's nested notary intance 2017-03-07 19:14:00 +08:00
Steven Zou
e83aba5cc2 Merge pull request #1530 from vmware/merge/ui_ng
merge ui_ng
2017-03-07 17:39:14 +08:00
Steven Zou
da3ebdcdcd merge ui_ng 2017-03-07 17:20:33 +08:00
Daniel Jiang
c1d9d68232 Merge pull request #1518 from ywk253100/170306_search
Refactor search API to return more info
2017-03-07 13:12:53 +08:00
Daniel Jiang
b16a8843a2 Merge pull request #1512 from ywk253100/1703002_email_ping
Support email ping
2017-03-07 13:06:30 +08:00
Wenkai Yin
1d83d8b642 remove cache 2017-03-07 12:28:24 +08:00
Wenkai Yin
dfae869dce add test cases 2017-03-06 18:03:31 +08:00
Wenkai Yin
d6a6f67596 refactor search API to return more info 2017-03-06 17:47:05 +08:00
Daniel Jiang
d5a4e5cc20 Merge pull request #1513 from reasonerjt/token-service-refactory
support generate UI token for notary
2017-03-06 15:59:13 +08:00
Daniel Jiang
c619bb9294 Merge pull request #1490 from ywk253100/170301_config
Read some configs from env when start up
2017-03-06 12:40:21 +08:00
Tan Jiang
109db458c3 support generate UI token for notary 2017-03-06 12:17:22 +08:00
Daniel Jiang
fb77c1a7e3 Merge pull request #1511 from ywk253100/170303_bugfix
Fix bug in sending email
2017-03-05 19:13:39 +08:00
Wenkai Yin
0a80d7fee2 fix bug in sending email 2017-03-03 18:10:28 +08:00
Wenkai Yin
23bf2f0ddf support ping email server 2017-03-03 16:36:13 +08:00
Wenkai Yin
a4cb261df9 read some configs from env 2017-03-02 13:24:41 +08:00
kunw
dbce11ce42 Updates for node clarity build. 2017-03-01 17:14:09 +08:00
Steven Zou
ac6c26d6db Merge pull request #1483 from vmware/feature/merge_ui_ng_code
merge code for building
2017-02-28 12:51:44 +08:00
Steven Zou
dcc88cbea2 merge code for building 2017-02-28 12:46:15 +08:00
Daniel Jiang
660fd4a80a Merge pull request #1477 from reasonerjt/dev
fix the 'v2' URL conflict issue, and remove the workaround
2017-02-28 12:43:22 +08:00
kunw
f517502193 Merge remote-tracking branch 'upstream/dev' into dev-revised 2017-02-28 12:17:34 +08:00
Tan Jiang
71c9fcf849 remove confusing comment 2017-02-28 11:37:09 +08:00
kunw
f01569c4dd Updates for clarity docker-compose files. 2017-02-27 22:07:39 +08:00
Tan Jiang
6454ccfc3a fix the 'v2' URL conflict issue, and remove the work around in token service code 2017-02-27 21:01:26 +08:00
Wenkai Yin
5b885a7ad6 Merge pull request #1469 from yhua123/dev
fix #1332
2017-02-27 19:21:25 +08:00
kun wang
cf009d2a74 Merge pull request #1471 from wknet123/dev-revised
Updates for configuration ldap scope.
2017-02-27 19:15:09 +08:00
kunw
44ea387f02 Updates for configuration ldap scope. 2017-02-27 19:12:19 +08:00
yhua
9f18c8458b fix #1332 2017-02-27 18:52:22 +08:00
Steven Zou
2e20a65121 Merge pull request #1458 from wknet123/harbor-clarity-integration
Merge Harbor clarity integration to into Dev branch.
2017-02-27 16:20:22 +08:00
Wenkai Yin
c4606d0383 Merge pull request #1467 from yhua123/dev
add new ldap auth and import user feature
2017-02-27 16:17:14 +08:00
Daniel Jiang
1405661f5f Merge pull request #1462 from reasonerjt/token-service-refactory
Token service refactory
2017-02-27 15:59:03 +08:00
yhua
c48d908515 add new ldap auth and import user feature 2017-02-27 15:13:49 +08:00
Tan Jiang
81502e1e59 refinement per review 2017-02-27 12:52:14 +08:00
kunw
46cef020eb Rename directory name. 2017-02-27 11:41:46 +08:00