summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2014-11-29Merge branch 'develop' of https://github.com/ether/etherpad-lite into ↵John McLear
require-kernel-change
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 ↵John McLear
require-kernel-change
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
Backend tests
2014-11-28Merge branch 'develop' of github.com:ether/etherpad-lite into ↵John McLear
require-kernel-change
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-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
2014-11-25mochaJohn McLear
2014-11-25really recreate socketio-client in expressCreateServer, fixes #2342luto
When using plugins, the express server gets restarted. When we do that, the socketio-server should also get restarted. It doesn't. That means that all the events in SocketIORouter.js are bound twice, which causes chaos all over etherpad. This changes our socketio.js so it fully recreates the io-instance when we restart the server. introduced in 95e7b0f15609fc850b71717a672abd02237a0f33, but catching that would have been hard.
2014-11-25mheh no browser requirement at allJohn McLear
2014-11-25so yeah, prolly can do this anyway?John McLear
2014-11-25use cheerio instead of jsdomJohn McLear
2014-11-23more fixesJohn McLear
2014-11-23Merge pull request #2335 from ether/javascript-bowerJohn McLear
swap out jquery browser for bower but expose browser object to all pages...
2014-11-23final commitJohn McLear
2014-11-23Merge branch 'develop' of github.com:ether/etherpad-lite into ↵John McLear
fix-socket-admin-etc
2014-11-23fix session managementJohn McLear
2014-11-22whoopsiJohn McLear
2014-11-22swap out jquery browser for bower but expose browser object to all pages ↵John McLear
also enable minification.. Seems to work well
2014-11-22Merge pull request #2334 from luto/api-mystery-crashJohn McLear
fix api mystery crash
2014-11-22fix api mystery crashluto
2014-11-22Changed relative path to Etherpad main page in admin settings.l-y-n-x
There was one '../' too much.
2014-11-21minor stylingJohn McLear
2014-11-21missing socketio fixJohn McLear
2014-11-19whoops fix animation not to look brokenJohn McLear
2014-11-19correct file linksJohn McLear
2014-11-19Merge branch 'develop' of github.com:ether/etherpad-lite into new-iconsJohn McLear
2014-11-19move tiny bit of font awesome we actually use into pad.cssJohn McLear
2014-11-18working blocksJohn McLear
2014-11-18slight ui fixJohn McLear
2014-11-18more polishJohn McLear
2014-11-18clean upJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 22:50:19 +0000