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
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
2a86d57e46
Add ability to export specific pad revisions
2011-12-18 00:18:35 -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
40c5e70aa7
Add DokuWiki export
2011-12-07 13:03:08 +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
71fee11656
add the ability to set global password with http basic auth
2011-12-01 16:44:51 +01:00
3aacc0a1eb
Merge pull request #222 from jhollinger/master
...
API-only access, per issue #150
2011-11-26 12:22:04 -08:00
7296913cb0
fixed merge confilicts
2011-11-25 16:56:08 -08: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
5e7c5d5dd3
Add editOnly option
2011-11-21 12:44:33 -05:00
9850ba43ee
Implement a 'requireSession' mode, which requires any user to have a valid session
2011-11-21 01:45:37 -05: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
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
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
e4481ea22b
Allow to get the HTML of the pad with the API
2011-10-31 11:19:51 +01:00
307d0acdeb
put expolorer canvas into minify
2011-08-21 19:20:18 +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
a47ada46d7
forgot to change the default settings in Settings.js
2011-08-17 19:26:56 +01:00
3ec7dc224b
added a loglevel setting
2011-08-17 17:45:47 +01:00
1151ec3278
Merge branch 'api' of ../etherpad-lite.dev/
2011-08-16 17:22:15 +01:00
da7ddfb5d7
fixed #84 Import bug
2011-08-16 13:40:01 +01:00
b300dc1d2c
fixed merge conflicts
2011-08-13 22:18:42 +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
0e4a54328a
fixed #61
2011-08-10 17:48:36 +01:00
dc10985ba3
beautify exporthtml
2011-08-10 17:31:20 +01:00
1a824bd130
Merge branch 'master' of .git into api
2011-08-09 11:08:27 +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
39b5f57d4e
Let settings warnings output as warnings, not as an error
2011-08-03 19:30:45 +01:00
b30849c2f2
Installed log4js as logging framework
2011-07-31 18:25:51 +01:00
5306a88214
added the ability to listen at a specific ip
2011-07-30 16:39:53 +01:00
Peter 'Pita' Martischka