Jordan Wiens
c0daf1aaaf
adding basic numbered list support to dokuwiki export
2012-07-19 00:59:15 -04:00
Matthias Bartelmeß
6b429b2ca1
Merge pull request #851 from marcelklehr/fix-settings.json
...
Fix settings.json
2012-07-17 10:27:18 -07:00
Marcel Klehr
ead379cf66
Merge pull request #853 from fourplusone/feature/async_handleMessage
...
async handle message
2012-07-12 03:50:37 -07:00
Marcel Klehr
dc09323d8f
Don't exit if no settings file was found.
2012-07-11 15:36:41 +02:00
Marcel Klehr
f09dd0f3fb
Put toString() back in.
2012-07-11 15:34:33 +02:00
Marcel Klehr
87f26334d1
Fix typo.
2012-07-10 21:55:35 +02:00
Marcel Klehr
8858446678
Exit on error.
2012-07-10 21:38:14 +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
Matthias Bartelmeß
975171a86b
Make handleMessage async
2012-07-08 21:06:19 +02:00
Marcel Klehr
4c8f69b7c5
Use v8 to parse settings.json
2012-07-08 18:59:46 +02:00
Marcel Klehr
af3c57a120
Load npm to enable server to see the git revision.
2012-07-08 11:37:24 +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
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
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
Jordan Hollinger
6f37c0aaa6
The pad name sanitizer shouldn't drop query params. issue #779
2012-06-13 15:20:29 -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
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +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
Chad Weider
a8340dfbbe
Remove the libraries that are a part of ace2_common package.
2012-05-28 15:14:52 -07:00
John McLear
26614bf2d5
You can't use $ if no jQuery is available.. Apologies for so much spam on this issue, this finally resolves #594
2012-05-23 01:01:50 +02:00
John McLear
d1c2d12150
Import Should now work in IE
2012-05-23 00:52:10 +02:00
John McLear
dafa44e6b4
I hate how hacky this change is.
2012-05-23 00:51:03 +02:00
John McLear
b27287ce37
Update src/node/handler/ImportHandler.js
2012-05-23 00:49:12 +02:00
John McLear
c8b93f6ddc
Fix IE import
2012-05-23 00:46:56 +02:00
Matthias Bartelmeß
06c36f3023
fix #722 by better argument checking in PadMessageHandler.js
2012-05-22 09:31:28 +02:00
John McLear
ee11338927
Merge pull request #709 from cweider/packaging
...
Packaging
2012-05-17 04:59:24 -07:00
Edy
e8639d87ce
fixes issue #707
...
Don't set cached cookies
2012-05-17 12:08:19 +02:00
Chad Weider
9b0e2287aa
Add plugin framwork to common package.
2012-05-14 18:20:16 -07:00
Chad Weider
1a2c6425e1
Extract ace2_common into its own package.
2012-05-14 18:20:16 -07:00
John McLear
916e52a1eb
Merge pull request #609 from prauscher/disable-passwords
...
Disable passwords
2012-05-13 06:55:47 -07:00
John McLear
c70d88eedc
Merge pull request #667 from fourplusone/feature/cleaner_code
...
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
2012-05-13 06:51:58 -07:00
