summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-04-04changelog and package fileJohn McLear
2013-04-02Merge pull request #1697 from ether/longer-timeoutJohn McLear
2013-04-02longer timeout on reconnectionJohn McLear
2013-04-01Merge pull request #1692 from ether/fix/drop-0.6-supportJohn McLear
2013-04-01Drop support for node v0.6, officiallyMarcel Klehr
2013-04-01Merge branch 'feature/support-node-0.10' into developMarcel Klehr
2013-04-01Update ueberDB to add support for node 0.10.xMarcel Klehr
2013-04-01Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2013-03-31Merge pull request #1691 from mluto/socketio-decode-cookie-sessionJohn McLear
2013-03-31Merge pull request #1689 from mluto/fix-checkAccess-omitted-cbJohn McLear
2013-03-31Decode the sessionID before sending it to the server since our separator ',' ...mluto
2013-03-31Log when a sessionID in checkAccess is not foundmluto
2013-03-31When there is just one session and this one is invalid SecurityManager.checkA...mluto
2013-03-30Merge pull request #1687 from mluto/checkAccess-debug-outputJohn McLear
2013-03-30log things the log4js-way; put all the brackets on a new linemluto
2013-03-30Added debug-output to SecurityManager.checkAccess to indicate *why* an auth-t...mluto
2013-03-30Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2013-03-30Merge pull request #1640 from ether/caret-refactorJohn McLear
2013-03-30Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2013-03-30fix "util.pump() is deprecated. Use readableStream.pipe()"Manuel Knitza
2013-03-28Merge pull request #1677 from ether/ctrl-s-fadeJohn McLear
2013-03-29remove messy bitsJohn McLear
2013-03-28Merge pull request #1681 from ether/loading_blockJohn McLear
2013-03-29Loading blocksJohn McLear
2013-03-28Make revision button glow on ctrl-s and increase durationMarcel Klehr
2013-03-28more settimeout to top windowJohn McLear
2013-03-28show light yellow for .5 secs on save revision keypressJohn McLear
2013-03-27Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2013-03-27Merge pull request #1675 from ether/fix/process-uncaughtException-event-handl...John McLear
2013-03-27Merge pull request #1672 from ether/feature/admin-plugins-revampJohn McLear
2013-03-27Merge pull request #1607 from ether/custom-obj-msgJohn McLear
2013-03-27Update en.jsonJohn McLear
2013-03-27/admin/plugins: Display a tooltip when hovering the plugin details linkMarcel Klehr
2013-03-27/admin/plugins: Add a loading indicator to some messagesMarcel Klehr
2013-03-27/admin/plugins: Fix update checkMarcel Klehr
2013-03-26Don't leak event listeners for process:uncaughtExceptionMarcel Klehr
2013-03-26Merge pull request #1664 from ether/sticky-chatJohn McLear
2013-03-26/admin/plugins: Dry up displaying of info messagesMarcel Klehr
2013-03-26/admin/plugins: Fix for smaller screensMarcel Klehr
2013-03-26/admin/plugins: If a user installs sth scroll up to the loading indicatorMarcel Klehr
2013-03-26/admin/plugins: Fix infinite scroll for larger screensMarcel Klehr
2013-03-26Disable search until registry is loaded and fix sorting by versionMarcel Klehr
2013-03-26Remove plugin prefix in pluin lists and make links to plugins more clearMarcel Klehr
2013-03-26Merge pull request #1673 from neurolit/api-doc-errorsJohn McLear
2013-03-26API documentation: listAllPads() returns {padIDs: [...]} instead of [...]neurolit
2013-03-26/admin/plugins: Show some text if nothing is display otherwiseMarcel Klehr
2013-03-26Install and uninstall plugins with styleMarcel Klehr
2013-03-26pluginfw/installer.js fire callbacks only onceMarcel Klehr
2013-03-26/admin/plugins: Don't list installed plugins as availableMarcel Klehr
2013-03-26/admin/plugins: Make it display the same amount of plugins after sortingMarcel Klehr