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
Olivier Tétard
bfde869948
If exportFileName hook isn’t defined don’t return empty filename.
...
This commit should fix #2251 .
If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.
2014-09-28 14:53:07 +02: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
John McLear
44cb676ba2
Merge pull request #2150 from ether/export-file-name-hook
...
Server side hook to modify the export file name
2014-06-16 16:47:15 +01:00
Marcel Klehr
cd294c608b
Merge pull request #2149 from ether/dont-use-abiword-for-html
...
abiword shouldnt be used for HTML native documents
2014-06-11 14:47:33 +02:00
Stephan Jauernick
fc3ce3429e
Corrected the API Version number.
2014-06-01 21:21:08 +02:00
Stephan Jauernick
493636ec36
Added a new API method getPadID for reversing the Readonly ID and introduced the API level 1.4.1. Based on: 97402f60b8
2014-05-31 00:39:36 +02:00
Marcel Klehr
19be8763c9
Fix race condition
2014-05-15 12:47:28 +00:00
John McLear
c63cb812e8
Update ExportHandler.js
2014-05-15 10:53:37 +01:00
John McLear
a82823ede2
use full string not first char
2014-05-12 15:15:10 +01:00
John McLear
d09e66e271
use call first and update docs
2014-05-12 15:08:32 +01:00
John McLear
b74c43889e
Update ImportHandler.js
2014-05-09 13:50:00 +01:00
John McLear
ec6dc4fa0e
make async, please check
2014-05-07 16:27:41 +01:00
John McLear
69ba3cc104
remove eplite add etherpad
2014-05-07 15:17:14 +01:00
John McLear
1f7fcd54f1
working logic for allowing a server side hook to modify the export file name but NOT the extension
2014-05-06 21:13:22 +01:00
John McLear
6d38b05623
abiword shouldnt be used for HTML native documents
2014-05-06 17:32:45 +01: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
fa681d43f7
remember user session because it can be gone when finalHandler is called
2014-02-20 17:38:25 +01:00
webzwo0i
c8c2866087
fix crash if disconnect happens for sessions that have messages queued
2014-02-20 16:33:42 +01:00
Simon Gaeremynck
cfdd57b487
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
...
If the session info for a client would be null or undefined, the forEach
callback would never get called which means the padUsers callback would
never get trigged. This could potentially block API request as this function
is exposed at an HTTP API endpoint.
2014-02-19 10:48:15 +00:00
Robert Helmer
348d9a838f
convert over to server-side crypto
2014-01-15 11:44:57 -08:00
Marcel Klehr
adf05576b2
Don't crash if CHANGESET_REQ fails
2013-12-17 16:20:57 +01:00
s1341
5add63165d
Fix server side bug index overflow
...
The server wasn't properly checking that the changesets it needed to
return for changeset_requests actually existed.
2013-12-17 15:37:35 +02:00
John McLear
24e96c4f8b
Merge pull request #2028 from webzwo0i/remove-deadcode
...
Remove deadcode
2013-12-09 10:49:57 -08:00
John McLear
438f3fc717
Merge pull request #2030 from ether/import_hook
...
Working import hooks
2013-12-09 10:22:40 -08:00
John McLear
3180b96213
Remove console logs
2013-12-09 18:13:07 +00:00
webzwo0i
aadcfbb3d1
do not send globalPadId in clientvars - its not used anywhere
2013-12-08 17:29:41 +01:00
webzwo0i
01c71085e4
fix closing of </title> tag
2013-12-07 00:18:36 +01:00
Luc Didry
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
John McLear
271dd663bf
foo
2013-11-28 17:22:34 +00:00
John McLear
6fcc7c77f9
not working and erally confused
2013-11-27 00:23:11 +00:00
s1341
45e0680484
move copy/move pad into a new api version
2013-11-24 22:34:56 +02:00
s1341
52a99eb9e5
fix bugs, add force option to overwrite destination
2013-11-18 08:25:46 +02:00
s1341
93fcab0461
change parameter names
2013-11-17 21:01:02 +02:00
s1341
29d8bb7716
add pad copy/move API functions
2013-11-17 17:02:44 +00:00
Marcel Klehr
7b84e7308b
Merge branch 'metrics' into develop
...
Conflicts:
src/node/handler/PadMessageHandler.js
2013-10-28 12:11:25 +01:00
Marcel Klehr
3ad4b1b837
stats: Add http500, memoryUsage, pendingEdits gauges
...
and turn edits metric into a timer instead of a simple meter
2013-10-27 21:43:32 +01:00
Marcel Klehr
940f114a84
Record metrics with 'measured'
2013-10-27 17:42:55 +01:00
Kenan Sulayman
7ab65d7112
Refactors APIHandler:callAPI
...
Refactors and optimizes the APIHandler->callAPI.
2013-10-25 12:14:22 +02:00
Grant Woodford
fbe4e43c3d
Privacy: Add an option to disable IP logging
2013-10-19 21:37:11 +02:00
vileda
77c2313025
pass correct padID to checkAccess if pad is requested via readOnly link
2013-10-13 22:31:41 +02:00
Marcel Klehr
aa77a615da
Drop messages from unknown connections
...
fixes #1908
2013-10-12 18:51:04 +02:00
Marcel Klehr
7f10b9a42f
Add explanations for more disconnect scenarios
2013-10-10 21:11:15 +02:00
Marcel Klehr
d4c99d40b8
Never keep processing a changeset if it's corrupted
2013-10-10 18:19:25 +02:00
Marcel Klehr
6689a3c02e
Catch errors during preparation of client vars
...
... and disconnect the user
2013-10-10 16:38:41 +02:00
Marcel Klehr
de73de38b1
Filter author attribs in client_vars.historicalAuthorData
2013-10-07 18:58:20 +02:00
Marcel Klehr
9fac515885
Revert "do not pass historical author data to read only users"
...
This reverts commit b32aaaeb1b
2013-10-07 18:54:57 +02:00
John McLear
d7088031fa
remove white space
2013-10-06 15:16:32 +01:00
