Commit Graph

1890 Commits

Author SHA1 Message Date
Daniel Jiang
bc63c46b2d Merge pull request #996 from ywk253100/161102_nginx_upgrade
Upgrade nginx to 1.11.5
2016-11-02 17:14:22 +08:00
Wenkai Yin
4fcfffeb47 upgrade nginx to 1.11.5 2016-11-02 15:49:28 +08:00
Haining Henry Zhang
04e2a55b42 Merge pull request #989 from hainingzhang/master
update docs
2016-11-02 08:44:32 +08:00
Henry Zhang
1cb7b1a54b update docs 2016-11-01 23:50:59 +08:00
Henry Zhang
e366c31d83 update docs 2016-11-01 23:45:47 +08:00
Henry Zhang
3ed8225935 update docs 2016-11-01 23:09:25 +08:00
Henry Zhang
67f27fae00 update docs 2016-11-01 23:03:39 +08:00
Henry Zhang
136e0bbda3 update docs 2016-11-01 22:52:34 +08:00
Daniel Jiang
98bf17e007 Merge pull request #985 from vmware/dev
merge 0.4.5 to master
2016-10-31 17:23:39 +08:00
Haining Henry Zhang
35217b251c Merge pull request #981 from hainingzhang/dev
Test cases.
2016-10-31 14:47:02 +08:00
Haining Henry Zhang
78c1273161 Merge pull request #984 from ywk253100/161031_ova
Add self_registration attr in importing OVA
2016-10-31 14:46:23 +08:00
Wenkai Yin
52edcd8f23 1.add self_registration attr 2.update docs 2016-10-31 13:46:00 +08:00
Daniel Jiang
171b17b202 Merge pull request #971 from ywk253100/161028_fix_961
User can not be deleted in LDAP authentication mode.
2016-10-31 12:39:24 +08:00
Henry Zhang
8818f89a02 usecases 2016-10-31 12:13:13 +08:00
Henry Zhang
427a872769 Merge remote-tracking branch 'hupstream/dev' into dev 2016-10-31 12:11:41 +08:00
Wenkai Yin
8fe0a333a8 user can not be deleted in LDAP authentication mode 2016-10-31 10:53:11 +08:00
Wenkai Yin
0506a950cc Merge pull request #983 from yhua123/dev
fix some typo in Makefile
2016-10-31 10:49:14 +08:00
yhua
8c42d0a75d fix some typo 2016-10-31 10:20:06 +08:00
Daniel Jiang
a05a9c1afd Merge pull request #982 from reasonerjt/dev
recognize vic in notification handler
2016-10-31 10:09:53 +08:00
Haining Henry Zhang
7a66c2cf6e Merge pull request #917 from ywk253100/161021_ova_md
OVA installation guide
2016-10-31 00:17:26 +08:00
Henry Zhang
c04bf5a499 usecases 2016-10-31 00:04:31 +08:00
Daniel Jiang
5df12e2161 Merge pull request #958 from yhua123/dev
change prepare from build to install
2016-10-30 20:03:40 +08:00
Tan Jiang
0b86da91e9 recognize vic in notification handler 2016-10-30 19:58:27 +08:00
yhua123
3eaee03906 Update Makefile
fix #975 and #979
2016-10-29 22:26:21 +08:00
yhua123
43b10fb404 Merge pull request #972 from wemeya/role
modify user_test.go
2016-10-29 22:08:54 +08:00
yhua123
66c71d5074 Update README.md 2016-10-29 00:38:29 +08:00
yhua123
c18ca59f3e Update README.md 2016-10-29 00:37:34 +08:00
Daniel Jiang
93a8e47987 Merge pull request #980 from reasonerjt/dev
update cipher suite on nginx setting.
2016-10-28 22:52:37 +08:00
Tan Jiang
7f55520b27 Merge remote-tracking branch 'upstream/dev' into dev 2016-10-28 22:44:59 +08:00
Tan Jiang
b75844e622 update ciphers for nginx 2016-10-28 18:48:12 +08:00
kun wang
7a14e69ea0 Merge pull request #974 from wknet123/dev-admin-options
Updates for issues about account settings.
2016-10-28 04:55:55 -05:00
kunw
1d18f5d154 Updates for controller tests. 2016-10-28 17:30:00 +08:00
kunw
8c9435324d Updates for controller tests. 2016-10-28 17:14:09 +08:00
Daniel Jiang
c732b624e9 Merge pull request #970 from zgdxiaoxiao/api-test3
add test case of search api
2016-10-28 16:56:33 +08:00
kunw
08b4851fc8 Updates for controller test cases. 2016-10-28 16:50:40 +08:00
kunw
54696b1112 Updates for redirections when user is not an admin. 2016-10-28 16:12:51 +08:00
wemeya
23487bebba modify user_test.go 2016-10-28 15:31:54 +08:00
Wenkai Yin
5cf381fc43 Merge pull request #969 from wemeya/role
modify log_test.go
2016-10-28 15:05:12 +08:00
kunw
26b1df4bdb Merge branch 'dev' into dev-admin-options 2016-10-28 14:57:00 +08:00
Daniel Jiang
ce40b26ff2 Merge pull request #949 from wknet123/dev
Updates for link of logs on dashboard.
2016-10-28 14:41:36 +08:00
zgdxiaoxiao
9252dbe7a0 add test case of search api 2016-10-28 14:30:19 +08:00
kunw
5cefe5c91f Updates for handling errors of UI. 2016-10-28 14:07:33 +08:00
kunw
509c68a781 Updates for issues of account settings in LDAP. 2016-10-28 13:53:47 +08:00
wemeya
9d3d7e6502 modify log_test.go 2016-10-28 13:44:30 +08:00
Daniel Jiang
3bb594aad6 Merge pull request #945 from ywk253100/161025_ova
OVA installation scripts
2016-10-28 13:00:39 +08:00
Daniel Jiang
098643303f Merge pull request #952 from ywk253100/161026_log_rotate
Log rotate
2016-10-28 12:59:54 +08:00
Daniel Jiang
76abe30d4d Merge pull request #955 from ywk253100/161027_fix_895
Fix #895
2016-10-28 12:45:49 +08:00
Daniel Jiang
5a01a41121 Merge pull request #956 from ywk253100/161027_fix_883
Fix #883
2016-10-28 12:45:18 +08:00
Daniel Jiang
ee9f09bd17 Merge pull request #957 from ywk253100/161027_fix_826
Fix #826
2016-10-28 12:44:48 +08:00
Daniel Jiang
45b32934fc Merge pull request #967 from ywk253100/161028_fix_964
Fix #964
2016-10-28 12:44:34 +08:00