John McLear
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
John McLear
a3f6b2edb7
more fixes
2014-11-23 22:33:56 +00:00
John McLear
555d22245d
Merge pull request #2335 from ether/javascript-bower
...
swap out jquery browser for bower but expose browser object to all pages...
2014-11-23 14:15:41 +00:00
John McLear
9b66c93d6b
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
2014-11-22 19:11:35 +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
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
John McLear
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
Cristo
0253156dbb
Update APIHandler.js
2014-11-12 19:55:37 +01:00
Cristo
46bc328896
new api ver
2014-11-08 01:41:23 +01: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
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
17f26b8c2c
Support to allow for a setting so you can stop unknown file types from being imported
2014-07-22 15:46:31 +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
