public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,607 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1607 Commits (56a5c86e73ac599f90ffb39b4488564b9a21464e)

Author SHA1 Message Date
johnyma22 56a5c86e73 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-05 17:53:50 +01:00
John McLear 071ddefc39 Merge pull request #838 from redhog/master 
Bug workaround for plugin manager
 2012-07-05 09:53:17 -07:00
Egil Moeller 799a5768c7 Quick hack to hide ep_etherpad-lite in plugin list 2012-07-05 18:13:29 +02:00
John McLear 31ef973c33 Merge pull request #826 from marcelklehr/remove-windows-settings-json 
Remove windows settings json
 2012-07-05 08:13:03 -07:00
johnyma22 9bfd5762b0 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-05 16:12:15 +01:00
John McLear d59956b7da Merge pull request #837 from redhog/master 
Changes from pita/master not in develop :(
 2012-07-03 14:58:51 -07:00
Egil Moeller 1ff8debfbd Merge branch 'master' of git://github.com/Pita/etherpad-lite 
Conflicts:
	src/node/hooks/express/padurlsanitize.js
 2012-07-03 23:55:55 +02:00
John McLear e0622aaa8a Merge pull request #835 from redhog/restartserver 
Makes plugin install/uninstall restart Express&socket.io
 2012-07-03 14:42:33 -07:00
Egil Moeller a0548af021 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver 2012-07-03 23:32:37 +02:00
Egil Moeller b438a278a1 Make the server restart on plugin install 2012-07-03 23:31:44 +02:00
johnyma22 d56135476e Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-03 10:28:05 +01:00
John McLear 35c24c1191 Merge pull request #833 from MarkTraceur/develop 
Don't rewrite in a stupid way
 2012-07-03 01:53:19 -07:00
Mark Holmquist 91ed1f57c5 Don't rewrite in a stupid way 
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-07-02 16:46:31 -07:00
John McLear afa107e809 Merge pull request #827 from MarkTraceur/develop 
Add in padUsersCount method and API call
 2012-06-29 13:45:45 -07:00
Mark Holmquist a71a8a7efc Add in padUsersCount method and API call 
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-29 11:26:12 -07:00
Marcel Klehr d1dc0237d3 Remove settings.json.template_windows 
Use settings.json.template
 2012-06-29 16:28:05 +02:00
Peter 'Pita' Martischka c0c820c760 Merge pull request #824 from marcelklehr/fix-windows-install-fix 
Fix windows install [important]
 2012-06-29 07:12:22 -07:00
Marcel Klehr 3d397b1bc2 Fix windows install script 
* would overwrite settings.json
* didn't correctly copy custom templates
* cleans var/minified* now
 2012-06-29 12:41:50 +02:00
Marcel Klehr 227477967f Fix plugin loader 
make it work on client side and with relative paths
 2012-06-29 12:40:16 +02:00
johnyma22 de9b3c3975 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-06-28 15:16:29 +01:00
John McLear f891534258 Merge pull request #822 from marcelklehr/fix-windows-install 
Fix windows install
 2012-06-28 07:16:11 -07:00
Marcel Klehr c0ee0d8430 Add windows install script 2012-06-28 15:58:39 +02:00
Marcel Klehr b0d369883b Fix plugin loader to work with windows paths (e.g. 'D:\foo\...') 2012-06-28 15:58:28 +02:00
John McLear 711dee8f6b Merge pull request #821 from marcelklehr/fix-contributor-api-methods 
Fix contributor api methods
 2012-06-27 12:12:41 -07:00
Marcel Klehr 93b50d4a29 Some fixes to the contributor API methods 
Mostly these are coding style adjustments
 2012-06-27 21:02:41 +02:00
John McLear a717c11ab3 Merge pull request #819 from marcelklehr/contributor-api-methods 
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
 2012-06-27 11:31:25 -07:00
John McLear b466e37917 Merge pull request #820 from MarkTraceur/develop 
Add in getLastEdited API call
 2012-06-27 11:21:53 -07:00
Mark Holmquist ab0d3c87cb Add in getLastEdited API call 
This new HTTP API call, getLastEdited, will return the time of the
last revision, in UNIX timestamp format.
 2012-06-27 10:05:17 -07:00
Marcel Klehr 6f9d7a5db7 Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPad 
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-27 18:23:17 +02:00
John McLear 0bc01feb72 Merge pull request #818 from MarkTraceur/kick-on-deauth 
Kick on deauth
 2012-06-26 16:09:14 -07:00
Mark Holmquist c4e660b206 Fix glaring problem with pull request 
I accidentally forgot to call finalHandler if there was no padID
.... :)
 2012-06-26 16:07:08 -07:00
John McLear 3d9a2360be Merge pull request #817 from MarkTraceur/kick-on-deauth 
Kick on deauth
 2012-06-26 16:01:40 -07:00
Mark Holmquist 79ca5f3e7c Refuse connection if the user is no longer authorized 
This should do the trick for issue 815. Please review and merge if
it works.

Try again: Fewer variables.
 2012-06-26 16:00:38 -07:00
John McLear e23a9bff73 Merge pull request #816 from MarkTraceur/develop 
Add in a new hook for handleMessage
 2012-06-26 15:40:17 -07:00
Mark Holmquist 854e1092d9 Add in a new hook for handleMessage 
Add a new hook: handleMessage. Whenever a message comes in, it is
intercepted by this hook.
 2012-06-26 14:10:42 -07:00
John McLear e4ff4021ab Merge pull request #810 from redhog/aceEditEvent 
Plugin/hook features&bugfixes
 2012-06-22 03:53:50 -07:00
Egil Moeller 476cfc8da0 Merge branch 'master' into aceEditEvent 2012-06-22 12:12:15 +02:00
John McLear ab467310f5 Merge pull request #803 from ametaireau/postgres-in-settings 
mention postgres in the default settings
 2012-06-20 08:45:03 -07:00
Alexis Metaireau bee9a05ec3 mention postgres in the default settings 2012-06-20 17:36:05 +02:00
John McLear 4195e11a41 Merge pull request #784 from jhollinger/master 
Pad name sanitizer shouldn't drop query params
 2012-06-13 12:58:30 -07:00
Jordan Hollinger 08a00af617 The pad name sanitizer shouldn't drop query params. issue #779 2012-06-13 15:48:58 -04:00
John McLear fbcb2bbab8 Merge pull request #783 from jhollinger/develop 
Pad name sanitizer shouldn't drop query params
 2012-06-13 12:22:42 -07:00
Jordan Hollinger 6f37c0aaa6 The pad name sanitizer shouldn't drop query params. issue #779 2012-06-13 15:20:29 -04:00
0ip 48daf83a30 #763: Use spaces instead of tabs 2012-06-13 13:56:09 +03:00
John McLear b599cdf6e5 Merge pull request #763 from cboylan/fix_padjs_customStart 
Fix pad.js' customStart.
 2012-06-12 14:24:30 -07:00
John McLear fae7254175 Merge pull request #777 from cboylan/dev_fix_padjs_customStart 
Fix pad.js' customStart.
 2012-06-12 14:24:03 -07:00
Clark Boylan 2cbe29eb45 Fix pad.js' customStart. 
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.
 2012-06-12 14:20:54 -07:00
John McLear 0483802841 resolve issue #384 and also clear chat counter whenever focus is on chat input. Just a slightly nicer chat experience 2012-06-12 22:52:22 +02:00
johnyma22 3c02222b03 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-06-12 20:35:36 +01:00
John McLear a19ea71cf4 Merge pull request #775 from jhollinger/master 
Fix npm version
 2012-06-12 09:01:36 -07:00