summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-23Merge pull request #2336 from ether/more-socket-io-fixesJohn McLear
2014-11-23more fixesJohn McLear
2014-11-23Merge pull request #2335 from ether/javascript-bowerJohn McLear
2014-11-23Merge pull request #2319 from ether/fix-socket-admin-etcJohn McLear
2014-11-23final commitJohn McLear
2014-11-23Merge branch 'develop' of github.com:ether/etherpad-lite into fix-socket-admi...John McLear
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 also...John McLear
2014-11-22Merge pull request #2334 from luto/api-mystery-crashJohn McLear
2014-11-22fix api mystery crashluto
2014-11-22Merge pull request #2333 from l-y-n-x/admin_pathJohn McLear
2014-11-22Changed relative path to Etherpad main page in admin settings.l-y-n-x
2014-11-21minor stylingJohn McLear
2014-11-21missing socketio fixJohn McLear
2014-11-19whoops fix animation not to look brokenJohn McLear
2014-11-19Merge pull request #2321 from ether/new-iconsJohn 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-18Merge pull request #2326 from ether/blocks-for-custom-script-and-stylesJohn McLear
2014-11-18working blocksJohn McLear
2014-11-18slight ui fixJohn McLear
2014-11-18more polishJohn McLear
2014-11-18clean upJohn McLear
2014-11-18working pauseJohn McLear
2014-11-18more polishJohn McLear
2014-11-18some timeslider styling but this wont be completed by meJohn McLear
2014-11-18Merge pull request #2324 from beaugunderson/no-crash-on-parse-pluginsJohn McLear
2014-11-18Don't crash on bad plugins.json; fixes #2323Beau Gunderson
2014-11-18no image on timesliderJohn McLear
2014-11-18a font lookup fileJohn McLear
2014-11-18remove connecting bar imageJohn McLear
2014-11-18spinning loading iconsJohn McLear
2014-11-18fontello config fileJohn McLear
2014-11-18correct font stuffJohn McLear
2014-11-18remove stuff, new filesJohn McLear
2014-11-18hrm I dont trust this securityJohn McLear
2014-11-18stability restored now to handle the auth issuesJohn McLear
2014-11-18client side code now fixedJohn McLear
2014-11-18template of a semi-fixJohn McLear
2014-11-15Merge pull request #1783 from simong/removed-console-in-html10nMarcel Klehr
2014-11-15Nooping console.foo in html10n.js when the method is not defined.Simon Gaeremynck
2014-11-15Merge pull request #1682 from luto/fix-listSessionsOfGroupJohn McLear
2014-11-15Merge pull request #1912 from ether/hide-chat-when-caret-behindJohn McLear
2014-11-15Merge branch 'master' of github.com:ether/etherpad-lite into developJohn McLear
2014-11-15Merge pull request #2203 from ether/setting-to-not-import-unknown-file-typesJohn McLear
2014-11-15Merge pull request #2273 from ether/bump-swaggerJohn McLear
2014-11-15mergingJohn McLear
2014-11-15Merge pull request #2285 from talexand/developJohn McLear
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:44:01 +0000