9c91f16c71
Improve inlining of editor content.
...
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
f4dca37a93
Ordered list support
2012-01-15 17:20:20 +00:00
77804673d7
Move packaging info into its own file.
2012-01-15 01:52:58 -08:00
387dd4a48b
The value of all href attributes is escaped.
2012-01-14 14:50:23 -08:00
6e36b59a59
All escaping functions replace HTML reserved characters.
2012-01-14 14:46:15 -08:00
642b716553
Merge pull request #289 from jhollinger/no_spaces
...
Sanitize pad names
2012-01-08 07:30:07 -08:00
86902c2c0b
Merge pull request #291 from jhollinger/export_revisions
...
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
7dcc7be8e0
get the proper git revision even when not started from node dir
2012-01-05 11:44:08 +01:00
b1faa8e0f8
Make sure Minify.js finds its files
2012-01-05 11:44:07 +01:00
33ffda19b1
Load the settings even when not starting in node path
2012-01-05 11:44:07 +01:00
7c84d8cc74
Bugfix to API calling indexOf on an undefined padID
2011-12-22 00:22:36 -05: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
609701961e
Added some comments to help us documentating the code
2011-12-11 19:45:40 +01: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
49006a3b6a
Don't make the globalPads too global ;)
2011-12-08 23:32:51 +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
8a6704beef
reduced the httpAuth timeout to 1000ms
2011-12-04 17:27:36 +01:00
a4eef2780e
Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth
2011-12-04 17:22:00 +01:00
bfbdac10d3
fixed #250
2011-12-04 17:09:31 +01:00
5c56e62d67
Changed all error handling to async-stacktrace style + fixed import/export on unix
2011-12-04 16:50:02 +01:00
db1ba6a65e
Don't let express catch errors, let the process die
2011-12-04 15:19:24 +01:00
e44b41f4a3
Fixed the easysync test
2011-12-03 21:32:52 +01:00
71fee11656
add the ability to set global password with http basic auth
2011-12-01 16:44:51 +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
3aacc0a1eb
Merge pull request #222 from jhollinger/master
...
API-only access, per issue #150
2011-11-26 12:22:04 -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
97e9eb84af
fix for #224
2011-11-25 13:39:33 -05:00
943f8c4682
Stupid syntax error due to last minute refactoring
2011-11-22 16:09:27 +01:00
e6de06b103
Transform multiline HTML into a single line stream to avoid spurious lines in the final result
2011-11-22 10:09:10 +01:00
6297e628eb
Permissions checks on pad and timeslider in server.js are redudant
2011-11-21 15:51:54 -05:00
5e7c5d5dd3
Add editOnly option
2011-11-21 12:44:33 -05:00
90e9d552f0
fix issue with newline in APIKEY.txt when checking api key
2011-11-21 16:39:54 +01:00
9850ba43ee
Implement a 'requireSession' mode, which requires any user to have a valid session
2011-11-21 01:45:37 -05:00
2e79bd50a3
fixed socket.io logging
2011-11-19 14:14:31 -08:00
2f16dff0ba
Merge branch 'master' of https://github.com/jhollinger/etherpad-lite
2011-11-19 12:08:57 -08: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
411984787a
Implement POST requests for HTTP API
2011-11-18 21:52:12 -05:00
a26918c69e
Hook the ImportHtml module into the API
2011-11-17 10:26:32 +01:00
9fe6c11d87
Main implementation of the setHTML API
2011-11-17 10:26:32 +01:00
09cb367d8e
The contentcollector code is harder to adapt since it has the Changeset module as a dependency
2011-11-17 10:26:32 +01:00
6d190f517e
Merge pull request #184 from thomasf/issue158
...
Kind of a hack but fixes issue #158
2011-11-14 21:35:37 -08: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
f6165eb2ea
Fixed another bug that breaked the abiword parser
2011-11-05 19:34:01 +01:00
90ba811bb5
Fixed a bug that creates invalid HTML at Export that lets Abiwords parser crash
2011-11-04 03:15:26 +01:00
73711abd97
Added comments
2011-11-03 07:34:51 +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
8223f84714
Kind of a hack but makes issue #158 go away.
...
There is probably a deeper error somewhere in either log4js or express, I don't have the time to investigate that atm.
2011-10-17 23:31:39 +02:00
2d3272e3b6
make globalPads into an ad-hoc Object that can store values with arbitrary names. Fixes issue #160 .
2011-09-30 00:41:46 -04:00
7557af3db7
Fix directory traversal fixing RegExp
2011-09-01 23:49:52 +02:00
86d3b2ba81
Fix directory traversal
...
See https://ada.adrianlang.de/etherpad-lite-directory-traversal
2011-09-01 23:27:18 +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
8d12c3d7ee
added a link to the bugtracker
2011-08-21 19:52:24 +01:00
d85eeee5f4
check pad access on read only
2011-08-21 19:43:42 +01:00
307d0acdeb
put expolorer canvas into minify
2011-08-21 19:20:18 +01:00
4d7c8a2c7d
added ability to set a custom favicon
2011-08-20 19:27:41 +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
9d37d91ce1
added a colorPicker
2011-08-20 18:22:10 +01:00
3c6ca617f6
show git version on start
2011-08-19 22:01:33 +01:00
b9c1b45a8b
added utf8 to content type of api responses, thx @0ip
2011-08-19 21:57:15 +01:00
82dd4802d7
fixed a API Bug
2011-08-19 21:35:31 +01:00
caecfd3997
PITA, Y U NO TEST?
2011-08-18 21:29:34 +01:00
ef6a75ca54
don't do a graceful shutdown on SIGINT on windows
2011-08-18 21:02:54 +01:00
ad1e8fb4f8
limit the graceful shutdown time to 3 seconds
2011-08-18 20:54:04 +01:00
2dd82f82de
since we set a global lock level, we can log socket.io debug messages
2011-08-18 13:40:30 +01:00
4554c32e64
show the last 100 chat messages, instead of the last 20
2011-08-17 20:04:28 +01:00
a47ada46d7
forgot to change the default settings in Settings.js
2011-08-17 19:26:56 +01:00
c2457e06d8
send client side javascript errors to the server
2011-08-17 19:24:44 +01:00
b58bdb4e4d
support jsonp api calls
2011-08-17 18:24:14 +01:00
41883e688b
moved require joose to the correct place
2011-08-17 17:49:05 +01:00
3ec7dc224b
added a loglevel setting
2011-08-17 17:45:47 +01:00
77ba4e3e6c
ensure wrong socketio messages doesn't kill the server
2011-08-17 17:28:30 +01:00
296777ab53
added a graceful shutdown
2011-08-17 15:58:42 +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
5da30a40bf
changed content type of api responses to application/json
2011-08-16 20:06:59 +01:00
d2c502e2be
added deletePad API function
2011-08-16 20:02:30 +01:00
783c192726
ensure password and publicStatus functions are only used with group pads
2011-08-16 18:17:46 +01:00
1151ec3278
Merge branch 'api' of ../etherpad-lite.dev/
2011-08-16 17:22:15 +01:00
3ff34f50d1
added a security control at socketiorouter, pad security is now fully enforced
2011-08-16 15:53:09 +01:00
da7ddfb5d7
fixed #84 Import bug
2011-08-16 13:40:01 +01:00
317370da2c
restricted access to pad import and export
2011-08-15 22:20:37 +01:00
48980f9e19
Show permission messages on the browser side
2011-08-15 18:27:11 +01:00
255dc5a325
fixed merge conflicts
2011-08-15 16:58:22 +01:00
793ef42704
added a error message for invalid padIDs
2011-08-15 15:45:28 +01:00
936a9985e1
use the temp enviroment variable for windows
2011-08-15 15:45:28 +01:00
da6caedb45
fixed abiword on windows
2011-08-15 15:45:28 +01:00
10c2497fcc
Allow cross site export
2011-08-14 14:47:41 +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
4730c3b46e
added a error message for invalid padIDs
2011-08-13 20:20:30 +01:00
3c99e07030
fixed regular expression PadID check
2011-08-13 17:48:36 +01:00
3a77d96c98
use the temp enviroment variable for windows
2011-08-13 13:11:48 +01:00
5252bee124
fixed abiword on windows
2011-08-13 13:02:27 +01:00
0e05e58c76
changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd)
2011-08-11 15:27:16 +01:00
9cc3b543cc
Merge branch 'master' of git://github.com/Pita/etherpad-lite into api
2011-08-10 22:47:50 +01:00
ce1012438e
added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected
2011-08-10 22:44:16 +01:00
292c68a0a5
harmonize different ID types, improved the prefixes
2011-08-10 22:44:08 +01:00
f6b87daa27
added deleteSession
2011-08-10 22:43:58 +01:00
dc15682a27
changed name of getMapped*4 functions to create*IfNotExistsFor
2011-08-10 22:43:38 +01:00
0e4a54328a
fixed #61
2011-08-10 17:48:36 +01:00
dc10985ba3
beautify exporthtml
2011-08-10 17:31:20 +01:00
183d1597c6
clean up
2011-08-09 20:22:39 +01:00
dbf9dc6dfb
added listSessionsOfGroup and listSessionsOfAuthor
2011-08-09 20:14:32 +01:00
4b48380a2f
added createSession and getSessionInfo
2011-08-09 16:45:49 +01:00
f01906d815
added getMappedAuthor4
2011-08-09 14:42:12 +01:00
e336b4f940
added create Author
2011-08-09 12:09:04 +01:00
e6ba60bddc
cleaned up authormanager
2011-08-09 11:55:12 +01:00
1a824bd130
Merge branch 'master' of .git into api
2011-08-09 11:08:27 +01:00
a6df6ab0a7
change api calls from POST to GET
2011-08-08 20:14:01 +01:00
9d91a3873c
added logging for http api calls
2011-08-08 17:45:44 +01:00
4670cbc60a
added the listPads and createGroupPad
2011-08-08 17:35:40 +01:00
8d28fcbf23
ensure server header is also send with the api functions
2011-08-08 17:34:51 +01:00
178b4a95ec
added getMappedGroup4 and createGroup
2011-08-08 16:21:31 +01:00
de0e341b4b
fixed ok response
2011-08-04 19:22:46 +01:00
9fa52c0e66
added createPad
2011-08-04 19:20:14 +01:00
8dabdc8e95
split createPad to createPad and createGroupPad
2011-08-04 18:22:03 +01:00
3e0f30bdde
added getReadOnlyID
2011-08-04 17:40:51 +01:00
7b030710d2
added getRevisionsCount
2011-08-04 17:24:36 +01:00
d5d9830dd3
added setText and simplified getText
2011-08-04 17:18:59 +01:00
820c18c7e9
check the padID with a regular expression
2011-08-04 16:07:58 +01:00
ce725ba6fc
Do not try to spawn a gzip process on windows
2011-08-04 13:42:02 +01:00
53242d4660
use abiword with abicommand under unix, spawn abiword processes under windows
2011-08-04 13:35:42 +01:00
e8d84b6058
Use abiword --to parameter instead of abicommand for document conversions.
2011-08-03 15:57:11 -07:00
f45b7ce9ea
Installed API infrastructure, getText works already
2011-08-03 19:31:25 +01:00
39b5f57d4e
Let settings warnings output as warnings, not as an error
2011-08-03 19:30:45 +01:00
9a71cc4729
replaced tabs with spaces
2011-08-01 18:45:28 +01:00
38fd56a877
bugfix bugfix
2011-07-31 20:32:46 +01:00
b30849c2f2
Installed log4js as logging framework
2011-07-31 18:25:51 +01:00
340fbf4d44
Don't send user timestamps with the clientVars message
2011-07-31 16:16:59 +01:00
73b49e9c25
Do not send the real client ip in the clientVars Message
2011-07-31 16:14:55 +01:00
783203b865
Improved chat message managing
2011-07-31 16:03:53 +01:00
ec0d9c9452
Made the author management more stable
2011-07-31 15:18:55 +01:00
86e81a1648
made a if statement more secure
2011-07-31 15:05:04 +01:00
Chad Weider