summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)Author
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-09additional tag support hookJohn 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-09also logic to add attributes for propertiesJohn 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-04be more strict in checkRepwebzwo0i
2014-12-04wrap appendRevision in try-catch blockwebzwo0i
2014-12-04dont remove more lines than exist in the whole textwebzwo0i
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-29minor ui polishJohn McLear
2014-11-29color picker on mobile actually shows on screenJohn McLear
2014-11-29 a little more polishJohn McLear
2014-11-29mobile ui polishJohn McLear
2014-11-28bump vsJohn McLear
2014-11-28correct kernel v#John McLear
2014-11-28Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-...John McLear
2014-11-28gritter css fixJohn McLear
2014-11-28better fixJohn McLear
2014-11-28fix issue with top of chatbox not being aligned properlyJohn McLear
2014-11-28Merge pull request #2344 from ether/backend-testsJohn McLear
2014-11-28Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizerJohn McLear
2014-11-28Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-...John McLear
2014-11-27fix undo in chrome etcJohn McLear
2014-11-27yeah need htis tooJohn McLear
2014-11-27use a forked require-kernelJohn McLear
2014-11-27sanitizer changeJohn McLear
2014-11-26fix for #2132John McLear
2014-11-26remember to add supertestJohn McLear
2014-11-26handle auth failsJohn McLear
2014-11-26Merge branch 'develop' of github.com:ether/etherpad-lite into backend-testsJohn McLear
2014-11-26make additional line break at end of imported docJohn McLear
2014-11-26mocha versionJohn McLear
2014-11-25Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-awayJohn McLear
2014-11-25remove jsdom depJohn McLear
2014-11-25multilineJohn McLear