summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-12-29test for #2395 #2402John McLear
2014-12-28tests front chat going from stiky to smallyJohn 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-27Merge pull request #2399 from ether/remove-dokuwikiJohn McLear
2014-12-27Prevent server crash if author is not setGared
2014-12-27remove trailing enter from apikeyJohn McLear
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-24test for pad usersJohn McLear
2014-12-24move docsJohn McLear
2014-12-23Merge pull request #2358 from BjarniRunar/developJohn McLear
2014-12-23fix issue with attributesJohn McLear
2014-12-22Merge pull request #2368 from ether/hook_for_exportHTMLStylesJohn 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-21remove unused long paths from windows buildJohn McLear
2014-12-18Merge pull request #2380 from webzwo0i/fix-add-saved-revision-typoMarcel Klehr
2014-12-17fix typo in addSavedRevisionswebzwo0i
2014-12-16Merge pull request #2377 from webzwo0i/avoid-global-vairablesJohn McLear
2014-12-16declare var outside of loopwebzwo0i
2014-12-16Merge pull request #2373 from webzwo0i/avoid-global-vairablesJohn McLear
2014-12-14dont make local variables globalwebzwo0i
2014-12-10allow for timeslider custom messagesJohn McLear
2014-12-09allow plugins to add multiple stylesJohn McLear
2014-12-09docsJohn McLear
2014-12-09additional tag support hookJohn McLear
2014-12-09Merge pull request #2370 from simong/shardable-socket-ioJohn McLear
2014-12-09Allow for shardable EtherpadSimon Gaeremynck
2014-12-09this class was in before, it is used to show when a style is applied to a pie...John McLear
2014-12-09docsJohn McLear
2014-12-09also logic to add attributes for propertiesJohn McLear
2014-12-08docsJohn McLear