summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 #2599 from Gared/doc_api_fixJohn McLear
2015-04-11Fix documentation for deleteSession api methodStefan
2015-04-11comment out import tests as they fail in IEJohn McLear
2015-04-11Merge pull request #2597 from Gared/increase_api_versionJohn McLear
2015-04-11Merge pull request #2302 from Gared/create_pad_special_charactersJohn McLear
2015-04-11Add test for creating pads with bad charactersStefan
2015-04-11IE list fixesJohn McLear
2015-04-11increase http api versionStefan
2015-04-11Add docs for new error message for createPad api methodStefan
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-11Merge pull request #2595 from ether/release/1.5.4Stefan
2015-04-11Release version 1.5.4Stefan
2015-04-11disabling import export tests for now as they are reporting false positives.....John McLear
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
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
2015-04-11Merge pull request #2592 from ether/masterJohn McLear
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-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