summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-11Merge pull request #2596 from ether/masterStefan
Master
2015-04-11use latest ejsJohn McLear
2015-04-11Merge pull request #2595 from ether/release/1.5.4Stefan
Release 1.5.4
2015-04-11Release version 1.5.4Stefan
2015-04-11disabling import export tests for now as they are reporting false ↵John McLear
positives... at some point they will need properly fixing
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 #2593 from devoidfury/tests-DTA-fixJohn McLear
another traversal fix
2015-04-10clearer comments about the path handling behaviorTom Hunkapiller
2015-04-10fix an issue in the path handling that allowed directory traversalTom Hunkapiller
2015-04-11Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-04-11fix chrome testJohn McLear
2015-04-11Merge pull request #2584 from devoidfury/express4John McLear
Express 4 support
2015-04-11Merge pull request #2592 from ether/masterJohn McLear
Master
2015-04-11Merge pull request #2590 from ether/release/1.5.3John McLear
Release/1.5.3
2015-04-11Merge branch 'develop' of git://github.com/ether/etherpad-lite into ↵Stefan
release/1.5.3
2015-04-10Merge pull request #2589 from Gared/add_version_numberJohn McLear
Add version number to plugins-info page
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-10fix the rest of the deprecation warningsTom Hunkapiller
2015-04-10fix vulnerabilityTom Hunkapiller
2015-04-10fix minify route path; update deprecated callsTom Hunkapiller
2015-04-08update node version checking to 0.10+ or io.jsTom Hunkapiller
2015-04-08express dropped support for node 0.8; update engine requirementsTom Hunkapiller
2015-04-08update for express 4.xTom Hunkapiller
2015-04-08new fix for #1766John McLear
2015-04-07Merge pull request #2566 from ether/editbar-accessibilityJohn McLear
Accessibility
2015-04-07Merge pull request #2579 from ether/warnings-in-pad-contentsJohn McLear
pass error messages to pad text if shown during startup
2015-04-06Merge branch 'develop' of github.com:ether/etherpad-lite into ↵John McLear
editbar-accessibility
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
Fix minor typo in installDeps.sh
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 ↵John McLear
editbar-accessibility
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:01:56 +0000