Commit Graph

24 Commits

Author SHA1 Message Date
Les De Ridder ac3869bce5 Change name in more places 2018-08-01 05:49:09 +02:00
Les De Ridder 9a8a09354a Update name and repo 2018-07-31 22:52:51 +02:00
John McLear bb40aa00be
Update express.js 2018-04-03 10:59:10 +01:00
John McLear 254edffa9c fixes #2547 2015-04-24 14:17:49 +01:00
Andreas Åkre Solberg ec7b3fc787 Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs 2015-04-22 20:29:19 +02:00
John McLear 402e53d88e Merge pull request #2584 from devoidfury/express4
Express 4 support
2015-04-11 00:13:45 +01:00
Stefan db5bdc8719 Log version number and git-sha on server start 2015-04-11 00:13:04 +02:00
Tom Hunkapiller d0b39c01fb update for express 4.x 2015-04-08 23:12:11 -05:00
John McLear ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00
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