Commit Graph

2843 Commits

Author SHA1 Message Date
Yan
64a8ebee4d Merge pull request #2166 from reasonerjt/deploy-clair
use docker-compose to deploy clair with harbor
2017-04-28 10:59:40 +08:00
Tan Jiang
83b9196925 use docker-compose to deploy clair with harbor 2017-04-27 19:13:53 +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
kun wang
14b2139efc Merge pull request #2147 from steven-zou/master
fix nav divider style issue
2017-04-26 18:38:25 +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
Daniel Jiang
ed6e60ba71 Merge pull request #2143 from reasonerjt/fix-ldap-1.1.0
do not return error when ldap bind failed
2017-04-26 16:52:23 +08:00
Tan Jiang
2f6dd6f102 do not return error when ldap bind failed 2017-04-26 16:29:00 +08:00
Wenkai Yin
ee93627391 Merge pull request #2116 from ywk253100/170424_ldap_fix
Return error when got more than one users in GetUser method
2017-04-26 16:16:15 +08:00
kunw
eddde3c804 Update for harbor UI builder image. 2017-04-26 16:00:18 +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
Daniel Jiang
f2d71a6f2b Merge pull request #2125 from reasonerjt/fix-ldap-1.1.0
Fix ldap 1.1.0
2017-04-25 17:52:42 +08:00
Tan Jiang
da19700a1e replace math/rand with crypto/rand 2017-04-25 17:47:40 +08:00
Steven Zou
cbe5a5bbd9 Merge pull request #2132 from steven-zou/master
Fix UX issues
2017-04-25 17:04:56 +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
Yan
5a7fba7b1d Merge pull request #2119 from wy65701436/release-1.1.0
add 1.1.0.1 support
2017-04-25 00:35:06 -07:00
Steven Zou
ba18333405 fix issue:#2011 2017-04-25 15:27:19 +08:00
Yan
4268d2a7fb Merge branch 'release-1.1.0' into release-1.1.0 2017-04-25 00:14:47 -07:00
wangyan
b061efdeb8 add 1.1.0.1 support
update 1.1.x

update 1.1.x
2017-04-24 23:49:27 -07:00
Steven Zou
59845416ef Merge pull request #2129 from steven-zou/fix/ldap_configurations
remove ‘required’ flag from 'searchDN and search password' of ldap
2017-04-25 14:44:38 +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
Daniel Jiang
7d79d813c6 Merge pull request #2115 from hainingzhang/release-1.1.0
update installation guide
2017-04-25 14:03:18 +08:00
kun wang
f1d8310ed8 Merge pull request #2124 from steven-zou/master
Enable UI UT test framework (karma and jasmine) for UI lib
2017-04-25 11:18:41 +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
kun wang
6acf49581c Merge pull request #2112 from vmware/master-ui-aot
Updates for AoT building.
2017-04-24 17:22:32 +08:00
kun wang
ba87b3e051 Merge pull request #2118 from wknet123/master-ui-aot
Updates per comments.
2017-04-24 16:26:21 +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
Henry Zhang
29236838c8 update installation guide 2017-04-24 15:01:19 +08:00
Steven Zou
62b50c1078 Merge pull request #2110 from bhean/spanish-translation
Spanish translation
2017-04-24 14:48:23 +08:00
BhEaN
54bcb1fbe1 Added Spanish language 2017-04-22 00:29:27 +02:00
BhEaN
632a30e3da Merge pull request #1 from vmware/master
Updated from original project
2017-04-21 21:30:36 +02:00
kun wang
785432c520 Merge pull request #2108 from wknet123/master-ui-aot
Update travis.yml
2017-04-21 19:47:07 +08:00
kunw
9f72bef9aa Update travis.yml 2017-04-21 19:45:54 +08:00
kun wang
be46a6b59f Merge pull request #2107 from wknet123/master-ui-aot
Update for ui image building.
2017-04-21 19:35:49 +08:00
kunw
ba49eb79f1 Update for ui image building. 2017-04-21 19:34:57 +08:00
Daniel Jiang
3038790faa Merge pull request #2097 from reasonerjt/fix-ldap-1.1.0
fix issue in LDAP support
2017-04-21 19:19:00 +08:00
Tan Jiang
480bbc1a0d fix issue in LDAP support 2017-04-21 19:06:10 +08:00