fe6c5e1cfe
restructured and commented fixes #417 and #360 in order to make code more intuitive
2012-02-17 11:41:41 +01:00
97b7f0707f
Add further checks to make sure sessioninfos[sessionID] is !== undefined
2012-02-16 23:35:00 +01:00
bad920e28d
fixes #417 and #360
2012-02-16 23:11:52 +01:00
363e168561
Share `randomString` method.
...
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
f8f80968ca
Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules.
2012-02-10 14:52:34 -08:00
a300bb6e92
move randomString function into module
2012-01-28 13:24:58 +01:00
c4f9268cfa
make PadMessageHandler more robust against timing issues
2012-01-19 17:38:16 +01:00
642b716553
Merge pull request #289 from jhollinger/no_spaces
...
Sanitize pad names
2012-01-08 07:30:07 -08:00
2a86d57e46
Add ability to export specific pad revisions
2011-12-18 00:18:35 -05:00
e8ef99fb72
Sanitize pad names
2011-12-16 15:41:11 -05:00
c72cd49ede
Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki
2011-12-11 18:09:51 +01:00
6684d6ed52
replaced all stop callbacks with customError callbacks. Fixes #270
2011-12-10 16:46:47 +01:00
40c5e70aa7
Add DokuWiki export
2011-12-07 13:03:08 +01:00
18f90866ae
fixed reconnect
2011-12-04 22:01:49 +01:00
7075fbebe6
fixed a bug in auto reconnect
2011-12-04 19:43:05 +01:00
5c56e62d67
Changed all error handling to async-stacktrace style + fixed import/export on unix
2011-12-04 16:50:02 +01:00
f33af4700b
Merge pull request #242 from jaseg/master
...
Random filename generation fix, made a windows-only delay actually windows-only.
2011-11-26 12:23:44 -08:00
932ad0eeeb
This may fixes the pdf convert issue
2011-11-25 16:58:00 -08:00
7296913cb0
fixed merge confilicts
2011-11-25 16:56:08 -08:00
dc6d0cda68
Merge branch 'master' of github.com:Pita/etherpad-lite
2011-11-25 16:08:24 -08:00
fa098d73cd
Do a reconnect on network problems. After 10s it gives up
2011-11-25 15:26:01 -08:00
90e9d552f0
fix issue with newline in APIKEY.txt when checking api key
2011-11-21 16:39:54 +01:00
54c8e46cdf
Fixed Joes typo commit
2011-11-19 12:07:39 -08:00
0aa56136fe
Fix message typos
2011-11-19 19:21:23 +00:00
a26918c69e
Hook the ImportHtml module into the API
2011-11-17 10:26:32 +01:00
9eac04aaa6
Fixed a huge problem with the sessioninfos array
2011-11-13 20:33:13 -08:00
a5a9592031
Revert "Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message"
...
This reverts commit 0f559347ee
2011-11-13 20:25:22 -08:00
820326dc2b
Output more informations on message dropped
2011-11-12 16:47:01 -08:00
17666339d0
Merge pull request #191 from Yaco-Sistemas/master
...
Get the HTML of a Pad via the API
2011-11-12 15:04:53 -08:00
b0976a292f
Fixed a somewhat quirky random string generator, made another windows-only delay actually windows-only.
2011-11-10 11:39:46 +01:00
4fc4a35381
Spelling fixes in log messages, made a delay windows-only which according to a comment should be windows-only, fixed a random filename generator.
2011-11-09 17:19:59 +01:00
e4481ea22b
Allow to get the HTML of the pad with the API
2011-10-31 11:19:51 +01:00
0f559347ee
Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message
2011-10-19 21:48:36 +02:00
e0cf6098fb
fixing issues with bad import uploads, fixed #186
2011-10-19 21:46:28 +02:00
e771542961
added deleteGroup API function
2011-08-22 13:11:34 +01:00
177abdd29e
Don't show PDF Export on Windows
2011-08-21 20:09:25 +01:00
fdeb2a45e7
Ops, forgot to replace two throws
2011-08-20 18:56:38 +01:00
b9f23fa208
handle bad changesets
2011-08-20 18:51:43 +01:00
42662d73d0
Merge branch 'master' of /home/jose/etherpad-lite/
2011-08-20 18:23:58 +01:00
82dd4802d7
fixed a API Bug
2011-08-19 21:35:31 +01:00
4554c32e64
show the last 100 chat messages, instead of the last 20
2011-08-17 20:04:28 +01:00
77ba4e3e6c
ensure wrong socketio messages doesn't kill the server
2011-08-17 17:28:30 +01:00
5d30c8b4a5
Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue
2011-08-16 21:29:51 +01:00
d2c502e2be
added deletePad API function
2011-08-16 20:02:30 +01:00
3ff34f50d1
added a security control at socketiorouter, pad security is now fully enforced
2011-08-16 15:53:09 +01:00
48980f9e19
Show permission messages on the browser side
2011-08-15 18:27:11 +01:00
b300dc1d2c
fixed merge conflicts
2011-08-13 22:18:42 +01:00
d0e378f63a
added a security manager to control pad access on group pads
2011-08-13 22:07:21 +01:00
3a77d96c98
use the temp enviroment variable for windows
2011-08-13 13:11:48 +01:00
0e05e58c76
changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd)
2011-08-11 15:27:16 +01:00
Matthias Bartelmeß