summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-08-08Fix typo in commentgen2
2015-08-07Merge pull request #2 from CodeMichael/patch-1CodeMichael
2015-08-07Merge pull request #1 from CodeMichael/patch-2CodeMichael
2015-08-07allow /admin to run on a sub-directoryCodeMichael
2015-08-07allow admin to run on a sub-directoryCodeMichael
2015-08-05Merge pull request #2745 from ether/masterStefan
2015-08-05Merge new release into master branch!Stefan
2015-08-05Release version 1.5.7 (changelog)Stefan
2015-08-05Merge new release into master branch!Stefan
2015-08-05Release version 1.5.7Stefan
2015-08-05Merge pull request #2744 from Gared/switchtopadBrokenStefan
2015-08-05Fix broken switchToPad methodStefan
2015-08-04Merge pull request #2741 from thomasrussellmurphy/issue-2727Stefan
2015-08-04Removing style that makes editor scroll to the top on iOS without any action ...Luiza Pagliari
2015-08-03Fix link to etherpad-lite on GitHubThomas Russell Murphy
2015-07-27Avoid space removal when pasting text from word processor.Olivier Tétard
2015-07-23Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-07-20clientReady hook- pass entire message, updated docEmily Xie
2015-07-17Merge pull request #2721 from lpagliari/developPeter 'Pita' Martischka
2015-07-14Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-07-11Add a aceSelectionChanged hook to allow plugins to react when the cursorXavid
2015-07-08Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-07-07Fix editbar height for read-only padsLuiza Pagliari
2015-07-07Adding missing code to make toolbar be fixed on top/bottom of the screen for ...Luiza Pagliari
2015-07-03Merge pull request #2718 from lpagliari/developJohn McLear
2015-07-03Fixing chat on bottom of the page for mobile devicesLuiza Pagliari
2015-07-02Fixing toolbar on top of the page for mobile devicesLuiza Pagliari
2015-07-01Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-07-01fix font testJohn McLear
2015-07-01Merge pull request #2714 from charakterziffer/patch-1Peter 'Pita' Martischka
2015-07-01Added Helvetica Neue to the Normal fontGerhard Großmann
2015-07-01Added CSS fallback fontsGerhard Großmann
2015-06-30Merge pull request #2712 from xavidotron/xavidJohn McLear
2015-06-30Restore newline-adding to setText() if passed string does not end in '\n'.Xavid
2015-06-29use settings for backend testsJohn McLear
2015-06-29Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-06-29remove console logsJohn McLear
2015-06-28Merge pull request #2711 from ether/aria-label-for-buttonJohn McLear
2015-06-28aria-labels for everythingJohn McLear
2015-06-25Merge pull request #2675 from cboylan/userInfoUpdate-guardsJohn McLear
2015-06-24Check for valid session in handleUserInfoUpdateClark Boylan
2015-06-24Merge pull request #2707 from lpagliari/developJohn McLear
2015-06-24Fixing @font-face src path to be able to use font icons on plugins when minif...Luiza Pagliari
2015-06-23Update settings.json.templateJohn McLear
2015-06-22Merge pull request #2703 from LaKing/patch-1John McLear
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