summaryrefslogtreecommitdiff
path: root/src/node
AgeCommit message (Expand)Author
2015-11-03Create hook exportHtmlAdditionalTagsWithDataLuiza Pagliari
2015-10-28Fix for #2809Bradley Arvin
2015-10-22Merge pull request #2798 from ypid/fixed_get_git_hashJohn McLear
2015-10-22Merge pull request #2805 from storytouch/indentationSettingJohn McLear
2015-10-22Merge pull request #2813 from simong/export-libreofficeJohn McLear
2015-10-22Use `Etherpad` rather than `Etherpad Lite` when exporting HTMLSimon Gaeremynck
2015-10-20Allow LibreOffice to be used when exporting a padSimon Gaeremynck
2015-10-19Add an appendText APITed Mielczarek
2015-10-17Merge pull request #2762 from storytouch/exportTagsAsArraysStefan
2015-10-13Create setting to control if a new line will be indented or notLuiza Pagliari
2015-10-10Merge pull request #2730 from emilyxxie/clientready_hookStefan
2015-10-10Merge pull request #2799 from Gared/fix_url_location_errorStefan
2015-10-09if granularity is negative, endNum is negative and loopwebzwo0i
2015-10-09check if ChangesetRequest granularity is a number (#2796)webzwo0i
2015-10-08Fix decode error if pad name contains special characters and is sanitizedStefan
2015-10-07Get git commit hash even if the repo only points to a bare repo.Robin Schneider
2015-09-30Fix off-by-one: The chatHead is in fact a valid message index.Andreas Fried
2015-09-17Fixing ed52626. It was closing the span with </span data-TAG=VALUE>, not </span>Luiza Pagliari
2015-09-07Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VA...Luiza Pagliari
2015-08-30Merge pull request #2757 from Gared/doc_append_chat_messageStefan
2015-08-24Accepting Arrays on 'exportHtmlAdditionalTags' to handle attributes stored as...Luiza Pagliari
2015-08-15Fix missing bracketStefan
2015-08-15Fix API call appendChatMessage to send new message to all connected clientsStefan
2015-08-03Fix link to etherpad-lite on GitHubThomas Russell Murphy
2015-07-20clientReady hook- pass entire message, updated docEmily Xie
2015-06-30Restore newline-adding to setText() if passed string does not end in '\n'.Xavid
2015-06-24Check for valid session in handleUserInfoUpdateClark Boylan
2015-06-21Add an 'author' entry to the context for the padCreate and padUpdate hooks.Xavid
2015-06-19Allow a pad to only end with a single newline, rather than requiring two.Xavid
2015-05-22Do not extend Array.prototypeStéphane Alnet
2015-05-22use removeItem instead of remove namespaceJohn McLear
2015-05-20more read only mode fixes andadd support for handleMessageSecurity hookJohn McLear
2015-05-19other bits required for read onlyJohn McLear
2015-05-19Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-05-19dont show editing buttons in R/O viewJohn McLear
2015-05-18Using log4js in TidyHtmlSimon Gaeremynck
2015-05-18Tidy HTML before trying to convert it with abiwordSimon Gaeremynck
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