summaryrefslogtreecommitdiff
path: root/src/node
AgeCommit message (Expand)Author
2015-05-11Merge pull request #2657 from simong/cookie-parserJohn McLear
2015-05-07Use the cookie parser middlewareSimon Gaeremynck
2015-05-06Fix backend tests with new setText() implementation; tests dependedXavid
2015-05-05When using setText(), replace the entire existing text of the pad,Xavid
2015-04-29plugins always return html so use that endpointJohn McLear
2015-04-28show versions of plugins at startup, fixes #2642John McLear
2015-04-24fixes #2547John McLear
2015-04-22Adding support for providing intermediate CA certificates when running etherp...Andreas Åkre Solberg
2015-04-15revert to old path handling, but strip out "..". fixes #2614Tom Hunkapiller
2015-04-12dont allow directory traversal #2louis
2015-04-11Merge pull request #2604 from ether/pad-optionsJohn McLear
2015-04-11merge object settings into default settingsPeter 'Pita' Martischka
2015-04-11session key is now ignored and also padOptions are available in settingsJohn McLear
2015-04-11Merge pull request #2602 from devoidfury/fix/import-large-etherpadJohn McLear
2015-04-11Merge pull request #2601 from Gared/session_key_fileStefan
2015-04-11make setPadRaw async; streamline .etherpad file import handling chainTom Hunkapiller
2015-04-11Move sessionKey setting from settings.json to SESSIONKEY.txtStefan
2015-04-11Merge pull request #2600 from devoidfury/fix/junk-binary-filesJohn McLear
2015-04-11fix: only match /javascript/* for caching middlewareTom Hunkapiller
2015-04-11Merge pull request #2302 from Gared/create_pad_special_charactersJohn McLear
2015-04-11Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad...Stefan
2015-04-11use latest ejsJohn McLear
2015-04-11clearer comments about the path handling behaviorTom Hunkapiller
2015-04-11fix an issue in the path handling that allowed directory traversalTom Hunkapiller
2015-04-10clearer comments about the path handling behaviorTom Hunkapiller
2015-04-10fix an issue in the path handling that allowed directory traversalTom Hunkapiller
2015-04-11Merge pull request #2584 from devoidfury/express4John McLear
2015-04-11Log version number and git-sha on server startStefan
2015-04-10Add version number to plugins-info pageStefan
2015-04-10dont allow directory traversalJohn McLear
2015-04-10fix the rest of the deprecation warningsTom Hunkapiller
2015-04-10fix vulnerabilityTom Hunkapiller
2015-04-10fix minify route path; update deprecated callsTom Hunkapiller
2015-04-08update for express 4.xTom Hunkapiller
2015-04-07Merge pull request #2566 from ether/editbar-accessibilityJohn McLear
2015-04-06pass error messages to pad text if shown during startupJohn McLear
2015-04-05timeslider settings for fontsJohn McLear
2015-04-02Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessi...John McLear
2015-04-01reintroduce removed api points that were removed by mistakeJohn McLear
2015-04-01tests and fix up sloppy code by original authorJohn McLear
2015-04-01Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite in...John McLear
2015-04-01fix import issue with txt files and abiword #2572John McLear
2015-03-31Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessi...John McLear
2015-03-31Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-compo...John McLear
2015-03-31Merge pull request #2538 from webzwo0i/check-author-attributionJohn McLear
2015-03-31slightly different alt stuffJohn McLear
2015-03-31make buttons i18n friendly and a better experienceJohn McLear
2015-03-26more working logic and also pretty nice screen reader experienceJohn McLear
2015-03-26read for button activityJohn McLear
2015-03-25first semi working alt f9 functionalityJohn McLear