summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-06-14Added function to switch to a different pad without having to reload the ↵Mike DeRosa
whole page.
2014-06-12Merge pull request #2175 from ether/fix-handleMessageMarcel Klehr
Pluginfw: Interpret hook return value `null` as `[null]` instead of `undefined` see http://etherpad.org/doc/v1.4.0/#index_return_values fixes dropping of messages in handleMessage
2014-06-12pluginfw: accept 'null' as a hook-result, as this is needed by handleMessageluto
2014-06-11Merge pull request #2149 from ether/dont-use-abiword-for-htmlMarcel Klehr
abiword shouldnt be used for HTML native documents
2014-06-11Merge pull request #2161 from ether/bump-ueberMarcel Klehr
bump ueberdb for more performance on mysql
2014-06-02Merge pull request #2169 from stephan48/developMarcel Klehr
Added documentation for the newly added API method getPadID
2014-06-02Added documentation for the newly added API method getPadIDStephan Jauernick
2014-06-02Merge pull request #2165 from stephan48/developMarcel Klehr
Added an API method for retrieving the padID from the readonlyID
2014-06-02Merge pull request #2166 from divergentdave/patch-1John McLear
Fix typos in easysync-full-description.tex
2014-06-01Fix typos in easysync-full-description.texDavid Cook
2014-06-01Corrected the API Version number.Stephan Jauernick
2014-06-01Renamed the variable to prevent possible problems.Stephan Jauernick
2014-05-31Enhanced the Example for the API Method getPadID and make the return value ↵Stephan Jauernick
consistent to other functions
2014-05-31Implemented the the new API method getPadID for reversing the Readonly ID. ↵Stephan Jauernick
Based on: https://github.com/disy-mk/etherpad-lite/commit/ff88c19fc12887a49fdb752adb15ee3145f521f0
2014-05-31Added a new API method getPadID for reversing the Readonly ID and introduced ↵Stephan Jauernick
the API level 1.4.1. Based on: https://github.com/disy-mk/etherpad-lite/commit/97402f60b89549b32238505397c781dce8d79a4c
2014-05-21bump ueberdb for more performance on mysqlJohn McLear
2014-05-14Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crashJohn McLear
Fix getRevisionChangeset API call making etherpad crash
2014-05-12Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-05-09Update ImportHandler.jsJohn McLear
2014-05-08Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-05-06abiword shouldnt be used for HTML native documentsJohn McLear
2014-05-03Merge pull request #2138 from ether/fix-user-icon-color-and-countMarcel Klehr
Fix showusers button: Show authorcolor and user_count again
2014-04-30Fix #online_countMarcel Klehr
Rather dirty, but works.
2014-04-21Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-04-15fix colorJohn McLear
2014-04-14Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-04-06Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-03-31Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-03-31Merge pull request #2126 from ether/fix/toolbar-timeslider-buttonJohn McLear
Toolbar: Fix timeslider button
2014-03-31Toolbar: Fix timeslider buttonMarcel Klehr
Wouldn't play nice with url params in document.location fixes #2124
2014-03-31Merge pull request #2123 from ether/masterMarcel Klehr
Update README.md
2014-03-31Update README.mdStefan
Added support for node v0.11 in the installation description
2014-03-30Merge branch 'master' into developMarcel Klehr
2014-03-30Merge branch 'release/1.4.0'Marcel Klehr
2014-03-30docs: update api versionMarcel Klehr
2014-03-30Merge pull request #2120 from ether/fix/timeslider-editbarJohn McLear
Add a customizable toolbar for timeslider
2014-03-30Update docsMarcel Klehr
2014-03-30Fix redo toolbar command, again.Marcel Klehr
2014-03-30Create a customizable timeslider toolbarMarcel Klehr
2014-03-30Fix timeslider export dropdownMarcel Klehr
2014-03-29fix error on focus remove from import/exportJohn McLear
2014-03-27Merge pull request #2117 from ether/doc/asset-css-suit-upJohn McLear
Polish the styles of our docs a little
2014-03-27Polish the styles of our docs a littleMarcel Klehr
2014-03-26Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messagesJohn McLear
Fix crash with queued messages
2014-03-26changelog, package file and fix for redoJohn McLear
2014-03-20Merge pull request #2111 from ether/quickfix/req_cs-bounds-checkJohn McLear
Fix REQ_CS rev boundary check
2014-03-20Fix REQ_CS rev boundary checkMarcel Klehr
fixes #2096
2014-03-18Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-03-17quick formatting clean upJohn McLear
2014-03-16Merge pull request #2110 from ether/modularize-toolbarJohn McLear
Modularize toolbar