summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-04-11Release version 1.5.4Stefan
2015-04-11clearer comments about the path handling behaviorTom Hunkapiller
2015-04-11fix an issue in the path handling that allowed directory traversalTom Hunkapiller
2015-04-11Merge pull request #2590 from ether/release/1.5.3John McLear
2015-04-11Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1...Stefan
2015-04-10Merge pull request #2589 from Gared/add_version_numberJohn McLear
2015-04-11Increase etherpad version to 1.5.3Stefan
2015-04-11Log version number and git-sha on server startStefan
2015-04-10Add version number to plugins-info pageStefan
2015-04-10changelogJohn McLear
2015-04-10dont allow directory traversalJohn McLear
2015-04-08new fix for #1766John McLear
2015-04-07Merge pull request #2566 from ether/editbar-accessibilityJohn McLear
2015-04-07Merge pull request #2579 from ether/warnings-in-pad-contentsJohn McLear
2015-04-06Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessi...John McLear
2015-04-06bump ueberJohn McLear
2015-04-06bump vsJohn McLear
2015-04-06pass error messages to pad text if shown during startupJohn McLear
2015-04-05timeslider settings for fontsJohn McLear
2015-04-05hacky fix for opendyslexicJohn McLear
2015-04-05support for open dyslexic fontJohn McLear
2015-04-05use ctrl shift 2 instead of alt aJohn McLear
2015-04-05fix issue where focus on timeslider wouldnt workJohn McLear
2015-04-04Merge pull request #2576 from rdubigny/developJohn McLear
2015-04-04Update installDeps.shRaphaël Dubigny
2015-04-04Update installDeps.shRaphaël Dubigny
2015-04-03title for chatJohn McLear
2015-04-03temp solution for alt 9 to show editbar labelJohn McLear
2015-04-03final accessibility for Timeslider hopefullyJohn McLear
2015-04-02Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into e...John McLear
2015-04-02change to alt shit and a to show authorsJohn McLear
2015-04-02Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-04-02fix for #2574John McLear
2015-04-02Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessi...John McLear
2015-04-02fix timeslider title issuesJohn McLear
2015-04-01Merge pull request #2573 from ether/append-chat-apiJohn McLear
2015-04-01reintroduce removed api points that were removed by mistakeJohn McLear
2015-04-01tests and fix up sloppy code by original authorJohn McLear
2015-04-01Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite in...John McLear
2015-04-01fix import issue with txt files and abiword #2572John McLear
2015-03-31fix font type testJohn McLear
2015-03-31Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessi...John McLear
2015-03-31Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelectionJohn McLear
2015-03-31Merge pull request #2477 from gabrielliwerant/develop-readme-instructionsJohn McLear
2015-03-31Merge pull request #2482 from ether/chrome-list-handlingJohn McLear
2015-03-31Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-compo...John McLear
2015-03-31Merge pull request #2538 from webzwo0i/check-author-attributionJohn McLear
2015-03-31Merge pull request #2541 from cristo-rabani/patch-3John McLear
2015-03-31Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-positionJohn McLear
2015-03-31Merge pull request #2568 from tm-linkwerk/feature-2567-contentcollector-keyva...John McLear