summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
2015-04-13add some semicoolons to prevent chrome warningJohn McLear
2015-04-12dont allow directory traversal #2louis
2015-04-12fix older IEsJohn McLear
2015-04-12re-fix rtlJohn McLear
2015-04-11Merge pull request #2604 from ether/pad-optionsJohn McLear
2015-04-11merge object settings into default settingsPeter 'Pita' Martischka
2015-04-11session key is now ignored and also padOptions are available in settingsJohn McLear
2015-04-11Merge pull request #2602 from devoidfury/fix/import-large-etherpadJohn McLear
2015-04-11Merge pull request #2601 from Gared/session_key_fileStefan
2015-04-11make setPadRaw async; streamline .etherpad file import handling chainTom Hunkapiller
2015-04-11Move sessionKey setting from settings.json to SESSIONKEY.txtStefan
2015-04-11Merge pull request #2600 from devoidfury/fix/junk-binary-filesJohn McLear
2015-04-11fix: only match /javascript/* for caching middlewareTom Hunkapiller
2015-04-11Merge pull request #2302 from Gared/create_pad_special_charactersJohn McLear
2015-04-11IE list fixesJohn McLear
2015-04-11msg to selfJohn McLear
2015-04-11bump underscore and require kernelJohn McLear
2015-04-11Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad...Stefan
2015-04-11FF middle click fixJohn McLear
2015-04-11bump versions outdatedJohn McLear
2015-04-11Merge pull request #2596 from ether/masterStefan
2015-04-11use latest ejsJohn McLear
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-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 pull request #2584 from devoidfury/express4John McLear
2015-04-11Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1...Stefan
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-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 for express 4.xTom Hunkapiller
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-03title for chatJohn McLear