summaryrefslogtreecommitdiff
path: root/src/node
AgeCommit message (Expand)Author
2015-03-02print revision numbers - not changesets - in warn-logwebzwo0i
2015-03-02callback with argument error in async.series insteadwebzwo0i
2015-02-26do not crash when encountering mismatched compositions. log the changesets an...webzwo0i
2015-02-26Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-02-22Merge pull request #2520 from ether/load-testing-settingsJohn McLear
2015-02-21fix export of bad pads and also limit import to filesJohn McLear
2015-02-16allow for load testing connections to hit by a settingJohn McLear
2015-02-16add try-catch clause around calls to applyToATextwebzwo0i
2015-02-16Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of"webzwo0i
2015-02-1551c14d994756e60333b0b60eccb7255cf0c86461 changed the return value ofwebzwo0i
2015-02-11working, need to test thoughJohn McLear
2015-02-04use latest cleanCSSJohn McLear
2015-01-25Revert 'asyncLineHTMLForExport' hookStefan
2015-01-25tell installer if old etherpad needs updating during plugin installJohn McLear
2015-01-25Merge pull request #2487 from ether/html-e-hookJohn McLear
2015-01-24boopJohn McLear
2015-01-24Stop processing a message without auth (i.e. a client did not sendwebzwo0i
2015-01-24working, might need polish its pretty lateJohn McLear
2015-01-24realization how aCallAll worksJohn McLear
2015-01-24beginning of a hook, needs docs etcJohn McLear
2015-01-21include lineContent in hokJohn McLear
2015-01-21better logic for author handlingJohn McLear
2015-01-21restrict expor4t to only expose this pad IDJohn McLear
2015-01-19more fixingJohn McLear
2015-01-19more handlingJohn McLear
2015-01-19bumpageJohn McLear
2015-01-18more export logic handlingJohn McLear
2015-01-18whoops proper regexp fix for listNumberJohn McLear
2015-01-18reset all numbers on first itemJohn McLear
2015-01-18support deeper nested elements on exportsJohn McLear
2015-01-18and this one..John McLear
2015-01-11refix pluginsJohn McLear
2015-01-11Support ejs 2.0Timothy Gu
2015-01-06final html export hookJohn McLear
2015-01-04check file system that abiword existsJohn McLear
2014-12-31Merge pull request #2418 from ether/etherpad-export-and-importJohn McLear
2014-12-31Merge pull request #2421 from webzwo0i/fix-swaggerJohn McLear
2014-12-31export html more stylesJohn McLear
2014-12-30hack to avoid warnings in swagger usagewebzwo0i
2014-12-30Merge pull request #2406 from Gared/fix/author-not-set-callbackStefan
2014-12-30more stylingJohn McLear
2014-12-30Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2014-12-30some demo export loic for handling OL incrementationJohn McLear
2014-12-30Merge pull request #2417 from webzwo0i/fix-exportJohn McLear
2014-12-30no errors on chrome clientJohn McLear
2014-12-30better take some responsibilityJohn McLear
2014-12-30licensingJohn McLear
2014-12-30remove console logJohn McLear
2014-12-30working author importJohn McLear
2014-12-29remove error loggingJohn McLear