summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
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
2014-12-29msg for userJohn McLear
2014-12-29allow only for pads less than 10 to be overwrittenJohn McLear
2014-12-29working for all filesJohn McLear
2014-12-29whoopsi, required filesJohn McLear
2014-12-29semi working requires browser refreshJohn McLear
2014-12-29delay write to fix copypad -- bad practice but due to db.set not allowing cal...John McLear
2014-12-29Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-t...John McLear
2014-12-29resolve merge conflictJohn McLear
2014-12-29second fix for user list issue on #2413John McLear
2014-12-29unbind before rebind, partial fix towards #2413 issueJohn McLear
2014-12-29Merge pull request #2401 from ether/save-prefsJohn McLear
2014-12-29fix sockets of switch to padJohn McLear
2014-12-29Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTestJohn McLear
2014-12-28Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindowJohn McLear
2014-12-28Merge pull request #2409 from ether/fix-removeAttribOnLineJohn McLear
2014-12-28AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothi...Marcel Klehr
2014-12-27Merge pull request #2398 from ether/indentLevelsJohn McLear
2014-12-27timeslider fixesJohn McLear
2014-12-27minor ts bg fixJohn McLear
2014-12-27Merge pull request #2402 from ether/fix-attribmanager-removeLineAttribJohn McLear
2014-12-27Merge pull request #2404 from webzwo0i/sanity-in-atextJohn McLear
2014-12-27Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-12-27Revert "be more strict in checkRep"webzwo0i
2014-12-27Merge pull request #2400 from Gared/fix/author-not-setStefan
2014-12-27Fix AttributeManager#removeAttributeOnLine: Only remove a single attribMarcel Klehr
2014-12-27set prefs and get prefsJohn McLear
2014-12-27Prevent server crash if author is not setGared
2014-12-27removing dokuwikiJohn McLear
2014-12-27support for exportJohn McLear
2014-12-27support indentation up to 16 levels and dont go back afterwardsJohn McLear
2014-12-26slightly better attribute selection logic but still pretty b0rkedJohn McLear
2014-12-24fix flowing of items in editbarJohn McLear
2014-12-23fix issue with attributesJohn McLear
2014-12-21Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_export...John McLear
2014-12-21move clean css back to fix minification on TSJohn McLear
2014-12-21fixJohn McLear
2014-12-21more fixesJohn McLear
2014-12-21Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_export...John McLear
2014-12-21fix timeslider socket issueJohn McLear
2014-12-17fix typo in addSavedRevisionswebzwo0i
2014-12-16remove more dead requires.webzwo0i
2014-12-16Merge pull request #2377 from webzwo0i/avoid-global-vairablesJohn McLear