John McLear
f4f032afc0
Merge pull request #3297 from apenwarr/auth-sequence
...
Call authentication hooks before default basic authentication.
2018-04-03 13:41:51 +01:00
John McLear
18dd90139a
Merge pull request #3115 from noerw/redirect_fix
...
redirect /admin properly (fix #3114 )
2018-04-03 13:10:36 +01:00
Man Yue Mo
a2992b3624
fix jsonp checking.
2018-02-07 08:43:07 +00:00
Stefan
b292e137ed
Added missing require for is-var-name
2018-02-03 12:33:33 +01:00
Robert Helmer
f56936c936
better sanitize jsonp
2018-01-30 12:52:19 -08:00
Avery Pennarun
e0582797f2
Call authentication hooks before default basic authentication.
...
This allows authenticators to do any extra session setup for a given user,
even if their username/password happens to match settings.json.
2017-12-31 12:32:50 +00:00
Rainer Rillke
f12debd5c7
Catch SIGTERM for graceful shutdown ( #3266 )
...
Shut down database connection and exit the node process
when SIGTERM is encountered. This is especially important
when nodejs is run as PID1, e.g. in a docker container.
Shutting down connections to clients (browsers) is beyond
this patche's scope.
Resolves #3265
2017-11-04 19:59:19 -02:00
Luiza Pagliari
cf686282ef
Do not use cookie for pad shortcuts
...
Users still cannot choose which shortcuts they want to enable/disable,
so it does not make sense (yet) to have a cookie with that preference.
This can be reverted once we create an UI to change shortcuts, but
PLEASE PLEASE PLEASE do not read the cookie every time handleKeyEvent is
called!!!
This is an adjustment to #2891 .
2017-05-11 12:26:14 -03:00
Luiza Pagliari
1ebcf0dc47
Merge pull request #2891 from bhldev/padShortcutDisable
...
Added pad shortcut disabling feature to settings.json
2017-05-11 11:29:25 -03:00
Sjoerd Langkemper
21a6e66e25
Remove deprecated comment
...
The session key is currently stored in SESSIONKEY.txt, so it is no longer reset
every time the server starts.
2017-01-26 09:59:09 +01:00
noerw
cc69e76200
redirect /admin properly ( fix #3114 )
2017-01-06 18:19:38 +01:00
Stefan
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
Nobody Really
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +02:00
Dan Bornstein
879ae7c67d
Remove the noDocType argument, which was only ever passed as false.
2016-09-08 09:41:23 -07:00
Stefan
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02:00
Stefan
6b9711cb70
Fixed path check
2016-06-20 00:22:29 +02:00
John McLear
b3b17c2190
Merge pull request #2991 from LokeshN/deactivate-settings
...
Issue #2960 - deactivate settings.json
2016-06-13 14:41:30 +08:00
Stefan
4ea9c4f98d
Add secure flag to express-session cookies
2016-06-08 21:15:26 +02:00
LokeshN
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
Stefan
835bca7967
Use fs.statSync instead of fs.existsSync (deprecated)
2016-05-16 16:51:12 +02:00
Brian Lim
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
Brian Lim
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
Chris Birk
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
Stefan
f6cebdad98
Fix decode error if pad name contains special characters and is sanitized
2015-10-08 20:46:15 +02:00
John McLear
818408cf49
other bits required for read only
2015-05-19 16:57:53 +01:00
Simon Gaeremynck
5a7750781b
Use the cookie parser middleware
2015-05-07 18:35:21 +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
Tom Hunkapiller
133188320a
fix: only match /javascript/* for caching middleware
2015-04-11 09:54:40 -05:00
Tom Hunkapiller
2e4374c08d
clearer comments about the path handling behavior
2015-04-10 20:19:26 -05:00
Tom Hunkapiller
3ebb19d8a2
fix an issue in the path handling that allowed directory traversal
2015-04-10 20:03:00 -05: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
Stefan
8e4c961207
Add version number to plugins-info page
2015-04-10 23:52:17 +02:00
Tom Hunkapiller
fd1d285a77
fix the rest of the deprecation warnings
2015-04-10 14:18:30 -05:00
Tom Hunkapiller
de67714cf8
fix minify route path; update deprecated calls
2015-04-10 05:52:58 -05:00
Tom Hunkapiller
d0b39c01fb
update for express 4.x
2015-04-08 23:12:11 -05:00
John McLear
c705a058fb
Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api
2015-04-01 13:32:07 +01:00
John McLear
ec6a2b5ba9
allow for load testing connections to hit by a setting
2015-02-16 23:02:19 +00:00
John McLear
ddc69831b2
working, need to test though
2015-02-11 17:59:05 +00:00
Mike DeRosa
4c6bd37286
Adding api call for appending a chat message.
2015-02-09 00:18:12 -05:00
John McLear
aca745ddf6
tell installer if old etherpad needs updating during plugin install
2015-01-25 02:44:10 +00:00
John McLear
689ced8443
and this one..
2015-01-18 20:15:17 +00:00
John McLear
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
webzwo0i
b0da214ad5
hack to avoid warnings in swagger usage
2014-12-30 18:06:41 +01:00
John McLear
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
John McLear
c4959b089f
resolve merge conflict
2014-12-29 01:54:44 +01:00
John McLear
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
webzwo0i
b204aa2085
remove more dead requires.
2014-12-16 19:10:01 +01:00
John McLear
cfa3f15f94
Merge pull request #2373 from webzwo0i/avoid-global-vairables
...
dont make local variables global
2014-12-16 00:41:41 +00:00
