summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-15Merge pull request #2298 from ether/reflow-toolbar-properlyJohn McLear
2014-11-15Merge pull request #2296 from ether/new-expressJohn McLear
2014-11-15resolve merge issuesJohn McLear
2014-11-15Merge pull request #2300 from cristo-rabani/patch-1John McLear
2014-11-14Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-11-13Merge pull request #2282 from ether/chrome-pasteJohn McLear
2014-11-12Update APIHandler.jsCristo
2014-11-12Update API.jsCristo
2014-11-12Update API.jsCristo
2014-11-12Update API.jsCristo
2014-11-12update pad clientsCristo
2014-11-12Merge pull request #2219 from Gared/fix_cssJohn McLear
2014-11-09Merge pull request #2303 from prtksxna/kbdtitleJohn McLear
2014-11-09Add keyboard shortcut for "Clear Authorshop Colors" in en localePrateek Saxena
2014-11-08new api verCristo
2014-11-08comment adddedCristo
2014-11-08Added option to restore revisions #1791Cristo
2014-11-07Merge pull request #2299 from prtksxna/colorauthJohn McLear
2014-11-07Add keyboard shortcut to Clear Authorship Colors. Fixes #2292Prateek Saxena
2014-11-06fix pgJohn McLear
2014-11-06this looks way betterJohn McLear
2014-11-06working on resizeJohn McLear
2014-11-06cleaner reflowJohn McLear
2014-11-06working redraw and draw on startupJohn McLear
2014-11-06reflow buttons based on browser size, much betterJohn McLear
2014-11-04bump express to a working versionJohn McLear
2014-11-04whoops I missed this oneJohn McLear
2014-11-04working handling of setting client ip and anonymizing etcJohn McLear
2014-11-04fix author notification handlerJohn McLear
2014-11-04fix room client leaveJohn McLear
2014-11-04re-apply roomsizeJohn McLear
2014-11-04working messagesJohn McLear
2014-11-04Begin to repair damage done to rooms logicJohn McLear
2014-11-04transportsJohn McLear
2014-11-04move logging into debug environment variable .. sighsJohn McLear
2014-11-04auth fixJohn McLear
2014-11-04more stuff required to stop it crashing, now we have identified what needs fi...John McLear
2014-11-04identify which parts are causing issues and comment them out, obviously this ...John McLear
2014-11-04Update ace2_inner.jsJohn McLear
2014-11-03Update package.jsonJohn McLear
2014-11-01no errors but no connectionsJohn McLear
2014-11-01basics, still not workingJohn McLear
2014-11-01blah push back for importsJohn McLear
2014-11-01Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2014-11-01use latest jsdomJohn McLear
2014-11-01Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2014-11-01Fixes #1414John McLear
2014-11-01take line breaks and treat them appropriatly instead of creating a space for ...John McLear
2014-11-01Merge pull request #2116 from jdittrich/updateUnderscoreJohn McLear
2014-11-01Bump resolveJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 21:53:35 +0000