summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-12-27Prevent server crash if author is not setGared
2014-12-27remove trailing enter from apikeyJohn 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
2014-12-08blah use asyncJohn McLear
2014-12-08allow padId to be passed into the hookJohn McLear
2014-12-08docsJohn McLear
2014-12-04Merge pull request #2348 from ether/sanitizerJohn McLear
2014-12-04Merge pull request #2329 from timrchavez/rebuild-pad-scriptJohn McLear
2014-12-04Merge pull request #2361 from seanhussey/patch-1John McLear
2014-12-03Make changes based on code reviewTimothy Chavez
2014-12-03Fix typoSean Hussey
2014-12-01Added dirty-db-cleaner.pyBjarni R. Einarsson
2014-12-01Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2014-12-01styling of global view columJohn McLear
2014-11-30Merge pull request #2350 from ether/require-kernel-changeJohn McLear
2014-11-30stop death on no sessionJohn McLear
2014-11-29Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lit...John McLear
2014-11-29yet more minor css polishJohn McLear
2014-11-29bump cleancssJohn McLear
2014-11-29Merge branch 'develop' of https://github.com/ether/etherpad-lite into require...John McLear
2014-11-29Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lit...John McLear
2014-11-29minor ui polishJohn McLear