summaryrefslogtreecommitdiff
path: root/src/node
AgeCommit message (Collapse)Author
2014-03-30Create a customizable timeslider toolbarMarcel Klehr
2014-03-26Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messagesJohn McLear
Fix crash with queued messages
2014-03-20Fix REQ_CS rev boundary checkMarcel Klehr
fixes #2096
2014-03-17quick formatting clean upJohn McLear
2014-03-16Refactor toolbar.js to use consistent namingMarcel Klehr
2014-03-16Merge branch 'pr/1579' into toolbar-testMarcel Klehr
Conflicts: settings.json.template src/static/js/pad_editbar.js
2014-03-14Sometimes, the author2session / group2session don't exist anymore, but the ↵goldquest
session does. It should be possible to delete a session, if they don't exist
2014-02-20remember user session because it can be gone when finalHandler is calledwebzwo0i
2014-02-20fix crash if disconnect happens for sessions that have messages queuedwebzwo0i
2014-02-19Addressed a potential never finishing forEach in PadMessageHandler.padUsersSimon Gaeremynck
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-01-24fix randomstringwebzwo0i
2014-01-15convert over to server-side cryptoRobert Helmer
2014-01-15new randomString function should take len argRobert Helmer
2014-01-15mozilla bug 844796 - use node crypto module for randomStringRobert Helmer
2013-12-17Don't crash if CHANGESET_REQ failsMarcel Klehr
2013-12-17Fix server side bug index overflows1341
The server wasn't properly checking that the changesets it needed to return for changeset_requests actually existed.
2013-12-16Merge pull request #1514 from ether/dont-die-on-bad-htmlJohn McLear
dont die on bad html but only warn to api logger but dont tell client th...
2013-12-14Add input validation for html param in setHTML()Lennart Brinkmann
2013-12-10Merge branch 'fix-exporthtml-styling-tags' of ↵John McLear
https://github.com/webzwo0i/etherpad-lite into develop
2013-12-09resolve merge conflictJohn McLear
2013-12-09Merge pull request #2028 from webzwo0i/remove-deadcodeJohn McLear
Remove deadcode
2013-12-09Merge pull request #2030 from ether/import_hookJohn McLear
Working import hooks
2013-12-09Remove console logsJohn McLear
2013-12-08[virtual_lines] remove traces of virtual_lines/makeVirtualLineView. this ↵webzwo0i
code was used for FF2 key handling code and is long unused
2013-12-08do not send globalPadId in clientvars - its not used anywherewebzwo0i
2013-12-08[padDiff] remove unused functions a?lines_lengthwebzwo0i
2013-12-08fix loopwebzwo0i
2013-12-08remove unused requirewebzwo0i
2013-12-08function scope: variables only need to be declared oncewebzwo0i
2013-12-08remove now unused codewebzwo0i
2013-12-08refactor export of style attributeswebzwo0i
1. mark all attributes that are used 2. find the outermost attribute that is no longer used 3. close all tags upto this attribute 4. open all tags that are used and not open (5. close all open tags)
2013-12-08useless var statement (function scope)webzwo0i
2013-12-08workaround so that at least one tag stays open if its the outermost tag. ↵webzwo0i
saves some space in the output
2013-12-08be more clear about the value in propValswebzwo0i
2013-12-08some more docs for attribute export and cleanup empty lineswebzwo0i
2013-12-08add some documentation for styling attributes exportwebzwo0i
2013-12-08fix export so no tags are omittedwebzwo0i
2013-12-07fix closing of </title> tagwebzwo0i
2013-12-05Replace tabs indentation with spaces indentationLuc Didry
Some files are obviously external libraries, I didn't touch them
2013-11-28fooJohn McLear
2013-11-27not working and erally confusedJohn McLear
2013-11-26have the server parse the settings file using minify and strip commass1341
2013-11-24move copy/move pad into a new api versions1341
2013-11-18fix bugs, add force option to overwrite destinations1341
2013-11-17change parameter namess1341
2013-11-17add pad copy/move API functionss1341
2013-11-01Update padList correctlyMarcel Klehr
fixes #1971
2013-10-28Merge branch 'metrics' into developMarcel Klehr
Conflicts: src/node/handler/PadMessageHandler.js
2013-10-27stats: Add http500, memoryUsage, pendingEdits gaugesMarcel Klehr
and turn edits metric into a timer instead of a simple meter
2013-10-27Expose current stats at /statsMarcel Klehr