John McLear
fb3e4a6232
only show clients on this pad resolves issue #1544
2013-02-20 16:10:27 +00:00
Marcel Klehr
4592397bd9
Merge pull request #1491 from ether/export-txt-with-indent
...
TXT Export Indentation on lists Edit
2013-02-18 12:13:06 -08:00
Mark Fisher
500f9b8b48
Fixed typo thats made server hang
2013-02-13 15:25:27 +00:00
Manuel Knitza
8c9ad6ee50
Update src/node/handler/APIHandler.js
2013-02-12 21:50:14 +01:00
Manuel Knitza
b1586684c8
Explicitly log creation of pad
2013-02-11 03:03:18 +01:00
John McLear
d16b15f3eb
begin support for better txt output
2013-02-10 17:34:34 +00:00
Marcel Klehr
6d2b1488d6
Reformat access log messages to improve readability
2013-02-10 16:14:48 +01:00
Marcel Klehr
ee89696c4d
Log the client ip on pad access with logger 'access'
...
also, don't log every message with log level info!
2013-02-10 16:03:49 +01:00
mluto
f2cd9e3adc
Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this.
2013-02-08 22:06:28 +01:00
mluto
e6454af5ed
Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP
2013-02-08 22:00:17 +01:00
mluto
0d5b98a338
Removed isProPad, since all pads are public except for group-pads
2013-02-07 14:30:09 +01:00
Dmitry
34f9f15150
socket.io rooms instead of own session management
...
Replaces homegrown pad session management with socket.io build-in rooms
2013-02-05 23:33:44 +04:00
John McLear
1814c756ad
Merge pull request #1431 from mluto/fix-userinfo-crash
...
Fix USERINFO_UPDATE crash
2013-01-30 06:43:37 -08:00
mluto
7e48e025c7
Check for missing payload on CLIENT_MESSAGE
2013-01-30 15:28:54 +01:00
mluto
f2742c5b63
Check for missing userInfo
2013-01-30 15:21:25 +01:00
John McLear
edd8b12049
push authorID to author object and return via api...
2013-01-29 16:45:09 +00:00
John McLear
51eff0d659
change to createDiffHTML
2013-01-28 16:53:29 +00:00
John McLear
3fac18f88a
resolve merge conflict
2013-01-27 17:54:26 +00:00
Peter 'Pita' Martischka
07a267be7a
Added colors to pad diff
2013-01-27 16:45:09 +00:00
Peter 'Pita' Martischka
f4690dda9d
fixed indent
2013-01-27 15:40:05 +00:00
mluto
cb2b93b133
Added getChatHistory and getChatHead (api+code+doc)
2013-01-26 14:35:26 +01:00
goldquest
74185e79ab
use the existing padimpexp object from the parent window
2013-01-23 16:36:37 +01:00
John McLear
205d983225
make it crash
2013-01-22 22:48:05 +00:00
John McLear
5d416579ee
bring in some padDiff stuff that doesnt suck
2013-01-22 22:33:51 +00:00
goldquest
666c0adcd2
script tag didn't link to right location
2013-01-22 16:42:56 +01:00
mluto
41cb5d8265
Added hook for clientVars and hook-doc
2013-01-14 22:51:26 +01:00
mluto
94f9b05c4c
Only create clientVars when they are needed
2013-01-14 22:08:33 +01:00
John McLear
654654b4e1
Merge pull request #1342 from spcsser/feature/padlisting
...
API & backend to list pads on epl instance
2013-01-14 08:13:57 -08:00
Swen
198754222d
Added functionality to list pads on this server.
2013-01-08 20:14:01 +01:00
mluto
bc05f9eb0a
converted load-more-link to button, added loading-gif, fixed typo
2013-01-07 19:15:55 +01:00
mluto
5592c4b0fe
client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages
2013-01-06 16:11:48 +01:00
mluto
9484b92ae2
fixed and unified indenting, added comments in handleClientReady
2013-01-06 14:55:33 +01:00
Marcel Klehr
ffc9bcf028
Bump API version for checkToken endpoint
2012-12-27 22:09:22 +01:00
John McLear
bf5283fa11
Fix issue #725 which was caused by a race condition
2012-12-10 11:34:53 +00:00
Stephan Jauernick
2163c8be5c
Update src/node/handler/APIHandler.js
...
Added the checkToken function to the function array.
2012-12-07 11:28:03 +01:00
goldquest
1380fda2b2
use the parent window, not the top
2012-12-06 17:51:43 +01:00
Iván Eixarch
bf04a4686a
avoid use of os.tmpDir() for node 0.6 compatibility
2012-12-06 11:49:04 +01:00
Iván Eixarch
97d77ea089
added my name in header
2012-11-27 00:11:45 +01:00
Iván Eixarch
cc60b82a6e
Import html by default and allow basic import/export features without abiword
2012-11-23 22:55:25 +01:00
Iván Eixarch
ef3231efd2
cleaning
2012-11-23 19:06:18 +01:00
Iván Eixarch
d0a17d5471
test import converting to html instead to txt by default
2012-11-23 18:18:03 +01:00
Marcel Klehr
e24ed46a08
PadMessageHandler: Make sure sessioninfos[session] still exists before pushing data to user.
2012-11-10 10:47:12 +01:00
John McLear
d7ec050f34
Merge pull request #1035 from amtep/develop
...
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11 08:27:27 -07:00
Dmitry
dbcdc2f956
fix for error handling in callback code
...
The callback code does not follow error handling guidelines, thus always
receiving NULL instead of results array.
2012-10-11 18:07:45 +04:00
Dmitry
0fa954c1a0
fixed variable name in handleMessageHook
...
the code would never work as expected with this type
2012-10-11 17:51:57 +04:00
Richard Braakman
85b44119ae
USERINFO_UPDATE: construct a new message for broadcast
...
The server was reusing the client's message when broadcasting userinfo
updates. This would allow a malicious client to insert arbitrary fields
into a message that the other clients would trust as coming from the
server. For example, adding "disconnect" or renaming other authors.
This commit fixes it by having the server construct a new message with
known fields before broadcasting.
2012-10-02 23:27:30 +03:00
Richard Braakman
2e72a1e489
Prevent server crash in handleClientReady
...
The client might have disconnected between callbacks so don't try to
write to the session before checking this. The main callback of this
function now has a single check at its top.
Removed a redundant check halfway through the callback.
Also normalized use of client.id for the session index instead of a mix of
client.id and sessionId.
Added some explanatory comments.
2012-09-28 23:23:00 +03:00
Richard Braakman
413ddb393e
Add some explanatory comments to handleUserChanges()
2012-09-28 22:49:20 +03:00
Richard Braakman
7aaef01346
Prettify session handling in handleUserChanges
...
Also add a comment to explain what's going on with thisSession.
No changes in behavior.
2012-09-27 23:07:00 +03:00
Richard Braakman
f1b4206cad
Fix crash when client submits changeset based on too-old revision
...
We had a problem with the server running out of stack space if a client
submitted a changeset based on a revision more than about 1000 revs old.
(944 was our cutoff but yours may vary). This happened in the wild with
about 30 people editing via flaky wifi. A disconnected client would try
to submit a fairly old changeset when reconnecting, and a few minutes
was enough for 30 people to generate that many revs.
The stack kept growing because pad.getRevisionChangeset was being answered
from the cache, so no I/O interrupted the callback chain. (This was seen with
mysql, I don't know about other backends.)
This patch forces a nextTick every 200 revisions to solve this problem.
2012-09-26 03:01:59 +03:00
