d391dab558
fixed merge conflict
2012-01-22 15:23:50 +01:00
a313c2570e
Merge pull request #331 from cweider/packaging-improvement
...
Packaging improvement
2012-01-15 12:48:41 -08:00
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
Peter 'Pita' Martischka