summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-06-22bugfix for correct bash syntaxIstván Király
2015-06-22Merge pull request #2699 from xavidotron/developJohn McLear
2015-06-22Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-06-21Update documentation for the updatePad and createPad hooks to include 'author'Xavid
2015-06-21Add an 'author' entry to the context for the padCreate and padUpdate hooks.Xavid
2015-06-20Merge pull request #2696 from xavidotron/developJohn McLear
2015-06-19Allow a return keypress in a list on the last line of a pad to create a newXavid
2015-06-19Allow a pad to only end with a single newline, rather than requiring two.Xavid
2015-06-18Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-06-17Merge pull request #2695 from goldquest/dev_overallImportBugJohn McLear
2015-06-17if variable not declared, test if null throws errorgoldquest
2015-06-11Merge pull request #2690 from lpagliari/developJohn McLear
2015-06-10Add new icon to fontawesome subset: commentLuiza Pagliari
2015-06-08fix issues with redrawing focus back to input element would lose param select...John McLear
2015-06-08Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-06-03Merge pull request #2689 from luin/developJohn McLear
2015-06-03Change "Javascript" to "JavaScript"Zihua Li
2015-05-30Merge pull request #2684 from hinnerk/developJohn McLear
2015-05-30Use current mysql client APIHinnerk Haardt
2015-05-25Merge pull request #2681 from lpagliari/developJohn McLear
2015-05-25Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-05-25Allowing 'value' to be a localizable attribute on HTML elements.Luiza Pagliari
2015-05-22Merge pull request #2678 from shimaore/patch-2John McLear
2015-05-22Do not extend Array.prototypeStéphane Alnet
2015-05-22use removeItem instead of remove namespaceJohn McLear
2015-05-20hide chat if its already open on readonly modeJohn McLear
2015-05-20docs for handle message securityJohn McLear
2015-05-20more read only mode fixes andadd support for handleMessageSecurity hookJohn McLear
2015-05-19dont allow chat input or name input on read only padsJohn 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-18Merge pull request #2668 from simong/tidyJohn McLear
2015-05-18Added backend tests for TidyHtmlSimon Gaeremynck
2015-05-18Using log4js in TidyHtmlSimon Gaeremynck
2015-05-18Tidy HTML before trying to convert it with abiwordSimon Gaeremynck
2015-05-16Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-05-15Merge pull request #2665 from lpagliari/developJohn McLear
2015-05-15Fixing documentation of collectContentPreLuiza Pagliari
2015-05-11Merge pull request #2657 from simong/cookie-parserJohn McLear
2015-05-10always hide connected one second after connectedJohn McLear
2015-05-07Merge pull request #2656 from stefanmintert/20150507-innertext-bugfixJohn McLear
2015-05-07Use the cookie parser middlewareSimon Gaeremynck
2015-05-07Merge pull request #2621 from ether/fix-dead-keysJohn McLear
2015-05-07Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dea...John McLear
2015-05-07support for french stuffJohn McLear
2015-05-07Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blo...Stefan Mintert
2015-05-06Merge pull request #2649 from xavidotron/developJohn McLear
2015-05-06Fix backend tests with new setText() implementation; tests dependedXavid
2015-05-06Merge pull request #2650 from ether/iframe-issuesJohn McLear