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
John McLear
b32aaaeb1b
do not pass historical author data to read only users
2013-10-06 15:15:43 +01:00
Marcel Klehr
7b17bd58ae
Merge branch 'pr/1756' into develop
...
Conflicts:
src/node/handler/SocketIORouter.js
2013-09-29 16:45:12 +02:00
John McLear
f59df2bb80
Merge pull request #1902 from ether/fix/handle-message-continuation
...
Don't stop processing changesets if there is an error
2013-09-28 23:38:26 -07:00
John McLear
c615ccf514
dont crash on importing blank html
2013-09-27 14:47:34 +01:00
Marcel Klehr
7f7d506ff3
Don't stop processing changesets if there is an error
...
fixes #1895
2013-09-23 16:38:55 +02:00
John McLear
4bea3a348e
strip title out of html during import, pesky abiword behavior
2013-09-21 23:29:32 +01:00
Gared
b336e38637
Add check if uploaded file only contains ascii chars when abiword disabled
2013-09-10 21:58:28 +02:00
tonoman3g
e60591a4d5
fix padUsers http api call in PadMessageHandler.js.
...
Add callback() function call to iterator function.
2013-09-09 21:24:41 +07:00
Marcel Klehr
40f578cfbd
Merge pull request #1816 from bit/sessioninfos
...
export sessioninfos
2013-07-23 05:14:45 -07:00
j
a62593e9a0
export sessioninfos so plugins can access it
...
allows plugins to map client.id to author id
2013-06-17 16:54:02 +02:00
Marcel Klehr
2c855de6f6
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-27 23:04:42 +02:00
Spruce (Felix Fichte)
fb0bc31056
updated to use settings
...
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
2013-04-24 12:19:41 +02:00
spruce
6ea5efbcc3
Update SocketIORouter.js
...
Changed the setting of client.remoteAddress
2013-04-22 23:01:41 +03:00
John McLear
bf4c86ed94
better message for admins
2013-04-17 23:48:11 +01:00
John McLear
63b00b9010
Merge branch 'feature/add-cs-queue' of github.com:ether/etherpad-lite into dont-crash-noauth
2013-04-17 20:04:25 +01:00
John McLear
3b8621c6a0
dont crash on no auth, ust a bandaid
2013-04-17 19:50:05 +01:00
Marcel Klehr
cd288c70cb
Don't block changeset queue with delivering changeset
2013-04-17 14:26:11 +02:00
Marcel Klehr
1c8b7a3661
Add a server-side changeset queue per pad
...
fixes #1573
2013-04-17 14:25:23 +02:00
Marcel Klehr
76e50e2c4d
Refactor SocketIORouter
2013-04-15 20:29:06 +02:00
John McLear
4a5e63f105
Merge pull request #1693 from guyzmo/api_extension
...
extension of the API (versioned 1.2.8)
2013-04-09 14:49:11 -07:00
goldquest
cbf0535f97
browser detection was dropped in jquery 1.9, so we have to add the browser detection js file
2013-04-05 15:35:03 +02:00
Bernard `Guyzmo` Pratz
3df3b90bd9
fixed missing API functions declaration in API ; fixed a typo in APIHandler.
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-04 19:06:51 +02:00
mluto
c5b4e4934d
Kick the user if has already successfully authenticated but his session became invalid later
2013-04-03 11:19:26 +02:00
John McLear
5855e3d5bf
weird styling
2013-04-02 23:17:25 +01:00
John McLear
57a9ccbb88
whoops, comments hurt
2013-04-02 23:16:28 +01:00
John McLear
9e523191ea
whoops padid should be in payload..
2013-04-02 23:15:16 +01:00
Guyzmo
8f1348b40b
Added getAttributePool, getRevisionOfHead and getRevisionChangeset methods to API v1.2.8
...
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
2013-04-01 17:19:48 +02:00
John McLear
2abb993e8b
Merge pull request #1607 from ether/custom-obj-msg
...
Custom Object messages
2013-03-27 11:50:56 -07:00
Marcel Klehr
c30697cb07
Don't break the whole server if an import failed because no files were uploaded
...
Fixes #1611
2013-03-19 18:40:39 +01:00
John McLear
a9bd081a44
more clean up
2013-03-19 16:55:42 +00:00
John McLear
9bb0587447
working and jsonify obj
2013-03-19 16:40:51 +00:00
John McLear
2916b39c24
make sure the sessionID target is right
2013-03-19 16:21:04 +00:00
John McLear
d0e656d0a6
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-19 13:59:07 +00:00
John McLear
13ad46aa67
a safer approach I think but still be careful
2013-03-16 13:19:12 +00:00
Marcel Klehr
de552df6db
Fix clearing authorship colors which was broken by #1609
...
Fixes #1620
2013-03-15 18:08:51 +01:00
John McLear
ac9b972358
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-14 12:01:09 -03:00
Marcel Klehr
c30b0b72b8
Validate all 'author' attribs of incoming changesets to be the same value as the current user's authorId
2013-03-13 22:23:35 +01:00
