Commit Graph

1938 Commits

Author SHA1 Message Date
kun wang
126b7fae55 Merge pull request #1023 from fillet54/add-mail-identity-config
Make mail identity configurable
2016-11-09 14:35:09 +08:00
yhua123
5bd3f33395 Merge pull request #1033 from reasonerjt/update-migration-doc
update db migration guide to use image on docker hub
2016-11-08 18:02:25 +08:00
Daniel Jiang
8e0d1748a2 Merge pull request #1030 from ywk253100/161104_ova
OVA
2016-11-08 16:52:59 +08:00
Daniel Jiang
03102b5e2d Merge pull request #1037 from yhua123/dev
update Makefile for local create compile_ golangimage and fix some issue
2016-11-08 16:50:30 +08:00
Daniel Jiang
f715ec8ed3 Merge pull request #1031 from wknet123/dev-refine-messages
Updates for refining some i18n messages.
2016-11-08 14:39:00 +08:00
yhua
9c91fdc18e update Makefile for local create compile_ golangimage and fix some issue 2016-11-08 14:23:41 +08:00
Tan Jiang
da3862aa1f update db migration guide to use image on docker hub 2016-11-07 20:13:20 +08:00
kunw
d166b8117b Updates for refining some i18n messages. 2016-11-07 18:21:31 +08:00
Wenkai Yin
80da0ffea8 1.Add script to collect logs and configurations 2.Add OVA option to enable/disable root login 2016-11-07 17:40:41 +08:00
yhua123
ddc9e4538b Merge pull request #999 from wknet123/dev-ux-refinements
Updates for refinements of UX.
2016-11-07 15:31:05 +08:00
Daniel Jiang
333c616285 Merge pull request #1024 from reasonerjt/migration_rework
migration-tool rework
2016-11-07 13:12:54 +08:00
Tan Jiang
c26279d3b9 remove useless log 2016-11-07 11:51:19 +08:00
Daniel Jiang
eb44e889c3 Merge pull request #1008 from yhua123/dev
Dev
2016-11-07 11:33:21 +08:00
Daniel Jiang
5a0c203557 Merge pull request #1017 from reasonerjt/dev
set secure flag for cookie
2016-11-07 11:01:40 +08:00
Phillip Gomez
0dfce1d837 Make mail identity configurable
The identity field parameter passed to smtp.SendMail is now
configurable instead of being hardcoded to 'Mail Config'.

This fixes issue #900
2016-11-06 18:05:46 -08:00
Tan Jiang
b92b1036bf set secure flag for cookie 2016-11-05 00:08:37 +08:00
yhua
fa9df7c75f resolve conflict(2) 2016-11-04 18:32:33 +08:00
yhua
84f4a69f26 reslove confilc(1) 2016-11-04 18:17:33 +08:00
yhua
bb8e8eb148 reslove confilc 2016-11-04 18:13:03 +08:00
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
yhua
158550a02a change some describe in docs/compile_guide.md and fix one makefile issue 2016-11-04 15:25:06 +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
yhua
102bb888be update docs/compile_guide.md 2016-11-03 17:50:40 +08:00
Henry Zhang
a011c84e19 install ova 2016-11-03 17:44:14 +08:00
yhua
0bcd770a03 delete delete unused lines 2016-11-03 16:50:37 +08:00
yhua
07b9e5e326 modify the directory of dev docker-compose.yml 2016-11-03 15:21:58 +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
kunw
10f69d5250 Updates for refinements of UX. 2016-11-02 18:01:07 +08:00
yhua
88b122a777 add document for make process and build local golang image into Makefile 2016-11-02 17:29:12 +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