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
476cfc8da0
Merge branch 'master' into aceEditEvent
2012-06-22 12:12:15 +02:00
ab467310f5
Merge pull request #803 from ametaireau/postgres-in-settings
...
mention postgres in the default settings
2012-06-20 08:45:03 -07:00
bee9a05ec3
mention postgres in the default settings
2012-06-20 17:36:05 +02:00
4195e11a41
Merge pull request #784 from jhollinger/master
...
Pad name sanitizer shouldn't drop query params
2012-06-13 12:58:30 -07:00
08a00af617
The pad name sanitizer shouldn't drop query params. issue #779
2012-06-13 15:48:58 -04:00
fbcb2bbab8
Merge pull request #783 from jhollinger/develop
...
Pad name sanitizer shouldn't drop query params
2012-06-13 12:22:42 -07:00
6f37c0aaa6
The pad name sanitizer shouldn't drop query params. issue #779
2012-06-13 15:20:29 -04:00
48daf83a30
#763 : Use spaces instead of tabs
2012-06-13 13:56:09 +03:00
b599cdf6e5
Merge pull request #763 from cboylan/fix_padjs_customStart
...
Fix pad.js' customStart.
2012-06-12 14:24:30 -07:00
fae7254175
Merge pull request #777 from cboylan/dev_fix_padjs_customStart
...
Fix pad.js' customStart.
2012-06-12 14:24:03 -07:00
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
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
3c02222b03
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-06-12 20:35:36 +01:00
a19ea71cf4
Merge pull request #775 from jhollinger/master
...
Fix npm version
2012-06-12 09:01:36 -07:00
638e4cf9d3
Merge pull request #774 from jhollinger/develop
...
Fix npm version
2012-06-12 08:59:40 -07:00
23075138b9
Lock down npm version to avaoid bug in later version
2012-06-12 11:03:09 -04:00
e0540122fe
Lock down npm version to avaoid bug in later version
2012-06-12 10:59:11 -04:00
5d6c80c55d
Merge pull request #772 from jhollinger/develop
...
Bugfix to setHTML
2012-06-12 07:47:05 -07:00
3811a844a9
Merge pull request #773 from jhollinger/master
...
Bugfix to setHTML
2012-06-12 07:47:03 -07:00
b118903f4e
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
2012-06-11 23:34:28 -04:00
486f7c904e
Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768
2012-06-11 23:33:17 -04:00
2f8aa26864
Merge pull request #767 from jhollinger/master
...
Bugfix to setHTML
2012-06-09 08:33:35 -07:00
6653a3b6f0
Bugfix to setPadHTML. resolves #764
2012-06-09 11:32:05 -04:00
d83e1d5b71
Merge pull request #765 from jhollinger/develop
...
Fix setHTML in API
2012-06-09 08:24:11 -07:00
d5faefdeae
Bugfix to setPadHTML. resolves #764
2012-06-09 10:53:51 -04:00
ae179ba01d
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-07 10:58:29 -07:00
3338db9485
Bugfixes
2012-06-05 13:32:33 +02:00
63588bd11a
Merge branch 'master' of https://github.com/Pita/etherpad-lite into develop
2012-06-04 14:18:16 +01:00
de90f0db4e
Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop
2012-06-04 14:18:11 +01:00
cc72868636
Merge pull request #757 from redhog/aceEditEvent
...
Ace edit event as hook to modify changes as they happen
2012-06-04 06:17:09 -07:00
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +02:00
e23da5127b
No longer need bin/installDeps.sh
2012-05-30 23:59:06 +02:00
3e44b0e0d5
Merge branch 'timeslider-realtimeupdate+readonly-pads'
2012-05-30 23:01:47 +02:00
johnyma22