summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-01-20freeze depsJohn McLear
2015-01-19Merge pull request #2469 from ether/new-sethtml-testsJohn McLear
I need to do some more work on this at some point.. Leaving here
2015-01-19remove pointless commentsJohn McLear
2015-01-19fix ul testsJohn McLear
2015-01-19Merge pull request #2471 from ether/ie-fix-backspaceJohn McLear
Ie fix backspace
2015-01-19temp bodge fixJohn McLear
2015-01-19hrmJohn McLear
2015-01-19Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2015-01-19fix ie editingJohn McLear
2015-01-19Merge pull request #2470 from cetra3/timeslider_proxy_fixJohn McLear
Timeslider proxy fix
2015-01-19Localisation updates from https://translatewiki.net.Siebrand Mazeland
2015-01-19Update to timeslider to include base path for easier proxyingCetra Free
2015-01-19Update to timeslider to include base path for easier proxyingCetra Free
2015-01-19nearly there...John McLear
2015-01-19nearly fully workingJohn McLear
2015-01-19more fixingJohn McLear
2015-01-19more handlingJohn McLear
2015-01-19bumpageJohn 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
remove infinite load was causing pain
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
Change domain for plugins.json request
2015-01-18Change domain for plugins.json requestStefan
2015-01-18Merge pull request #2464 from Gared/plugin_page_improvementsJohn McLear
Plugin page improvements
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
check for io.js
2015-01-16check for io.jsnemetz
Added a check for io.js
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
Add new favicon (32x32) with associated svg file
2015-01-11Add new favicon (32x32) with associated svg fileStefan
2015-01-11Merge pull request #2452 from TimothyGu/developJohn McLear
Support ejs 2.0
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-09Merge pull request #2447 from badboy/patch-1John McLear
Removed useless use of cat
2015-01-09Merge pull request #2449 from webzwo0i/fix-for-uls-without-classJohn McLear
fix for uls without class
2015-01-09fix for uls without classwebzwo0i
2015-01-08Removed useless use of catJan-Erik Rediger
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 02:33:34 +0000