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 |
|
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 |
|
Egil Moeller
|
e559ef5640
|
Disable design mode in readonly pad
|
2012-04-23 16:41:41 +02:00 |
|
Egil Moeller
|
480d0b8e25
|
ReadOnly pad handling
|
2012-04-23 16:18:14 +02:00 |
|
Egil Moeller
|
e5a22423bb
|
Fixed timedelta problem
|
2012-04-23 14:20:17 +02:00 |
|
Egil Moeller
|
583743a3f9
|
Restored saved revision support
|
2012-04-23 12:58:04 +02:00 |
|
Egil Moeller
|
914d79ad20
|
Unified timeslider and pad editing protocol / component
|
2012-04-23 12:52:30 +02:00 |
|
Matthias Bartelmeß
|
b7a0b36b5e
|
...well stupid error
|
2012-04-08 21:21:30 +02:00 |
|
Matthias Bartelmeß
|
0340c87996
|
Pad message handler detects lineattributemakers by asking Attribute manager
|
2012-04-07 01:05:25 +02:00 |
|
John McLear
|
9ecd864ac6
|
Merge pull request #557 from redhog/master
Templating system built on top of EJS and plugin installer
|
2012-04-02 12:42:38 -07:00 |
|
Egil Moeller
|
33c53e61c2
|
Merge branch 'johnyma22'
Conflicts:
node/utils/Minify.js
src/static/js/pad.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_savedrevs.js
static/css/timeslider.css
static/pad.html
|
2012-04-01 13:27:38 +02:00 |
|
Matthias Bartelmeß
|
daca484747
|
Merge branch 'develop' into objectify_ep
Conflicts:
src/node/utils/tar.json
src/static/js/ace2_inner.js
|
2012-03-27 11:15:48 +02:00 |
|
Matthias Bartelmeß
|
8eb43a3ebf
|
replaceing AttributePoolFactory by AttributePool
|
2012-03-18 09:05:46 +01:00 |
|
Matthias Bartelmeß
|
ede32726c1
|
check if sockets are available in PadMessageHandler
|
2012-03-14 01:32:16 +01:00 |
|
Egil Moeller
|
81440cd856
|
Removed old pluginfw stuff
|
2012-03-01 19:00:58 +01:00 |
|
Egil Moeller
|
35626df77b
|
Send plugin data to client
|
2012-02-29 16:05:44 +01:00 |
|
Egil Moeller
|
a894fcd4f9
|
Removed CommonCode entierly
|
2012-02-28 21:19:10 +01:00 |
|
Egil Moeller
|
763361a7c9
|
First stab at getting client side require(plugin/..) to work from within etherpad
|
2012-02-26 17:48:17 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|