ec6a2b5ba9
allow for load testing connections to hit by a setting
2015-02-16 23:02:19 +00:00
37924e441a
add try-catch clause around calls to applyToAText
2015-02-16 09:01:30 +01:00
c9a5167b41
throw in applyToText and not in applyToAText
2015-02-16 06:27:18 +01:00
59328aa33a
Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of"
...
This reverts commit 66582b19e7
2015-02-16 06:22:49 +01:00
83e1bf0dc4
add semicolons
2015-02-16 03:33:57 +01:00
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
440f74b2c1
we do not have the text/padid, but at least we can print the changeset
2015-02-15 15:47:45 +01:00
b9dd983f81
print the actual text...
2015-02-15 15:27:27 +01:00
c6ef7f4867
string concat, not multiple arguments...
2015-02-15 15:26:07 +01:00
1f6a9afae4
better error message
2015-02-15 15:23:43 +01:00
e7f01fa498
remove unnecessary code; because we have checks in every op now we don't
...
need this anymore
2015-02-15 15:12:24 +01:00
ac2c7e9679
add newline counting for - and + op
2015-02-15 15:09:38 +01:00
b4d4b16b1f
off by 1
2015-02-15 14:56:20 +01:00
4313bd27f8
add a comment to make clear that the string in stringIterator
...
does not change; only curIndex is increased. Newlines are counted
between curIndex and the end of string.
2015-02-15 13:25:57 +01:00
c191a8716e
totally wrong, introduced by myself in
...
3354b9406b
2015-02-14 16:41:50 +01:00
e39b442840
bump v for #2505 fix
2015-02-13 01:25:29 +00:00
d0caebc21f
may aswell make the git sha a link to the commit
2015-02-11 18:05:01 +00:00
ddc69831b2
working, need to test though
2015-02-11 17:59:05 +00:00
275592e423
seems right
2015-02-11 02:07:20 +00:00
0ad09c17db
fix JS error in timeslider if offset doesn't exist
2015-02-09 23:04:30 +00:00
26ae375727
minor css polish for user input
2015-02-09 19:53:32 +00:00
b216f9271b
should be final logic for chatandusers
2015-02-09 19:11:35 +00:00
5245d2b797
and even mroe polish
2015-02-09 18:36:11 +00:00
8c6507e78c
more styling stuff
2015-02-09 18:01:45 +00:00
4af46921e1
better css
2015-02-09 17:37:20 +00:00
4c6bd37286
Adding api call for appending a chat message.
2015-02-09 00:18:12 -05:00
7adcd5cba4
cleaner fix for queue issue
2015-02-08 14:34:48 +00:00
1652ed42c5
fix scroll issue where focus is not well managed
...
remove console logs
2015-02-07 23:26:02 +00:00
b9802616b6
use latest cleanCSS
2015-02-04 17:57:34 +00:00
9afcd89167
bump versions to see if it's stable
2015-02-04 17:52:27 +00:00
35da64be5c
hrm bit of a hack, anyone any ideas on better way?
2015-01-28 19:09:47 +00:00
0216a10a12
better variable name
2015-01-27 20:10:38 +00:00
a9910c741e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-27 19:41:09 +00:00
bdfce1cbef
change to cc..
2015-01-27 19:41:01 +00:00
8fbd7d83b6
content collector should also register the blocks, no idea why this wasnt in before
2015-01-27 19:16:36 +00:00
78c3a8d65b
Localisation updates from https://translatewiki.net .
2015-01-26 22:58:30 +01:00
b6e7ddf874
bump v
2015-01-26 16:11:15 +00:00
4de42da2e3
Merge pull request #2497 from ether/image-support-hook
...
clean support for image hook
2015-01-26 16:07:56 +00:00
c4f1189ebd
even cleaner
2015-01-26 02:39:43 +00:00
18121a1507
much cleaner
2015-01-26 02:32:58 +00:00
8156930208
clean support for image hook
2015-01-26 01:44:40 +00:00
4c64b7a670
Revert 'asyncLineHTMLForExport' hook
2015-01-25 22:08:40 +01:00
aca745ddf6
tell installer if old etherpad needs updating during plugin install
2015-01-25 02:44:10 +00:00
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
f3e5682a0f
fix issue with load of showuserandchat
2015-01-24 18:31:19 +00:00
c798a27ad8
boop
2015-01-24 13:39:45 +00:00
3f08bf7405
Merge pull request #2490 from Gared/https_plugins_json
...
Use https to download plugins.json
2015-01-24 13:34:41 +00:00
85c5cc80d0
Merge pull request #2488 from webzwo0i/fix-session-without-auth-crash
...
Stop processing a message without auth (i.e. a client did not send
2015-01-24 13:15:58 +00:00
da86110f58
Use https to download plugins.json
2015-01-24 12:55:17 +01:00
713b369fc3
Add 'last update' column to plugins table
2015-01-24 12:49:17 +01:00
6b0cf29af6
Stop processing a message without auth (i.e. a client did not send
...
CLIENT_READY)
2015-01-24 06:34:41 +01:00
1890ba3976
working, might need polish its pretty late
2015-01-24 05:14:38 +00:00
9abb85799c
realization how aCallAll works
2015-01-24 04:31:50 +00:00
372063295f
beginning of a hook, needs docs etc
2015-01-24 04:09:13 +00:00
5dce72d419
chrome list handling fix for #2412
2015-01-23 01:47:12 +00:00
6fd0285d4d
include lineContent in hok
2015-01-21 21:36:11 +00:00
036dea3d0f
styling
2015-01-21 17:25:06 +00:00
657974b518
move saved revs notification to gritter
2015-01-21 16:40:44 +00:00
aee0fd797d
working translation
2015-01-21 16:11:00 +00:00
753e8fdf0b
working logic
2015-01-21 16:08:54 +00:00
17fa87552d
styling
2015-01-21 15:48:21 +00:00
941cc3c24b
url param
2015-01-21 15:37:55 +00:00
920ec9c553
Merge pull request #2467 from ether/chat-and-users
...
Show users and Chat at the same time
2015-01-21 15:22:23 +00:00
3cd8759cec
expose modernIE value
2015-01-21 15:21:31 +00:00
3fd6e72657
try again
2015-01-21 15:06:29 +00:00
a2cb8a2f19
rename back to browser
2015-01-21 15:01:39 +00:00
7237a3b7cc
bump ueberdb
2015-01-21 14:58:47 +00:00
f2891e3b8b
working
2015-01-21 14:55:29 +00:00
ce40cacafa
mheh looks fixed
2015-01-21 14:49:06 +00:00
990e14c904
working with a big hack
2015-01-21 14:25:24 +00:00
34d6b31c98
some sanity
2015-01-21 13:24:21 +00:00
eacf1118f8
blind attempt to try
2015-01-21 02:55:03 +00:00
cb65224997
better logic for author handling
2015-01-21 00:28:00 +00:00
5f9bbd0666
restrict expor4t to only expose this pad ID
2015-01-21 00:03:39 +00:00
531d25ab84
freeze deps
2015-01-20 23:50:55 +00:00
84638a39b7
Merge pull request #2469 from ether/new-sethtml-tests
...
I need to do some more work on this at some point.. Leaving here
2015-01-19 15:51:37 +00:00
c315defc31
temp bodge fix
2015-01-19 15:15:52 +00:00
ab71bc7c20
hrm
2015-01-19 14:45:49 +00:00
edbeb66d5e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-19 14:33:17 +00:00
44d1d6cc13
fix ie editing
2015-01-19 14:32:58 +00:00
4ab4c9998b
Merge pull request #2470 from cetra3/timeslider_proxy_fix
...
Timeslider proxy fix
2015-01-19 13:32:03 +00:00
28aeeff154
Localisation updates from https://translatewiki.net .
2015-01-19 09:28:03 +01:00
f1c9c58c2d
Update to timeslider to include base path for easier proxying
2015-01-19 14:28:30 +10:30
3649118194
Update to timeslider to include base path for easier proxying
2015-01-19 14:25:06 +10:30
4f637befeb
more fixing
2015-01-19 02:59:17 +00:00
85fffbe14c
more handling
2015-01-19 02:57:10 +00:00
cadb83ac5a
bumpage
2015-01-19 02:51:32 +00:00
13eff60dfe
mheh I suck at css 0ip would do a way better job of this
2015-01-19 02:13:34 +00:00
63c65f784b
semi working example
2015-01-19 01:45:49 +00:00
73d6030762
boop
2015-01-19 00:36:12 +00:00
33c62329ba
better regexp for line items
2015-01-19 00:28:32 +00:00
0bd7914c3b
dont paste on middle click of link
2015-01-18 23:58:47 +00:00
6bc74a9adb
more export logic handling
2015-01-18 23:33:29 +00:00
e50ea6ffea
whoops proper regexp fix for listNumber
2015-01-18 23:24:20 +00:00
bd9ff770fe
reset all numbers on first item
2015-01-18 23:21:34 +00:00
ce41bcea2f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-18 23:17:06 +00:00
af70902bef
support deeper nested elements on exports
2015-01-18 23:16:58 +00:00
7e69bc65ce
remove infinite load was causing pain
2015-01-18 23:03:54 +00:00
689ced8443
and this one..
2015-01-18 20:15:17 +00:00
c0a4051b7a
use etherpads own yajsml
2015-01-18 20:12:02 +00:00
ca6b729ace
fix for ep page view pageup/down
2015-01-18 19:58:38 +00:00
83fae22279
allow list text entry up to 16 items
2015-01-18 15:32:48 +00:00
3c6db077ed
Change domain for plugins.json request
2015-01-18 14:22:27 +01:00
4644073399
Prevent dublicates in search results
2015-01-18 13:56:30 +01:00
6d6ddd7f9f
Prevent form submit on plugin page
2015-01-18 12:15:41 +01:00
b2616c820e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-01-12 00:00:07 +00:00
a553b44dbc
refix plugins
2015-01-11 23:59:18 +00:00
a080b12eac
Add new favicon (32x32) with associated svg file
2015-01-11 22:40:56 +01:00
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
167e0aea59
Merge pull request #2442 from ether/fix/attribmanager-removeattribonline
...
Finally fix AttribManager#removeAttributeOnLine
2015-01-10 16:35:37 +01:00
82efcdb430
fix for uls without class
2015-01-09 02:04:03 +01:00
f2c443809f
roll ejs back as its broken at v2
2015-01-07 15:18:54 +00:00
17ce67d936
final html export hook
2015-01-06 16:31:52 +00:00
751adb24fd
Finally fix AttribManager#removeAttributeOnLine
...
return safely if the attribute wasn't found.
fixes #2394
2015-01-05 18:38:34 +01:00
c0078abc75
Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection
2015-01-05 17:15:38 +00:00
26c839063f
check file system that abiword exists
2015-01-04 14:47:08 +00:00
e2ea82f8df
Localisation updates from https://translatewiki.net .
2015-01-02 10:58:48 +01:00
230302b132
fix timeslider stars and frontend tests, needs css polish
2015-01-01 22:40:45 +00:00
45e90e138c
v number bump
2015-01-01 16:57:31 +00:00
1451eecaf0
Re-implement ace_getAttributeOnSelection
2014-12-31 19:23:09 +01:00
8eb723b906
patch for e1c683be3f
2014-12-31 14:16:10 +00:00
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
4b6df17e99
Merge pull request #2421 from webzwo0i/fix-swagger
...
hack to avoid warnings in swagger usage
2014-12-31 13:27:00 +00:00
b5c671a9b6
Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs
...
Clean-up after removing list attribute: Remove list numbering attribute
2014-12-31 13:19:24 +00:00
335bf3dc4a
more line polish
2014-12-31 01:46:53 +00:00
01c667aa2e
export html more styles
2014-12-31 00:53:20 +00:00
b0da214ad5
hack to avoid warnings in swagger usage
2014-12-30 18:06:41 +01:00
cfe75c7f3f
Clean-up after removing list attribute: Remove list numbering attribute
2014-12-30 17:45:26 +01:00
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
5df638bfac
Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected
...
Notify user if cookies can't be created
2014-12-30 14:54:43 +01:00
90e83ed6b5
more styling
2014-12-30 14:53:44 +01:00
716b1c6113
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-30 14:44:55 +01:00
16713d8b3b
some demo export loic for handling OL incrementation
2014-12-30 14:43:00 +01:00
4687d226c6
Merge pull request #2417 from webzwo0i/fix-export
...
Fix ExportHtml.js list parsing code
2014-12-30 13:47:31 +01:00
19c78212e8
Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished
...
Fix lineassembler not finished
2014-12-30 12:19:04 +01:00
a07d1722fc
no errors on chrome client
2014-12-30 12:12:24 +01:00
5ba3cab445
better take some responsibility
2014-12-30 00:13:01 +01:00
ac4f9eb4ce
licensing
2014-12-30 00:12:26 +01:00
99a239fa9a
remove console log
2014-12-30 00:10:08 +01:00
0676d2fe24
working author import
2014-12-30 00:01:15 +01:00
b8648b4a49
remove error logging
2014-12-29 23:08:42 +01:00
1e0de620be
more author logic
2014-12-29 23:08:17 +01:00
ec2b844f94
authors
2014-12-29 22:51:31 +01:00
a2262c56b9
msg for user
2014-12-29 22:05:14 +01:00
a6400b3f61
allow only for pads less than 10 to be overwritten
2014-12-29 22:02:24 +01:00
ab5e7381a2
working for all files
2014-12-29 21:35:10 +01:00
1081156f13
whoopsi, required files
2014-12-29 21:13:49 +01:00
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
6e4e034e42
fix closing of lists
2014-12-29 16:27:40 +01:00
e1c683be3f
differentiate between indents and bullets in unordered lists
2014-12-29 16:12:07 +01:00
302ceb665b
delay write to fix copypad -- bad practice but due to db.set not allowing callback
2014-12-29 14:59:22 +01:00
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
c4959b089f
resolve merge conflict
2014-12-29 01:54:44 +01:00
321d550d43
second fix for user list issue on #2413
2014-12-29 01:20:28 +01:00
23570e80a7
unbind before rebind, partial fix towards #2413 issue
2014-12-29 01:17:24 +01:00
248d7655d7
Merge pull request #2401 from ether/save-prefs
...
set prefs and get prefs
2014-12-29 01:01:09 +01:00
8603fb4583
fix sockets of switch to pad
2014-12-29 00:46:47 +01:00
6b1fee400d
Merge branch 'switch-to-pad' of github.com:derosm2/etherpad-lite into localTest
2014-12-29 00:40:07 +01:00
018821e98c
Use camel case
2014-12-28 22:20:09 +01:00
74eca43965
Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow
...
Close extended chat window
2014-12-28 20:17:30 +01:00
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
68f50ff9fa
Merge pull request #2409 from ether/fix-removeAttribOnLine
...
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
2014-12-28 12:52:39 +01:00
362315c638
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
2014-12-28 12:34:42 +01:00
6ca2c91fdf
close and open lists according to the actual line.listLevel
2014-12-28 02:32:53 +01:00
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
dd09f6144b
Merge pull request #2398 from ether/indentLevels
...
Indent levels
2014-12-27 23:27:11 +01:00
c276343216
timeslider fixes
2014-12-27 22:31:23 +01:00
9cf19b99fe
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
2014-12-27 22:25:24 +01:00
b1f29b914c
minor ts bg fix
2014-12-27 22:05:35 +01:00
3354b9406b
op is ok, if it doesnt include newlines. op is ok, if op.lines is equal to newlines in op.chars
2014-12-27 19:30:02 +01:00
51c14d9947
check if op.lines is in sync with atext-newlines
...
Conflicts:
src/static/js/Changeset.js
2014-12-27 19:28:56 +01:00
251a75346d
make stringIterator aware of newlines
2014-12-27 19:25:14 +01:00
036df30c0e
Merge pull request #2402 from ether/fix-attribmanager-removeLineAttrib
...
Fix removeAttributeOnLine: Only remove a single attrib
2014-12-27 19:23:49 +01:00
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
ddd6a8ebce
Localisation updates from https://translatewiki.net .
2014-12-27 17:59:55 +01:00
07a6702363
Revert "be more strict in checkRep"
...
This reverts commit 22803da42f
2014-12-27 17:56:20 +01:00
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
a63880dcb1
Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib
2014-12-27 16:15:20 +01:00
a151c207c2
set prefs and get prefs
2014-12-27 15:08:54 +01:00
40c7ee9df9
Prevent server crash if author is not set
2014-12-27 14:26:05 +01:00
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
6ac99ab03f
support for export
2014-12-27 13:27:07 +01:00
9d66a446dc
support indentation up to 16 levels and dont go back afterwards
2014-12-27 13:18:58 +01:00
10d92b6bf1
slightly better attribute selection logic but still pretty b0rked
2014-12-26 23:42:00 +00:00
88ab74b1e9
fix flowing of items in editbar
2014-12-24 17:54:13 +00:00
b71fb3ad20
fix issue with attributes
2014-12-23 02:38:50 +00:00
fdc930de3d
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:43:21 +00:00
ee3f3b8060
move clean css back to fix minification on TS
2014-12-21 23:42:56 +00:00
4573796166
fix
2014-12-21 23:16:23 +00:00
3fe58068c0
more fixes
2014-12-21 23:16:00 +00:00
12aac2d0d0
Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles
2014-12-21 23:12:59 +00:00
745ef5db1c
fix timeslider socket issue
2014-12-21 23:10:56 +00:00
69bad8b30c
fix typo in addSavedRevisions
2014-12-17 01:10:20 +01:00
b204aa2085
remove more dead requires.
2014-12-16 19:10:01 +01:00
a2d22a5764
Merge pull request #2377 from webzwo0i/avoid-global-vairables
...
declare var outside of loop
2014-12-16 16:18:01 +00:00
0263d30b37
declare var outside of loop
2014-12-16 17:00:35 +01:00
cfa3f15f94
Merge pull request #2373 from webzwo0i/avoid-global-vairables
...
dont make local variables global
2014-12-16 00:41:41 +00:00
5d15f655f0
dont make local variables global
2014-12-14 22:01:28 +01:00
a2dbf8761f
allow for timeslider custom messages
2014-12-10 01:23:24 +00:00
197a41627d
allow plugins to add multiple styles
2014-12-09 17:34:52 +00:00
3a2669b704
additional tag support hook
2014-12-09 16:13:52 +00:00
45c1ad078b
Allow for shardable Etherpad
2014-12-09 14:59:18 +00:00
653cc6c87f
this class was in before, it is used to show when a style is applied to a piece of content
2014-12-09 14:57:18 +00:00
f11bdc1b44
also logic to add attributes for properties
2014-12-09 01:31:40 +00:00
f2c155ee1a
blah use async
2014-12-08 19:44:40 +00:00
7cf0e4a9ae
allow padId to be passed into the hook
2014-12-08 19:11:45 +00:00
2218cbd252
docs
2014-12-08 19:08:12 +00:00
6080de9d79
Merge pull request #2348 from ether/sanitizer
...
sanitizer change
2014-12-04 17:31:42 +00:00
22803da42f
be more strict in checkRep
2014-12-04 16:12:13 +01:00
5306f0c98a
wrap appendRevision in try-catch block
2014-12-04 16:05:02 +01:00
10c2f72720
dont remove more lines than exist in the whole text
2014-12-04 16:01:39 +01:00
c1fdd7ff79
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-12-01 15:10:17 +00:00
c539cc7d6b
styling of global view colum
2014-12-01 15:10:03 +00:00
b5a0767f32
Merge pull request #2350 from ether/require-kernel-change
...
Require kernel change
2014-11-30 23:30:00 +00:00
6fea3a25f8
stop death on no session
2014-11-30 21:21:58 +00:00
e9686c0d93
Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change
2014-11-29 03:08:42 +00:00
d7e980cd47
yet more minor css polish
2014-11-29 02:24:19 +00:00
12f25d8a45
bump cleancss
2014-11-29 01:31:04 +00:00
607c2119a9
Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change
2014-11-29 00:56:18 +00:00
ed96c13a1f
minor ui polish
2014-11-29 00:54:06 +00:00
ee585f0457
color picker on mobile actually shows on screen
2014-11-29 00:32:37 +00:00
34f7625739
a little more polish
2014-11-29 00:30:13 +00:00
53887db872
mobile ui polish
2014-11-29 00:26:25 +00:00
74ffbdea79
bump vs
2014-11-28 18:02:11 +00:00
3224122f7e
correct kernel v#
2014-11-28 17:47:55 +00:00
3bf9f3cf1d
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 17:43:01 +00:00
a642deaa72
gritter css fix
2014-11-28 02:25:21 +00:00
68979e1212
better fix
2014-11-28 00:35:46 +00:00
e6d85bbe69
fix issue with top of chatbox not being aligned properly
2014-11-28 00:26:34 +00:00
edc5669fa6
Merge pull request #2344 from ether/backend-tests
...
Backend tests
2014-11-28 00:04:12 +00:00
d974e881a8
Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer
2014-11-28 00:02:16 +00:00
422cfec27a
Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change
2014-11-28 00:01:47 +00:00
3ca48ed975
fix undo in chrome etc
2014-11-27 16:49:08 +00:00
c13301966f
yeah need htis too
2014-11-27 02:56:42 +00:00
61c6deda2e
use a forked require-kernel
2014-11-27 02:44:48 +00:00
2c728b8e1b
sanitizer change
2014-11-27 00:45:22 +00:00
e51ab2db24
fix for #2132
2014-11-26 23:37:44 +00:00
cff8f4a61e
remember to add supertest
2014-11-26 21:58:27 +00:00
16f3ebb3ba
handle auth fails
2014-11-26 17:34:44 +00:00
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
a4be5b4fd7
mocha version
2014-11-26 01:03:57 +00:00
8851b8ab6b
Merge branch 'develop' of github.com:ether/etherpad-lite into jsdom-go-away
2014-11-25 22:48:09 +00:00
881763f663
remove jsdom dep
2014-11-25 22:15:29 +00:00
77de2d918b
multiline
2014-11-25 22:14:48 +00:00
ad7de8277d
mocha
2014-11-25 22:12:25 +00:00
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
2014-11-25 22:38:22 +01:00
2a062f8dc3
mheh no browser requirement at all
2014-11-25 18:18:42 +00:00
c2c0cb6907
so yeah, prolly can do this anyway?
2014-11-25 18:07:34 +00:00
60d44cd3df
use cheerio instead of jsdom
2014-11-25 17:26:09 +00:00
John McLear