15 commits

Author	SHA1	Message	Date
webzwo0i	5d15f655f0	dont make local variables global	2014-12-14 22:01:28 +01:00
John McLear	c627608ea5	Merge pull request #1619 from ether/stricter-transport ... Enable HSTS on TLS connections	2014-06-17 12:58:47 +01:00
Marcel Klehr	897f5189b0	Enable HSTS for TLS connections ... Don't use X-Frame-Options: deny for now	2014-06-17 13:21:38 +02:00
Marcel Klehr	7b17bd58ae	Merge branch 'pr/1756' into develop ... Conflicts: src/node/handler/SocketIORouter.js	2013-09-29 16:45:12 +02:00
Eric Schrijver	b34224559d	‘Etherpad Lite’ -> ‘Etherpad’	2013-09-29 13:57:37 +02:00
Spruce (Felix Fichte)	fb0bc31056	updated to use settings ... updated handler/SocketIORouter.js to use new setting updated hooks/express.js to use new setting updated utils/Settings.js to accept new setting updated settings.json.template so new setting is present	2013-04-24 12:19:41 +02:00
John McLear	ffe7e65db6	allow strict transport if ssl is on and stop x-frame-options, this might break embedded pads, please test	2013-03-14 19:03:20 -03:00
John McLear	746396951d	Resolve #1301 startup pointing at old bitly URL	2012-12-26 00:17:43 +00:00
John McLear	8a9045b335	remove ssl not enabled message	2012-12-02 18:33:31 +00:00
Wikinaut	eed6b752d4	initial https version fix #1148	2012-11-22 10:12:58 +01:00
Hyacinthe Cartiaux	d6027726e6	Fix urls, use github.com/ether ... Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>	2012-11-22 01:12:30 +01:00
Marcel Klehr	4416210471	Differentiate between http server and express app	2012-09-21 17:12:22 +02:00
johnyma22	c8b6d3b4f3	attempt to put correct init in right place but could be wrong	2012-09-12 19:38:53 +01:00
Marcel Klehr	af3c57a120	Load npm to enable server to see the git revision.	2012-07-08 11:37:24 +02:00
Egil Moeller	b438a278a1	Make the server restart on plugin install	2012-07-03 23:31:44 +02:00