summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-13Merge new release into master branch!Stefan
2015-04-13Release version 1.5.5Stefan
2015-04-13add some semicoolons to prevent chrome warningJohn McLear
2015-04-12Merge pull request #2606 from 0x46616c6b/traversal-fix-2John McLear
dont allow directory traversal #2
2015-04-12dont allow directory traversal #2louis
2015-04-12change target for IE 9 testJohn McLear
2015-04-12dont test against IE8 any more as we dont care about itJohn McLear
2015-04-12fix older IEsJohn McLear
2015-04-12re-fix rtlJohn McLear
2015-04-11Merge pull request #2604 from ether/pad-optionsJohn McLear
session key is now ignored and also padOptions are available in settings
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
fix large etherpad import, fixes #2524
2015-04-11Merge pull request #2601 from Gared/session_key_fileStefan
Move sessionKey setting from settings.json to SESSIONKEY.txt
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
fix: only match /javascript/* for caching middleware
2015-04-11fix: only match /javascript/* for caching middlewareTom Hunkapiller
2015-04-11Merge pull request #2599 from Gared/doc_api_fixJohn McLear
Fix documentation for deleteSession api method
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
increase http api version to latest version
2015-04-11Merge pull request #2302 from Gared/create_pad_special_charactersJohn McLear
Add check for special url characters to createPad API function
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 ↵Stefan
create_pad_special_characters
2015-04-11FF middle click fixJohn McLear
2015-04-11bump versions outdatedJohn McLear
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 21:58:13 +0000