Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
Luiza Pagliari
5deb06d589
Create setting to control if a new line will be indented or not
...
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
2015-10-13 18:39:23 -03:00
Stefan
9d29b15def
Merge pull request #2730 from emilyxxie/clientready_hook
...
added clientReady hook
2015-10-10 13:30:36 +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
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
Emily Xie
21f0d12d31
clientReady hook- pass entire message, updated doc
2015-07-20 11:45:41 -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
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
John McLear
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +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
b404af7c17
Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition
...
do not crash when encountering mismatched compositions. log the changese...
2015-03-31 23:17:51 +01:00
webzwo0i
f249b42ab4
empty author should be allowed to support clearAuthorship functionality
2015-03-03 16:39:14 +01:00
webzwo0i
0693c0ae97
- operator do not show up in the attribs of a pad, but authors could still leak to the pool
2015-03-03 15:37:56 +01:00
webzwo0i
01cd82427a
check author in = operator
2015-03-03 15:20:33 +01:00
webzwo0i
0f82cd8711
print revision numbers - not changesets - in warn-log
2015-03-02 11:14:24 +01:00
webzwo0i
683c9dfb7c
callback with argument error in async.series instead
2015-03-02 11:05:33 +01:00
webzwo0i
7719117e1e
do not crash when encountering mismatched compositions. log the changesets and padid
2015-02-26 14:57:49 +01:00
webzwo0i
6b0cf29af6
Stop processing a message without auth (i.e. a client did not send
...
CLIENT_READY)
2015-01-24 06:34:41 +01:00
Stefan
c20a7e9bce
Merge pull request #2406 from Gared/fix/author-not-set-callback
...
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-30 14:55:49 +01:00
John McLear
3fe802077c
Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-twice
...
disconnect client if it submits an already accepted changeset based on a...
2014-12-29 02:01:03 +01:00
John McLear
8603fb4583
fix sockets of switch to pad
2014-12-29 00:46:47 +01:00
John McLear
6b1fee400d
Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest
2014-12-29 00:40:07 +01:00
Gared
9cf19b99fe
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-27 22:25:24 +01:00
John McLear
7df944b3fd
Merge pull request #2404 from webzwo0i/sanity-in-atext
...
block changeset if it deletes more lines than exist in the whole pad
2014-12-27 18:36:13 +01:00
Gared
40c7ee9df9
Prevent server crash if author is not set
2014-12-27 14:26:05 +01:00
webzwo0i
5306f0c98a
wrap appendRevision in try-catch block
2014-12-04 16:05:02 +01:00
John McLear
6fea3a25f8
stop death on no session
2014-11-30 21:21:58 +00:00
John McLear
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
John McLear
764b8af5e3
Merge pull request #2334 from luto/api-mystery-crash
...
fix api mystery crash
2014-11-22 15:50:23 +00:00
luto
4eee89ad12
fix api mystery crash
2014-11-22 16:46:37 +01:00
John McLear
703440acd7
missing socketio fix
2014-11-21 00:11:50 +00:00
John McLear
053ff3097d
whoops I missed this one
2014-11-04 23:29:45 +00:00
John McLear
9fa77cdea2
working handling of setting client ip and anonymizing etc
2014-11-04 23:25:18 +00:00
John McLear
f418dfa205
fix author notification handler
2014-11-04 22:37:10 +00:00
John McLear
af3e8e5e15
fix room client leave
2014-11-04 22:34:43 +00:00
John McLear
8391f902fb
re-apply roomsize
2014-11-04 22:31:09 +00:00
John McLear
a6cbb4af40
working messages
2014-11-04 19:58:38 +00:00
John McLear
68eaa09708
Begin to repair damage done to rooms logic
2014-11-04 19:55:05 +00:00
John McLear
adef0af227
more stuff required to stop it crashing, now we have identified what needs fixing we can fix it
2014-11-04 18:01:41 +00:00
John McLear
1e53c4f5f0
identify which parts are causing issues and comment them out, obviously this needs fixing
2014-11-04 17:57:18 +00:00
Simon Gaeremynck
2f8b860e69
Added a userLeave hook that gets called when a user leaves a pad
2014-08-08 15:49:15 +01:00
Mike DeRosa
25f6c9bf9a
Checking if the author for the sessions match instead of comparing the entire session.
2014-07-12 16:40:59 -04:00
Mike DeRosa
7861cae763
Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready).
...
Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.
2014-07-12 16:27:00 -04:00
Mike DeRosa
4ccd7131d3
Added function to switch to a different pad without having to reload the whole page.
2014-06-14 14:25:56 -04:00
John McLear
56fd078469
Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages
...
Fix crash with queued messages
2014-03-26 19:39:19 +00:00
Marcel Klehr
f6f319960d
Fix REQ_CS rev boundary check
...
fixes #2096
2014-03-20 21:34:01 +01:00
webzwo0i
8245e65d3f
disconnect client if it submits an already accepted changeset based on an old revision
2014-02-20 18:13:30 +01:00
webzwo0i
fa681d43f7
remember user session because it can be gone when finalHandler is called
2014-02-20 17:38:25 +01:00
