summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-07-05Correct error message.Marcel Klehr
2012-07-05Allow v0.6.0 on UNIXMarcel Klehr
2012-07-05Merge pull request #829 from marcelklehr/support-node-0.8John McLear
2012-07-05Merge pull request #838 from redhog/masterJohn McLear
2012-07-05Quick hack to hide ep_etherpad-lite in plugin listEgil Moeller
2012-07-05Add latest versions of async, express and connect.Marcel Klehr
2012-07-05Allow node v0.6.x and 0.8.xMarcel Klehr
2012-07-05Merge pull request #826 from marcelklehr/remove-windows-settings-jsonJohn McLear
2012-07-03Merge pull request #837 from redhog/masterJohn McLear
2012-07-03Merge branch 'master' of git://github.com/Pita/etherpad-liteEgil Moeller
2012-07-03Merge pull request #835 from redhog/restartserverJohn McLear
2012-07-03Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserverEgil Moeller
2012-07-03Make the server restart on plugin installEgil Moeller
2012-07-03Merge pull request #833 from MarkTraceur/developJohn McLear
2012-07-02Don't rewrite in a stupid wayMark Holmquist
2012-06-30Use node v0.8.1 / allow node v0.8Marcel Klehr
2012-06-30Replace path.exists with fs.existsMarcel Klehr
2012-06-29Merge pull request #827 from MarkTraceur/developJohn McLear
2012-06-29Add in padUsersCount method and API callMark Holmquist
2012-06-29Remove settings.json.template_windowsMarcel Klehr
2012-06-29Merge pull request #824 from marcelklehr/fix-windows-install-fixPeter 'Pita' Martischka
2012-06-29Fix windows install scriptMarcel Klehr
2012-06-29Fix plugin loaderMarcel Klehr
2012-06-28Merge pull request #822 from marcelklehr/fix-windows-installJohn McLear
2012-06-28Add windows install scriptMarcel Klehr
2012-06-28Fix plugin loader to work with windows paths (e.g. 'D:\foo\...')Marcel Klehr
2012-06-27Merge pull request #821 from marcelklehr/fix-contributor-api-methodsJohn McLear
2012-06-27Some fixes to the contributor API methodsMarcel Klehr
2012-06-27Merge pull request #819 from marcelklehr/contributor-api-methodsJohn McLear
2012-06-27Merge pull request #820 from MarkTraceur/developJohn McLear
2012-06-27Add in getLastEdited API callMark Holmquist
2012-06-27Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPadMarcel Klehr
2012-06-26Merge pull request #818 from MarkTraceur/kick-on-deauthJohn McLear
2012-06-26Fix glaring problem with pull requestMark Holmquist
2012-06-26Merge pull request #817 from MarkTraceur/kick-on-deauthJohn McLear
2012-06-26Refuse connection if the user is no longer authorizedMark Holmquist
2012-06-26Merge pull request #816 from MarkTraceur/developJohn McLear
2012-06-26Add in a new hook for handleMessageMark Holmquist
2012-06-22Merge pull request #810 from redhog/aceEditEventJohn McLear
2012-06-22Merge branch 'master' into aceEditEventEgil Moeller
2012-06-20Merge pull request #803 from ametaireau/postgres-in-settingsJohn McLear
2012-06-20mention postgres in the default settingsAlexis Metaireau
2012-06-13Merge pull request #784 from jhollinger/masterJohn McLear
2012-06-13The pad name sanitizer shouldn't drop query params. issue #779Jordan Hollinger
2012-06-13Merge pull request #783 from jhollinger/developJohn McLear
2012-06-13The pad name sanitizer shouldn't drop query params. issue #779Jordan Hollinger
2012-06-13#763: Use spaces instead of tabs0ip
2012-06-12Merge pull request #763 from cboylan/fix_padjs_customStartJohn McLear
2012-06-12Merge pull request #777 from cboylan/dev_fix_padjs_customStartJohn McLear
2012-06-12Fix pad.js' customStart.Clark Boylan
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:30:30 +0000