Stefan
22bf9c9297
Merge pull request #2799 from Gared/fix_url_location_error
...
Fix decode error if pad name contains special characters and is sanitized
2015-10-10 13:21:40 +02:00
webzwo0i
1ee1f818db
if granularity is negative, endNum is negative and loop
2015-10-09 14:55:59 +02:00
webzwo0i
31f7c7e0f2
check if ChangesetRequest granularity is a number ( #2796 )
2015-10-09 14:55:19 +02:00
Stefan
f6cebdad98
Fix decode error if pad name contains special characters and is sanitized
2015-10-08 20:46:15 +02:00
Andreas Fried
e6b0e954b5
Fix off-by-one: The chatHead is in fact a valid message index.
...
This fixes #2751 .
2015-09-30 00:48:15 +02:00
Stefan
cc9f88e7ed
Merge pull request #2757 from Gared/doc_append_chat_message
...
Add appendChatMessage API to docs
2015-08-30 18:15:51 +02:00
Stefan
f27aacc5bf
Fix missing bracket
2015-08-15 22:41:59 +02:00
Stefan
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
Thomas Russell Murphy
b557927b72
Fix link to etherpad-lite on GitHub
2015-08-03 21:53:54 -05:00
Xavid
ad137fa4c8
Restore newline-adding to setText() if passed string does not end in '\n'.
...
Add a test for the ending-in-'\n' case and update tests for the other case.
2015-06-30 04:47:55 -04:00
Clark Boylan
1060595676
Check for valid session in handleUserInfoUpdate
...
Address issue 2674 by checking that the session is valid and has a valid
author and padId before using it to update the userInfo for that
session. Otherwise it is possible that by the time we try to update a
session with new userInfo that session has disconnected and is no longer
available to be updated. Without this commit the etherpad-lite service
gracefully shutsdown whenever this happens.
2015-06-24 15:18:35 -07:00
Xavid
a4fe0d0dc8
Add an 'author' entry to the context for the padCreate and padUpdate hooks.
2015-06-21 11:29:17 -04:00
Xavid
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
Stéphane Alnet
0b3216ecb6
Do not extend Array.prototype
2015-05-22 12:27:08 +02:00
John McLear
757ad765d3
use removeItem instead of remove namespace
2015-05-22 11:09:21 +01:00
John McLear
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
John McLear
818408cf49
other bits required for read only
2015-05-19 16:57:53 +01:00
John McLear
41d24a8c8f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-19 16:44:57 +01:00
John McLear
b662d5c618
dont show editing buttons in R/O view
2015-05-19 16:43:19 +01:00
Simon Gaeremynck
7fe99cccad
Using log4js in TidyHtml
2015-05-18 17:43:46 +01:00
Simon Gaeremynck
786b43efc8
Tidy HTML before trying to convert it with abiword
2015-05-18 16:24:41 +01:00
John McLear
9e9207d8b6
Merge pull request #2657 from simong/cookie-parser
...
Use the cookie parser middleware
2015-05-11 15:10:45 +01:00
Simon Gaeremynck
5a7750781b
Use the cookie parser middleware
2015-05-07 18:35:21 +01:00
Xavid
9e86fb279b
Fix backend tests with new setText() implementation; tests depended
...
on the old setText() behavior leaving the last character.
2015-05-06 08:45:22 -04:00
Xavid
5e64c292a4
When using setText(), replace the entire existing text of the pad,
...
rather than replacing all except the last letter.
2015-05-05 14:18:27 -04:00
John McLear
4938c7be38
plugins always return html so use that endpoint
2015-04-29 20:54:41 +01:00
John McLear
1f471b0f81
show versions of plugins at startup, fixes #2642
2015-04-28 23:41:55 +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
6ff7d4e9a6
revert to old path handling, but strip out "..". fixes #2614
2015-04-15 14:31:21 -05:00
louis
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
John McLear
e3f95d0c9c
Merge pull request #2604 from ether/pad-options
...
session key is now ignored and also padOptions are available in settings
2015-04-11 22:33:46 +01:00
Peter 'Pita' Martischka
fc0cac0cad
merge object settings into default settings
2015-04-11 22:01:46 +01:00
John McLear
8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
John McLear
4a70837de9
Merge pull request #2602 from devoidfury/fix/import-large-etherpad
...
fix large etherpad import, fixes #2524
2015-04-11 20:09:01 +01:00
Stefan
43687f6e8b
Merge pull request #2601 from Gared/session_key_file
...
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 19:10:18 +02:00
Tom Hunkapiller
a896d67e8c
make setPadRaw async; streamline .etherpad file import handling chain
2015-04-11 12:02:19 -05:00
Stefan
a3ed82ad06
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 18:45:14 +02:00
John McLear
25092fcb90
Merge pull request #2600 from devoidfury/fix/junk-binary-files
...
fix: only match /javascript/* for caching middleware
2015-04-11 16:00:02 +01:00
Tom Hunkapiller
133188320a
fix: only match /javascript/* for caching middleware
2015-04-11 09:54:40 -05:00
John McLear
5ef22e649b
Merge pull request #2302 from Gared/create_pad_special_characters
...
Add check for special url characters to createPad API function
2015-04-11 14:56:26 +01:00
Stefan
aa0d14c7d7
Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters
2015-04-11 12:10:37 +02:00
John McLear
acc1a0626a
use latest ejs
2015-04-11 09:53:27 +01:00
Tom Hunkapiller
0b0a349081
clearer comments about the path handling behavior
2015-04-11 09:05:51 +01:00
Tom Hunkapiller
5409eb314c
fix an issue in the path handling that allowed directory traversal
2015-04-11 09:05:32 +01: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
