mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 08:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26
1636 commits 213 branches 107 tags 72 MiB
Commit graph

359 commits

Author SHA1 Message Date
Wikinaut
1e092e3ed4 use socket.io with jsonp-polling. several browsers tested. fixes IE8 issues 2012-08-27 00:39:56 +02:00
Wikinaut
aa1d2ba1a1 fix issue #955: upd resolve library to 0.2.3 2012-08-27 00:39:56 +02:00
Wikinaut
4cf5f2b12c fix for all IE8 issues when IE8 setting NATIVE XMLHHTP SUPPORT is disabled 2012-08-27 00:37:50 +02:00
Jordan Hollinger
a7dd620b9f Don't crash if setText isn't passed any text. issue #861 2012-07-10 00:53:55 -04:00
Marcel Klehr
af3c57a120 Load npm to enable server to see the git revision. 2012-07-08 11:37:24 +02:00
Matthias Bartelmeß
9ff3aa0ee0 make /static/tests.html functional again, 
added getLastEdited
 2012-07-07 20:41:26 +02:00
Jordan Hollinger
6d5fe459f0 Bugfix to getLastEdited API method, issue #845 2012-07-07 13:22:27 -04:00
John McLear
34fdfcb253 Merge pull request #840 from redhog/master 
Bugfix for readonly timeslider
 2012-07-05 10:34:55 -07:00
Egil Moeller
17b6103a3d Bugfix for broken readonly timeslider 2012-07-05 19:33:20 +02:00
John McLear
bc15ea5c15 Merge pull request #829 from marcelklehr/support-node-0.8 
Support node 0.8
 2012-07-05 09:54:25 -07:00
Egil Moeller
799a5768c7 Quick hack to hide ep_etherpad-lite in plugin list 2012-07-05 18:13:29 +02:00
Marcel Klehr
42bbbd426f Add latest versions of async, express and connect. 2012-07-05 18:11:18 +02:00
Marcel Klehr
c01aaeefc1 Allow node v0.6.x and 0.8.x 2012-07-05 17:34:23 +02: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
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
Marcel Klehr
9d35b51500 Replace path.exists with fs.exists 2012-06-30 18:57:59 +02: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
227477967f Fix plugin loader 
make it work on client side and with relative paths
 2012-06-29 12:40:16 +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
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
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
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
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
Jordan Hollinger
23075138b9 Lock down npm version to avaoid bug in later version 2012-06-12 11:03:09 -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
Jordan Hollinger
d5faefdeae Bugfix to setPadHTML. resolves #764 2012-06-09 10:53:51 -04:00
Egil Moeller
3338db9485 Bugfixes 2012-06-05 13:32:33 +02:00
Egil Moeller
cf2f0b72a3 More plugin information 2012-06-04 14:33:38 +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
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
Egil Moeller
357ca73a99 Bugfix for bug introduced by 96ab3dc3b4: jQuery is packaged - this is pure duplication. 2012-05-30 10:00:36 +02: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
Chad Weider
a28bbd0b3f Definition will not have an effect if already defined - force redefinition. 2012-05-28 16:43:20 -07:00
Chad Weider
774e2a1517 Fix indentation. 2012-05-28 16:43:20 -07:00