summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)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-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-18Change domain for plugins.json requestStefan
2015-01-18Prevent dublicates in search resultsStefan
2015-01-18Prevent form submit on plugin pageStefan
2015-01-12Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-01-11refix pluginsJohn McLear
2015-01-11Add new favicon (32x32) with associated svg fileStefan
2015-01-11Support ejs 2.0Timothy Gu
Fixes #2437. This is still relying on undocumented behavior, but should unbreak the app in the mean time.
2015-01-10Merge pull request #2442 from ether/fix/attribmanager-removeattribonlineMarcel Klehr
Finally fix AttribManager#removeAttributeOnLine
2015-01-09fix for uls without classwebzwo0i
2015-01-07roll ejs back as its broken at v2John McLear
2015-01-06final html export hookJohn McLear
2015-01-05Finally fix AttribManager#removeAttributeOnLineMarcel Klehr
return safely if the attribute wasn't found. fixes #2394
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-01v number bumpJohn McLear
2014-12-31patch for e1c683be3f47a350e6bac3146507bd2d7d7478f6John McLear
2014-12-31Merge pull request #2418 from ether/etherpad-export-and-importJohn McLear
Full Pad portability (Export/Import)
2014-12-31Merge pull request #2421 from webzwo0i/fix-swaggerJohn McLear
hack to avoid warnings in swagger usage
2014-12-31Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrsJohn McLear
Clean-up after removing list attribute: Remove list numbering attribute
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
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-30Merge pull request #2410 from Gared/feature/notify-user-cookies-rejectedStefan
Notify user if cookies can't be created
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
Fix ExportHtml.js list parsing code
2014-12-30Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finishedJohn McLear
Fix lineassembler not finished
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:33:20 +0000