1271 Commits

Author	SHA1	Message	Date
kunw	55b98f9abd	Merge remote-tracking branch 'upstream/dev' into dev-volume-info	2016-11-09 14:53:26 +08:00
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
yhua	09b62157cf	modify prepare for genrate all common/config files from template	2016-11-08 17:40:19 +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
Wenkai Yin	018b32a1b4	update nginx in Makefile	2016-11-03 14:48:50 +08:00
Wenkai Yin	4fcfffeb47	upgrade nginx to 1.11.5	2016-11-02 15:49:28 +08:00
kunw	560b41b5e6	Merge remote-tracking branch 'upstream/dev' into dev-volume-info	2016-11-02 12:46:57 +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
Daniel Jiang	098643303f	Merge pull request #952 from ywk253100/161026_log_rotate ... Log rotate	2016-10-28 12:59:54 +08:00
Wenkai Yin	0689935da4	log rotate	2016-10-26 18:26:02 +08:00
yhua	a6e7a6ba45	fix baseimage issue	2016-10-26 13:46:22 +08:00
yhua	03e2a3ee56	remove tag in docker-compose.yml	2016-10-26 13:09:12 +08:00
kunw	811401f40e	Added volume info of UI.	2016-10-25 12:44:27 +08:00
yhua	271787dd94	update for fix #925	2016-10-24 16:51:42 +08:00
yhua	ebc852b7cc	fix #924 #925	2016-10-24 16:48:48 +08:00
yhua	1043ec063d	rm binary	2016-10-24 14:18:56 +08:00
yhua	69797c30f2	fix pushimage, update .gitignore, add DEVFLAG	2016-10-24 14:06:23 +08:00
yhua	311cf8da07	change code 20161019	2016-10-21 18:39:10 +08:00