Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
1a8462fb4f
remove unused variable
2015-12-01 17:40:16 +00:00
John McLear
4ae88b2ee7
Hook for export ocnvert control
2015-12-01 17:38:52 +00:00
John McLear
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
John McLear
50171a4c3c
Merge pull request #2805 from storytouch/indentationSetting
...
Create setting to control if a new line will be indented or not
2015-10-22 16:12:07 +01:00
John McLear
5652adb4eb
Merge pull request #2813 from simong/export-libreoffice
...
Allow LibreOffice to be used when exporting a pad
2015-10-22 16:11:26 +01:00
Simon Gaeremynck
2bfc3026d2
Allow LibreOffice to be used when exporting a pad
...
This commit adds support for LibreOffice when exporting a pad to doc, pdf, ..
This commit also cleans up some export logic when exporting to txt
2015-10-20 19:46:08 +01:00
Ted Mielczarek
a675659dc2
Add an appendText API
2015-10-19 15:27:09 -04:00
Luiza Pagliari
5deb06d589
Create setting to control if a new line will be indented or not
...
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
2015-10-13 18:39:23 -03:00
Stefan
9d29b15def
Merge pull request #2730 from emilyxxie/clientready_hook
...
added clientReady hook
2015-10-10 13:30:36 +02:00
webzwo0i
1ee1f818db
if granularity is negative, endNum is negative and loop
2015-10-09 14:55:59 +02:00
webzwo0i
31f7c7e0f2
check if ChangesetRequest granularity is a number ( #2796 )
2015-10-09 14:55:19 +02:00
Stefan
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
Emily Xie
21f0d12d31
clientReady hook- pass entire message, updated doc
2015-07-20 11:45:41 -04:00
Clark Boylan
1060595676
Check for valid session in handleUserInfoUpdate
...
Address issue 2674 by checking that the session is valid and has a valid
author and padId before using it to update the userInfo for that
session. Otherwise it is possible that by the time we try to update a
session with new userInfo that session has disconnected and is no longer
available to be updated. Without this commit the etherpad-lite service
gracefully shutsdown whenever this happens.
2015-06-24 15:18:35 -07:00
Xavid
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
John McLear
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
Simon Gaeremynck
786b43efc8
Tidy HTML before trying to convert it with abiword
2015-05-18 16:24:41 +01:00
John McLear
4938c7be38
plugins always return html so use that endpoint
2015-04-29 20:54:41 +01:00
John McLear
e3f95d0c9c
Merge pull request #2604 from ether/pad-options
...
session key is now ignored and also padOptions are available in settings
2015-04-11 22:33:46 +01:00
John McLear
8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
Tom Hunkapiller
a896d67e8c
make setPadRaw async; streamline .etherpad file import handling chain
2015-04-11 12:02:19 -05:00
Tom Hunkapiller
fd1d285a77
fix the rest of the deprecation warnings
2015-04-10 14:18:30 -05:00
Tom Hunkapiller
d0b39c01fb
update for express 4.x
2015-04-08 23:12:11 -05:00
John McLear
ee5833b9c6
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-02 00:05:25 +01:00
John McLear
27ae48686d
reintroduce removed api points that were removed by mistake
2015-04-01 13:56:52 +01:00
John McLear
32a09ff461
tests and fix up sloppy code by original author
2015-04-01 13:52:56 +01:00
John McLear
c705a058fb
Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api
2015-04-01 13:32:07 +01:00
John McLear
fef746e80e
fix import issue with txt files and abiword #2572
2015-04-01 00:19:42 +01:00
John McLear
b404af7c17
Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition
...
do not crash when encountering mismatched compositions. log the changese...
2015-03-31 23:17:51 +01:00
webzwo0i
f249b42ab4
empty author should be allowed to support clearAuthorship functionality
2015-03-03 16:39:14 +01:00
webzwo0i
0693c0ae97
- operator do not show up in the attribs of a pad, but authors could still leak to the pool
2015-03-03 15:37:56 +01:00
webzwo0i
01cd82427a
check author in = operator
2015-03-03 15:20:33 +01:00
webzwo0i
0f82cd8711
print revision numbers - not changesets - in warn-log
2015-03-02 11:14:24 +01:00
webzwo0i
683c9dfb7c
callback with argument error in async.series instead
2015-03-02 11:05:33 +01:00
webzwo0i
7719117e1e
do not crash when encountering mismatched compositions. log the changesets and padid
2015-02-26 14:57:49 +01:00
Luc Didry
845788c39d
Add a saveRevision API function
...
Calling saveRevision create an author which name is "API"
2015-02-25 01:04:27 +01:00
Luc Didry
a08c50a77d
Fixes #1870
...
Add two functions to API :
* getSavedRevisionsCount
* listSavedRevisions
2015-02-24 23:42:35 +01:00
Mike DeRosa
4c6bd37286
Adding api call for appending a chat message.
2015-02-09 00:18:12 -05:00
webzwo0i
6b0cf29af6
Stop processing a message without auth (i.e. a client did not send
...
CLIENT_READY)
2015-01-24 06:34:41 +01:00
John McLear
cadb83ac5a
bumpage
2015-01-19 02:51:32 +00:00
John McLear
17ce67d936
final html export hook
2015-01-06 16:31:52 +00:00
John McLear
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
Stefan
c20a7e9bce
Merge pull request #2406 from Gared/fix/author-not-set-callback
...
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-30 14:55:49 +01:00
John McLear
a07d1722fc
no errors on chrome client
2014-12-30 12:12:24 +01:00
John McLear
5ba3cab445
better take some responsibility
2014-12-30 00:13:01 +01:00
John McLear
ac4f9eb4ce
licensing
2014-12-30 00:12:26 +01:00
John McLear
99a239fa9a
remove console log
2014-12-30 00:10:08 +01:00
John McLear
b8648b4a49
remove error logging
2014-12-29 23:08:42 +01:00
John McLear
a6400b3f61
allow only for pads less than 10 to be overwritten
2014-12-29 22:02:24 +01:00
