Commit Graph

1912 Commits

Author SHA1 Message Date
Tan Jiang
bd2517f002 Merge branch 'master' into dev 2016-11-04 17:49:19 +08:00
Daniel Jiang
ddd03c55d3 Merge pull request #976 from wknet123/dev-show-totals
Updates for displaying pagination total number.
2016-11-04 15:30:33 +08:00
Daniel Jiang
f9b84e4a7c Merge pull request #993 from wknet123/dev-language-cookies
Fixes issues about setting cookies in multi-language
2016-11-04 14:51:39 +08:00
Haining Henry Zhang
4dd5593bd5 Merge pull request #1011 from hainingzhang/master
fix typo in installation ova
2016-11-03 21:45:33 +08:00
Henry Zhang
a011c84e19 install ova 2016-11-03 17:44:14 +08:00
Wenkai Yin
ed472a4b78 Merge pull request #1007 from ywk253100/161102_nginx_upgrade
Update nginx in Makefile
2016-11-03 15:07:36 +08:00
Wenkai Yin
018b32a1b4 update nginx in Makefile 2016-11-03 14:48:50 +08:00
Haining Henry Zhang
592e596ae4 Merge pull request #1003 from hainingzhang/master
update docs
2016-11-03 11:17:26 +08:00
Henry Zhang
2eeeef0c0f README 2016-11-02 22:14:21 +08:00
Henry Zhang
1eea0b7336 ROADMAP 2016-11-02 21:48:47 +08:00
Henry Zhang
1343f694c8 AUTHORS 2016-11-02 21:44:48 +08:00
Henry Zhang
0dfcea120f update ROADMAP 2016-11-02 21:27:34 +08:00
Henry Zhang
dbc605e386 update change log 2016-11-02 21:27:04 +08:00
Henry Zhang
c18b276d07 installation guide for ova 2016-11-02 21:18:29 +08:00
Henry Zhang
a811a53d3a installation guide 2016-11-02 20:58:48 +08:00
Henry Zhang
b01edb9cfc test cases 2016-11-02 20:50:35 +08:00
kunw
0f553aa4e2 Updates for checking cookie status. 2016-11-02 18:30:08 +08:00
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
kunw
e6b5714f7d Undo changes for session.current-user.js file. 2016-11-02 12:26:24 +08:00
kunw
075c9e378d Change template file for multi-language settings. 2016-11-02 12:03:05 +08:00
kunw
8a7f80a2a7 Merge remote-tracking branch 'upstream/dev' into dev-language-cookies 2016-11-02 11:51:04 +08:00
kunw
4a81f7796b Fixes issues about setting cookies in multi-language. 2016-11-02 11:48:43 +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