John McLear
152f51aeab
Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-count
...
Fixes #1870
2015-02-27 12:03:03 +00:00
webzwo0i
7719117e1e
do not crash when encountering mismatched compositions. log the changesets and padid
2015-02-26 14:57:49 +01:00
John McLear
178309e10d
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-02-26 12:13:41 +00:00
Luc Didry
92022e493e
Add backend tests for new API functions
...
These new functions are:
* getSavedRevisionsCount
* listSavedRevisions
* saveRevision
+ typo fixing in backend tests
2015-02-25 01:05:58 +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
John McLear
470b0ba2a6
Merge pull request #2520 from ether/load-testing-settings
...
allow for load testing connections to hit by a setting
2015-02-22 14:41:09 +00:00
John McLear
d5bec1701e
fix export of bad pads and also limit import to files
2015-02-21 12:33:30 +00:00
John McLear
ec6a2b5ba9
allow for load testing connections to hit by a setting
2015-02-16 23:02:19 +00:00
webzwo0i
37924e441a
add try-catch clause around calls to applyToAText
2015-02-16 09:01:30 +01:00
webzwo0i
59328aa33a
Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of"
...
This reverts commit 66582b19e7
.
2015-02-16 06:22:49 +01:00
webzwo0i
66582b19e7
51c14d9947
changed the return value of
...
applyToText to an array that includes if there was an error in the
newline part of an changeset op.
easysync_tests need to know this too
2015-02-15 16:21:07 +01:00
John McLear
ddc69831b2
working, need to test though
2015-02-11 17:59:05 +00:00
Mike DeRosa
4c6bd37286
Adding api call for appending a chat message.
2015-02-09 00:18:12 -05:00
John McLear
b9802616b6
use latest cleanCSS
2015-02-04 17:57:34 +00:00
Stefan
4c64b7a670
Revert 'asyncLineHTMLForExport' hook
2015-01-25 22:08:40 +01:00
John McLear
aca745ddf6
tell installer if old etherpad needs updating during plugin install
2015-01-25 02:44:10 +00:00
John McLear
831151cfba
Merge pull request #2487 from ether/html-e-hook
...
Better HTML Export rewrite hook allows functions to be passed instead of strings means state is saved between plugins
2015-01-25 00:07:34 +00:00
John McLear
c798a27ad8
boop
2015-01-24 13:39:45 +00: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
1890ba3976
working, might need polish its pretty late
2015-01-24 05:14:38 +00:00
John McLear
9abb85799c
realization how aCallAll works
2015-01-24 04:31:50 +00:00
John McLear
372063295f
beginning of a hook, needs docs etc
2015-01-24 04:09:13 +00:00
John McLear
6fd0285d4d
include lineContent in hok
2015-01-21 21:36:11 +00:00
John McLear
cb65224997
better logic for author handling
2015-01-21 00:28:00 +00:00
John McLear
5f9bbd0666
restrict expor4t to only expose this pad ID
2015-01-21 00:03:39 +00:00
John McLear
4f637befeb
more fixing
2015-01-19 02:59:17 +00:00
John McLear
85fffbe14c
more handling
2015-01-19 02:57:10 +00:00
John McLear
cadb83ac5a
bumpage
2015-01-19 02:51:32 +00:00
John McLear
6bc74a9adb
more export logic handling
2015-01-18 23:33:29 +00:00
John McLear
e50ea6ffea
whoops proper regexp fix for listNumber
2015-01-18 23:24:20 +00:00
John McLear
bd9ff770fe
reset all numbers on first item
2015-01-18 23:21:34 +00:00
John McLear
af70902bef
support deeper nested elements on exports
2015-01-18 23:16:58 +00:00
John McLear
689ced8443
and this one..
2015-01-18 20:15:17 +00:00
John McLear
a553b44dbc
refix plugins
2015-01-11 23:59:18 +00:00
Timothy Gu
9b9a747167
Support ejs 2.0
...
Fixes #2437 .
This is still relying on undocumented behavior, but should unbreak the app
in the mean time.
2015-01-11 08:17:17 -08:00
John McLear
17ce67d936
final html export hook
2015-01-06 16:31:52 +00:00
John McLear
26c839063f
check file system that abiword exists
2015-01-04 14:47:08 +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
John McLear
4b6df17e99
Merge pull request #2421 from webzwo0i/fix-swagger
...
hack to avoid warnings in swagger usage
2014-12-31 13:27:00 +00:00
John McLear
01c667aa2e
export html more styles
2014-12-31 00:53:20 +00:00
webzwo0i
b0da214ad5
hack to avoid warnings in swagger usage
2014-12-30 18:06:41 +01: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
90e83ed6b5
more styling
2014-12-30 14:53:44 +01:00
John McLear
716b1c6113
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-30 14:44:55 +01:00
John McLear
16713d8b3b
some demo export loic for handling OL incrementation
2014-12-30 14:43:00 +01:00
John McLear
4687d226c6
Merge pull request #2417 from webzwo0i/fix-export
...
Fix ExportHtml.js list parsing code
2014-12-30 13:47:31 +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
0676d2fe24
working author import
2014-12-30 00:01:15 +01:00
John McLear
b8648b4a49
remove error logging
2014-12-29 23:08:42 +01:00
John McLear
1e0de620be
more author logic
2014-12-29 23:08:17 +01:00
John McLear
ec2b844f94
authors
2014-12-29 22:51:31 +01:00
John McLear
a6400b3f61
allow only for pads less than 10 to be overwritten
2014-12-29 22:02:24 +01:00
John McLear
ab5e7381a2
working for all files
2014-12-29 21:35:10 +01:00
John McLear
1081156f13
whoopsi, required files
2014-12-29 21:13:49 +01:00
John McLear
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
webzwo0i
6e4e034e42
fix closing of lists
2014-12-29 16:27:40 +01:00
John McLear
302ceb665b
delay write to fix copypad -- bad practice but due to db.set not allowing callback
2014-12-29 14:59:22 +01:00
John McLear
3fe802077c
Merge pull request #2091 from webzwo0i/disconnect-if-an-old-cs-is-submitted-twice
...
disconnect client if it submits an already accepted changeset based on a...
2014-12-29 02:01:03 +01:00
John McLear
c4959b089f
resolve merge conflict
2014-12-29 01:54:44 +01:00
John McLear
8603fb4583
fix sockets of switch to pad
2014-12-29 00:46:47 +01:00
John McLear
6b1fee400d
Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest
2014-12-29 00:40:07 +01:00
webzwo0i
6ca2c91fdf
close and open lists according to the actual line.listLevel
2014-12-28 02:32:53 +01:00
webzwo0i
d71b11f4b2
fix export of lists with bullets; <li> are closed before the next list starts. also, when closing, ensure that list-items are not nested
2014-12-28 02:31:26 +01:00
John McLear
dd09f6144b
Merge pull request #2398 from ether/indentLevels
...
Indent levels
2014-12-27 23:27:11 +01:00
Gared
9cf19b99fe
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-27 22:25:24 +01:00
John McLear
7df944b3fd
Merge pull request #2404 from webzwo0i/sanity-in-atext
...
block changeset if it deletes more lines than exist in the whole pad
2014-12-27 18:36:13 +01:00
Stefan
a645aeef5c
Merge pull request #2400 from Gared/fix/author-not-set
...
Prevent server crash if author is not set
2014-12-27 16:15:26 +01:00
Gared
40c7ee9df9
Prevent server crash if author is not set
2014-12-27 14:26:05 +01:00
John McLear
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
John McLear
6ac99ab03f
support for export
2014-12-27 13:27:07 +01:00
John McLear
fdc930de3d
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:43:21 +00:00
John McLear
ee3f3b8060
move clean css back to fix minification on TS
2014-12-21 23:42:56 +00:00
John McLear
12aac2d0d0
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:12:59 +00:00
webzwo0i
69bad8b30c
fix typo in addSavedRevisions
2014-12-17 01:10:20 +01:00
webzwo0i
b204aa2085
remove more dead requires.
2014-12-16 19:10:01 +01:00
John McLear
cfa3f15f94
Merge pull request #2373 from webzwo0i/avoid-global-vairables
...
dont make local variables global
2014-12-16 00:41:41 +00:00
webzwo0i
5d15f655f0
dont make local variables global
2014-12-14 22:01:28 +01:00
John McLear
197a41627d
allow plugins to add multiple styles
2014-12-09 17:34:52 +00:00
John McLear
3a2669b704
additional tag support hook
2014-12-09 16:13:52 +00:00
John McLear
f2c155ee1a
blah use async
2014-12-08 19:44:40 +00:00
John McLear
7cf0e4a9ae
allow padId to be passed into the hook
2014-12-08 19:11:45 +00:00
John McLear
2218cbd252
docs
2014-12-08 19:08:12 +00:00
webzwo0i
5306f0c98a
wrap appendRevision in try-catch block
2014-12-04 16:05:02 +01:00
John McLear
6fea3a25f8
stop death on no session
2014-11-30 21:21:58 +00:00
John McLear
12f25d8a45
bump cleancss
2014-11-29 01:31:04 +00:00
John McLear
3bf9f3cf1d
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 17:43:01 +00:00
John McLear
c13301966f
yeah need htis too
2014-11-27 02:56:42 +00:00
John McLear
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
John McLear
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
John McLear
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
John McLear
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
John McLear
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
luto
5c3874c0a1
really recreate socketio-client in expressCreateServer, fixes #2342
...
When using plugins, the express server gets restarted. When we do that,
the socketio-server should also get restarted. It doesn't. That means
that all the events in SocketIORouter.js are bound twice, which causes
chaos all over etherpad.
This changes our socketio.js so it fully recreates the io-instance when
we restart the server.
introduced in 95e7b0f156
, but catching
that would have been hard.
2014-11-25 22:38:22 +01:00
John McLear
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
John McLear
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
John McLear
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00