summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-07make async, please checkJohn McLear
2014-05-07remove eplite add etherpadJohn McLear
2014-05-06docs for new hookJohn McLear
2014-05-06working logic for allowing a server side hook to modify the export file name ↵John McLear
but NOT the extension
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
2014-03-16Add docs for toolbar controller and pad_editbarMarcel Klehr
2014-03-16Refactor toolbar.js to use consistent namingMarcel Klehr
2014-03-16Toolbar: Allow custom dropdowns for pluginsMarcel Klehr
2014-03-16Merge branch 'pr/1579' into toolbar-testMarcel Klehr
Conflicts: settings.json.template src/static/js/pad_editbar.js
2014-03-15Update CONTRIBUTING.mdJohn McLear
2014-03-14Merge pull request #2108 from goldquest/dev_deleteSessionBugJohn McLear
Session deletion error, when group2session/author2session are not available
2014-03-14Sometimes, the author2session / group2session don't exist anymore, but the ↵goldquest
session does. It should be possible to delete a session, if they don't exist
2014-03-13Merge pull request #2089 from dmitryuv/changesetslib-fixesJohn McLear
fix for infinite loop on bad changeset
2014-03-13Merge pull request #2080 from ether/ignore-ctrl-pageupJohn McLear
allow tabs to be cycled when focus is in editor
2014-03-12Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-03-11Merge pull request #2101 from ether/preProcessDomLineJohn McLear
preprocessor for domline attributes
2014-03-05cleaner logicJohn McLear
2014-03-05docsJohn McLear
2014-03-05mergeJohn McLear
2014-03-04fix dintenationJohn McLear
2014-03-04preprocessor for domline attributesJohn McLear
2014-02-26Merge pull request #2095 from vvision/developMarcel Klehr
Fix plugins not being fetched (update npm)