summaryrefslogtreecommitdiff
AgeCommit message (Collapse)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
Support node 0.8
2012-07-05Merge pull request #838 from redhog/masterJohn McLear
Bug workaround for plugin manager
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
Remove windows settings json
2012-07-03Merge pull request #837 from redhog/masterJohn McLear
Changes from pita/master not in develop :(
2012-07-03Merge branch 'master' of git://github.com/Pita/etherpad-liteEgil Moeller
Conflicts: src/node/hooks/express/padurlsanitize.js
2012-07-03Merge pull request #835 from redhog/restartserverJohn McLear
Makes plugin install/uninstall restart Express&socket.io
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
Don't rewrite in a stupid way
2012-07-02Don't rewrite in a stupid wayMark Holmquist
Since we're already in the proper path for the pad, why worry about it? Replacing the entire path of the URL with /p/padname may have seemed like a good idea at the time, but really, for a 302 we only need a relative pathname. This patch provides the proper way.
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
Add in padUsersCount method and API call
2012-06-29Add in padUsersCount method and API callMark Holmquist
The PadMessageHandler objects now have a new API call associated with them. I'm sure that's a funny place to put it, but the pad2sessions object in that file seems to be the only place user counts are stored! Anyway, I hope this is helpful. I know it would be for me :)
2012-06-29Remove settings.json.template_windowsMarcel Klehr
Use settings.json.template
2012-06-29Merge pull request #824 from marcelklehr/fix-windows-install-fixPeter 'Pita' Martischka
Fix windows install [important]
2012-06-29Fix windows install scriptMarcel Klehr
* would overwrite settings.json * didn't correctly copy custom templates * cleans var/minified* now
2012-06-29Fix plugin loaderMarcel Klehr
make it work on client side and with relative paths
2012-06-28Merge pull request #822 from marcelklehr/fix-windows-installJohn McLear
Fix windows install
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
Fix contributor api methods
2012-06-27Some fixes to the contributor API methodsMarcel Klehr
Mostly these are coding style adjustments
2012-06-27Merge pull request #819 from marcelklehr/contributor-api-methodsJohn McLear
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
2012-06-27Merge pull request #820 from MarkTraceur/developJohn McLear
Add in getLastEdited API call
2012-06-27Add in getLastEdited API callMark Holmquist
This new HTTP API call, getLastEdited, will return the time of the last revision, in UNIX timestamp format.
2012-06-27Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPadMarcel Klehr
Return all pads that a given author has contributed to (not just created) and return all authors who has contributed to a given pad.
2012-06-26Merge pull request #818 from MarkTraceur/kick-on-deauthJohn McLear
Kick on deauth
2012-06-26Fix glaring problem with pull requestMark Holmquist
I accidentally forgot to call finalHandler if there was no padID .... :)
2012-06-26Merge pull request #817 from MarkTraceur/kick-on-deauthJohn McLear
Kick on deauth
2012-06-26Refuse connection if the user is no longer authorizedMark Holmquist
This should do the trick for issue 815. Please review and merge if it works. Try again: Fewer variables.
2012-06-26Merge pull request #816 from MarkTraceur/developJohn McLear
Add in a new hook for handleMessage
2012-06-26Add in a new hook for handleMessageMark Holmquist
Add a new hook: handleMessage. Whenever a message comes in, it is intercepted by this hook.
2012-06-22Merge pull request #810 from redhog/aceEditEventJohn McLear
Plugin/hook features&bugfixes
2012-06-22Merge branch 'master' into aceEditEventEgil Moeller
2012-06-20Merge pull request #803 from ametaireau/postgres-in-settingsJohn McLear
mention postgres in the default settings
2012-06-20mention postgres in the default settingsAlexis Metaireau
2012-06-13Merge pull request #784 from jhollinger/masterJohn McLear
Pad name sanitizer shouldn't drop query params
2012-06-13The pad name sanitizer shouldn't drop query params. issue #779Jordan Hollinger
2012-06-13Merge pull request #783 from jhollinger/developJohn McLear
Pad name sanitizer shouldn't drop query params
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
Fix pad.js' customStart.
2012-06-12Merge pull request #777 from cboylan/dev_fix_padjs_customStartJohn McLear
Fix pad.js' customStart.
2012-06-12Fix pad.js' customStart.Clark Boylan
Appears that sourcing of static/custom/pad.js was removed from templates/pad.html. This prevented static/custom/pad.js:customStart from running. Add it back to get customStart working again.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 14:41:18 +0000