summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-01-21some sanityJohn McLear
2015-01-21blind attempt to tryJohn McLear
2015-01-19boopJohn McLear
2015-01-19better regexp for line itemsJohn McLear
2015-01-18dont paste on middle click of linkJohn McLear
2015-01-18more export logic handlingJohn McLear
2015-01-18whoops proper regexp fix for listNumberJohn McLear
2015-01-18reset all numbers on first itemJohn McLear
2015-01-18Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-01-18support deeper nested elements on exportsJohn McLear
2015-01-18Merge pull request #2466 from ether/remove-infiniteJohn McLear
2015-01-18remove infinite load was causing painJohn McLear
2015-01-18and this one..John McLear
2015-01-18use etherpads own yajsmlJohn McLear
2015-01-18fix for ep page view pageup/downJohn McLear
2015-01-18allow list text entry up to 16 itemsJohn McLear
2015-01-18Merge pull request #2465 from Gared/change_domain_plugins_jsonJohn McLear
2015-01-18Change domain for plugins.json requestStefan
2015-01-18Merge pull request #2464 from Gared/plugin_page_improvementsJohn McLear
2015-01-18Prevent dublicates in search resultsStefan
2015-01-18Prevent form submit on plugin pageStefan
2015-01-16Merge pull request #2459 from nemetz/patch-1John McLear
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:26:31 +0000