summaryrefslogtreecommitdiff
path: root/src/node
AgeCommit message (Expand)Author
2017-07-30Merge pull request #3231 from jainendra/fix-2864-import-pdfStefan
2017-07-28FIX-2864: Add useAbiword flagJainendra Mandavi
2017-07-12Merge pull request #3214 from patrickeasters/add_credentials_argLuiza Pagliari
2017-07-10fix typoMikoĊ‚aj Biel
2017-07-05Fetch credentials arg from CLIPatrick Easters
2017-05-18[feat] New server-side hook: padCopyLuiza Pagliari
2017-05-11[fix] Have one setting for each shortcut to create ordered listLuiza Pagliari
2017-05-11[fix] Fix shortcut enabling flag for 'ESC'Luiza Pagliari
2017-05-11Do not use cookie for pad shortcutsLuiza Pagliari
2017-05-11Merge pull request #2891 from bhldev/padShortcutDisableLuiza Pagliari
2017-04-04[feature] Create option to automatically reconnect after a few secondsLuiza Pagliari
2017-02-08Merge pull request #3136 from joassouza/fix_minifyLuiza Pagliari
2017-02-07Refactor codejoassouza
2017-02-07Fix minification of codejoassouza
2017-01-26Remove deprecated commentSjoerd Langkemper
2016-12-22Fixed crash on invalid export urlStefan
2016-12-20Merge pull request #2993 from ether/fixes-2945Stefan
2016-12-20Merge pull request #3053 from danfuzz/fix-timeslider-listsStefan
2016-12-20Merge branch 'develop' into improve_cookiesStefan
2016-09-20Added LibreJS supportNobody Really
2016-09-09Handle relative paths properly, when `@import`ing.Dan Bornstein
2016-09-09Handle `@import` during CSS minification.Dan Bornstein
2016-09-08Remove unused parameter `noDocType`.Dan Bornstein
2016-09-08Remove the `noDocType` argument, which was only ever passed as `false`.Dan Bornstein
2016-08-24Use an EEJS template for HTML export instead of inlining it in the JS code.Dan Bornstein
2016-07-10Make express-session cookie scheme dependentStefan
2016-06-20Fixed path checkStefan
2016-06-13Merge pull request #2991 from LokeshN/deactivate-settingsJohn McLear
2016-06-08Add secure flag to express-session cookiesStefan
2016-06-07Merge pull request #2957 from ether/dependency_updatesStefan
2016-05-28fixes #2945John McLear
2016-05-22Issue #2960 - deactivate settings.jsonLokeshN
2016-05-16Use fs.statSync instead of fs.existsSync (deprecated)Stefan
2016-04-26Update socket.io to version 1.4.5Stefan
2016-04-09include the padIdJohn McLear
2016-01-21Added pad shortcut disabling featureBrian Lim
2016-01-17Set language cookie on initial loadBrian Lim
2016-01-10Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-b...John McLear
2016-01-08hrm, removalJohn McLear
2016-01-08seems to workJohn McLear
2016-01-06Update DB.jsJohn McLear
2015-12-21include req and res in export convert hookJohn McLear
2015-12-18Use new exportAvailable() check to include check for SOffice along with Abiwo...Chris Birk
2015-12-17check for soffice before removing export pathsChris Birk
2015-12-02whoopsJohn McLear
2015-12-02working logicJohn McLear
2015-12-01Merge pull request #2831 from fcassin/developJohn McLear
2015-12-01 remove unused variableJohn McLear
2015-12-01Hook for export ocnvert controlJohn McLear
2015-11-26regex incoming colorsJohn McLear