libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1777 commits 2 branches 0 tags 24 MiB
Commit graph

1777 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
John McLear
638e4cf9d3 Merge pull request #774 from jhollinger/develop 
Fix npm version
 2012-06-12 08:59:40 -07:00
Jordan Hollinger
23075138b9 Lock down npm version to avaoid bug in later version 2012-06-12 11:03:09 -04:00
Jordan Hollinger
e0540122fe Lock down npm version to avaoid bug in later version 2012-06-12 10:59:11 -04:00
John McLear
5d6c80c55d Merge pull request #772 from jhollinger/develop 
Bugfix to setHTML
 2012-06-12 07:47:05 -07:00
John McLear
3811a844a9 Merge pull request #773 from jhollinger/master 
Bugfix to setHTML
 2012-06-12 07:47:03 -07:00
Jordan Hollinger
b118903f4e Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768 2012-06-11 23:34:28 -04:00
Jordan Hollinger
486f7c904e Bugfix to setHTML - it was ignoring the last letter of each line. fixes issue #768 2012-06-11 23:33:17 -04:00
John McLear
2f8aa26864 Merge pull request #767 from jhollinger/master 
Bugfix to setHTML
 2012-06-09 08:33:35 -07:00
Jordan Hollinger
6653a3b6f0 Bugfix to setPadHTML. resolves #764 2012-06-09 11:32:05 -04:00
John McLear
d83e1d5b71 Merge pull request #765 from jhollinger/develop 
Fix setHTML in API
 2012-06-09 08:24:11 -07:00
Jordan Hollinger
d5faefdeae Bugfix to setPadHTML. resolves #764 2012-06-09 10:53:51 -04:00
Clark Boylan
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
Egil Moeller
3338db9485 Bugfixes 2012-06-05 13:32:33 +02:00
johnyma22
63588bd11a Merge branch 'master' of https://github.com/Pita/etherpad-lite into develop 2012-06-04 14:18:16 +01:00
johnyma22
de90f0db4e Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-06-04 14:18:11 +01:00
John McLear
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
Egil Moeller
cf2f0b72a3 More plugin information 2012-06-04 14:33:38 +02:00
John McLear
e23da5127b No longer need bin/installDeps.sh 2012-05-30 23:59:06 +02:00
Egil Moeller
3e44b0e0d5 Merge branch 'timeslider-realtimeupdate+readonly-pads' 2012-05-30 23:01:47 +02:00
John McLear
dc678a458f Merge pull request #746 from redhog/timeslider-realtimeupdate+readonly-pads 
Timeslider realtimeupdate+readonly pads
 2012-05-30 11:07:25 -07:00
Egil Moeller
7ca7a5c3fa Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 2012-05-30 19:31:33 +02:00
Egil Moeller
ad68a6e3bf Bugfix for Chads new toolbar styling 2012-05-30 17:41:43 +02:00
Egil Moeller
27f25b8c61 Added hook to catch edit events 2012-05-30 17:18:43 +02:00
John McLear
f032cddf66 Merge pull request #743 from redhog/master 
Bugfix for aceInitInnerdocbodyHead broken by jquery packaging commit
 2012-05-30 04:59:26 -07:00
Egil Moeller
357ca73a99 Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication. 2012-05-30 10:00:36 +02:00
John McLear
afb868fd2b Update CHANGELOG.md 2012-05-30 00:20:03 +02:00
Peter 'Pita' Martischka
96877bc2b6 Merge branch 'develop' 2012-05-29 21:48:48 +01:00
Egil Moeller
15a7d24450 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 
Conflicts:
	src/node/handler/PadMessageHandler.js
	src/static/css/pad.css
	src/templates/pad.html
 2012-05-29 21:26:12 +02:00
John McLear
dfd81b79d4 Merge pull request #738 from cweider/packaging 
Packaging
 2012-05-28 17:08:23 -07:00
Chad Weider
819fb76dcd These definitions are meaningless. 2012-05-28 16:43:20 -07:00