summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
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-29fix closing of listswebzwo0i
2014-12-29differentiate between indents and bullets in unordered listswebzwo0i
2014-12-29delay write to fix copypad -- bad practice but due to db.set not allowing ↵John McLear
callback
2014-12-29Merge pull request #2091 from ↵John McLear
webzwo0i/disconnect-if-an-old-cs-is-submitted-twice disconnect client if it submits an already accepted changeset based on a...
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
set prefs and get prefs
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-28Use camel caseGared
2014-12-28Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindowJohn McLear
Close extended chat window
2014-12-28Notify user if cookies can't be createdGared
2014-12-28Merge pull request #2409 from ether/fix-removeAttribOnLineJohn McLear
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
2014-12-28AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's ↵Marcel Klehr
nothing else left
2014-12-28close and open lists according to the actual line.listLevelwebzwo0i
2014-12-28fix export of lists with bullets; <li> are closed before the next list ↵webzwo0i
starts. also, when closing, ensure that list-items are not nested
2014-12-27Merge pull request #2398 from ether/indentLevelsJohn McLear
Indent levels
2014-12-27timeslider fixesJohn McLear
2014-12-27Fix missing callback of #2400 and ignore missing author on timeslider on ↵Gared
client-side
2014-12-27minor ts bg fixJohn McLear
2014-12-27op is ok, if it doesnt include newlines. op is ok, if op.lines is equal to ↵webzwo0i
newlines in op.chars
2014-12-27check if op.lines is in sync with atext-newlineswebzwo0i
Conflicts: src/static/js/Changeset.js
2014-12-27make stringIterator aware of newlineswebzwo0i
2014-12-27Merge pull request #2402 from ether/fix-attribmanager-removeLineAttribJohn McLear
Fix removeAttributeOnLine: Only remove a single attrib
2014-12-27Merge pull request #2404 from webzwo0i/sanity-in-atextJohn McLear
block changeset if it deletes more lines than exist in the whole pad
2014-12-27Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-12-27Revert "be more strict in checkRep"webzwo0i
This reverts commit 22803da42f4f8c6aeccc15d0a916bae6332a8652.
2014-12-27Merge pull request #2400 from Gared/fix/author-not-setStefan
Prevent server crash if author is not set
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 ↵John McLear
hook_for_exportHTMLStyles
2014-12-21move clean css back to fix minification on TSJohn McLear
2014-12-21fixJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:22:42 +0000