summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-01-16check for io.jsnemetz
2015-01-12Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-01-11refix pluginsJohn McLear
2015-01-11Merge pull request #2453 from Gared/new_icoJohn McLear
2015-01-11Add new favicon (32x32) with associated svg fileStefan
2015-01-11Merge pull request #2452 from TimothyGu/developJohn McLear
2015-01-11Support ejs 2.0Timothy Gu
2015-01-10Merge pull request #2442 from ether/fix/attribmanager-removeattribonlineMarcel Klehr
2015-01-09Merge pull request #2447 from badboy/patch-1John McLear
2015-01-09Merge pull request #2449 from webzwo0i/fix-for-uls-without-classJohn McLear
2015-01-09fix for uls without classwebzwo0i
2015-01-08Removed useless use of catJan-Erik Rediger
2015-01-07roll ejs back as its broken at v2John McLear
2015-01-07Merge pull request #2445 from webzwo0i/fix-importexportJohn McLear
2015-01-07fix importexport-testswebzwo0i
2015-01-06Merge pull request #2443 from ether/exporthtmlendhookJohn McLear
2015-01-06final html export hookJohn McLear
2015-01-05Finally fix AttribManager#removeAttributeOnLineMarcel Klehr
2015-01-05Merge pull request #2436 from ether/check-for-abiword-pathJohn McLear
2015-01-04check file system that abiword existsJohn McLear
2015-01-02Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-01-01fix timeslider stars and frontend tests, needs css polishJohn McLear
2015-01-01Merge pull request #2425 from ether/masterJohn McLear
2015-01-01Merge pull request #2424 from ether/release/1.5.0John McLear
2015-01-01changelogJohn McLear
2015-01-01v number bumpJohn McLear
2014-12-31patch for e1c683be3f47a350e6bac3146507bd2d7d7478f6John McLear
2014-12-31Merge pull request #2418 from ether/etherpad-export-and-importJohn McLear
2014-12-31Merge pull request #2421 from webzwo0i/fix-swaggerJohn McLear
2014-12-31remove console logJohn McLear
2014-12-31Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrsJohn McLear
2014-12-31more line polishJohn McLear
2014-12-31export html more stylesJohn McLear
2014-12-30hack to avoid warnings in swagger usagewebzwo0i
2014-12-30Clean-up after removing list attribute: Remove list numbering attributeMarcel Klehr
2014-12-30Merge pull request #2406 from Gared/fix/author-not-set-callbackStefan
2014-12-30Merge pull request #2410 from Gared/feature/notify-user-cookies-rejectedStefan
2014-12-30more stylingJohn McLear
2014-12-30Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2014-12-30some demo export loic for handling OL incrementationJohn McLear
2014-12-30Merge pull request #2417 from webzwo0i/fix-exportJohn McLear
2014-12-30Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finishedJohn McLear
2014-12-30no errors on chrome clientJohn McLear
2014-12-30better take some responsibilityJohn McLear
2014-12-30licensingJohn McLear
2014-12-30remove console logJohn McLear
2014-12-30working author importJohn McLear
2014-12-29remove error loggingJohn McLear
2014-12-29more author logicJohn McLear
2014-12-29authorsJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 02:29:18 +0000