34fdfcb253
Merge pull request #840 from redhog/master
...
Bugfix for readonly timeslider
2012-07-05 10:34:55 -07:00
17b6103a3d
Bugfix for broken readonly timeslider
2012-07-05 19:33:20 +02:00
d18bb81aad
Correct casing
2012-07-05 20:33:11 +03:00
f9805102f1
actually fix run script ;)
2012-07-05 18:30:59 +01:00
4c928a8aac
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-07-05 18:12:35 +01:00
84ee5c901d
Merge pull request #839 from marcelklehr/fix-run.sh
...
Fix run.sh
2012-07-05 10:12:16 -07:00
5195f685e2
Correct error message.
2012-07-05 19:08:20 +02:00
f15ffbb5e4
Allow v0.6.0 on UNIX
2012-07-05 19:02:20 +02:00
35bf5d17c0
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-07-05 17:55:30 +01:00
bc15ea5c15
Merge pull request #829 from marcelklehr/support-node-0.8
...
Support node 0.8
2012-07-05 09:54:25 -07:00
56a5c86e73
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-07-05 17:53:50 +01:00
071ddefc39
Merge pull request #838 from redhog/master
...
Bug workaround for plugin manager
2012-07-05 09:53:17 -07:00
799a5768c7
Quick hack to hide ep_etherpad-lite in plugin list
2012-07-05 18:13:29 +02:00
42bbbd426f
Add latest versions of async, express and connect.
2012-07-05 18:11:18 +02:00
c01aaeefc1
Allow node v0.6.x and 0.8.x
2012-07-05 17:34:23 +02:00
31ef973c33
Merge pull request #826 from marcelklehr/remove-windows-settings-json
...
Remove windows settings json
2012-07-05 08:13:03 -07:00
9bfd5762b0
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-07-05 16:12:15 +01:00
d59956b7da
Merge pull request #837 from redhog/master
...
Changes from pita/master not in develop :(
2012-07-03 14:58:51 -07:00
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
e0622aaa8a
Merge pull request #835 from redhog/restartserver
...
Makes plugin install/uninstall restart Express&socket.io
2012-07-03 14:42:33 -07:00
a0548af021
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into restartserver
2012-07-03 23:32:37 +02:00
b438a278a1
Make the server restart on plugin install
2012-07-03 23:31:44 +02:00
d56135476e
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-07-03 10:28:05 +01:00
35c24c1191
Merge pull request #833 from MarkTraceur/develop
...
Don't rewrite in a stupid way
2012-07-03 01:53:19 -07:00
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
02ce537c68
Use node v0.8.1 / allow node v0.8
2012-06-30 20:20:05 +02:00
9d35b51500
Replace path.exists with fs.exists
2012-06-30 18:57:59 +02:00
afa107e809
Merge pull request #827 from MarkTraceur/develop
...
Add in padUsersCount method and API call
2012-06-29 13:45:45 -07:00
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
d1dc0237d3
Remove settings.json.template_windows
...
Use settings.json.template
2012-06-29 16:28:05 +02:00
c0c820c760
Merge pull request #824 from marcelklehr/fix-windows-install-fix
...
Fix windows install [important]
2012-06-29 07:12:22 -07:00
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
227477967f
Fix plugin loader
...
make it work on client side and with relative paths
2012-06-29 12:40:16 +02:00
de9b3c3975
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-06-28 15:16:29 +01:00
f891534258
Merge pull request #822 from marcelklehr/fix-windows-install
...
Fix windows install
2012-06-28 07:16:11 -07:00
c0ee0d8430
Add windows install script
2012-06-28 15:58:39 +02:00
b0d369883b
Fix plugin loader to work with windows paths (e.g. 'D:\foo\...')
2012-06-28 15:58:28 +02:00
711dee8f6b
Merge pull request #821 from marcelklehr/fix-contributor-api-methods
...
Fix contributor api methods
2012-06-27 12:12:41 -07:00
93b50d4a29
Some fixes to the contributor API methods
...
Mostly these are coding style adjustments
2012-06-27 21:02:41 +02:00
a717c11ab3
Merge pull request #819 from marcelklehr/contributor-api-methods
...
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
2012-06-27 11:31:25 -07:00
b466e37917
Merge pull request #820 from MarkTraceur/develop
...
Add in getLastEdited API call
2012-06-27 11:21:53 -07:00
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
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
0bc01feb72
Merge pull request #818 from MarkTraceur/kick-on-deauth
...
Kick on deauth
2012-06-26 16:09:14 -07:00
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
3d9a2360be
Merge pull request #817 from MarkTraceur/kick-on-deauth
...
Kick on deauth
2012-06-26 16:01:40 -07:00
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
e23a9bff73
Merge pull request #816 from MarkTraceur/develop
...
Add in a new hook for handleMessage
2012-06-26 15:40:17 -07:00
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
e4ff4021ab
Merge pull request #810 from redhog/aceEditEvent
...
Plugin/hook features&bugfixes
2012-06-22 03:53:50 -07:00
John McLear