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
|
19c78212e8
|
Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished
Fix lineassembler not finished
|
2014-12-30 12:19:04 +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
|
a2262c56b9
|
msg for user
|
2014-12-29 22:05:14 +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
|
7980381369
|
better test coverage for longer pad data
|
2014-12-29 21:13:07 +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
|
cd944a356d
|
Merge pull request #2416 from webzwo0i/fix-import-of-indented-lists
Fix import of indented lists
|
2014-12-29 16:25:51 +01:00 |
|
webzwo0i
|
8e280f46c1
|
fix bullet test case, remove indent-testcases because they are in separate file
|
2014-12-29 16:25:41 +01:00 |
|
webzwo0i
|
a36d6f36a0
|
add testcase for import of intended lists
|
2014-12-29 16:12:46 +01:00 |
|
webzwo0i
|
e1c683be3f
|
differentiate between indents and bullets in unordered lists
|
2014-12-29 16:12:07 +01:00 |
|
John McLear
|
565097efb4
|
Merge pull request #2415 from ether/write-delay
delay write to fix copypad -- bad practice but due to db.set not allowin...
|
2014-12-29 15:10:49 +01:00 |
|
John McLear
|
c9b0c6896e
|
move pad tests - still need to do copy pad and some other functionality IE force
|
2014-12-29 15:08:30 +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
|
b3cf41ab92
|
Merge pull request #2414 from ether/remove-old
Remove old
|
2014-12-29 01:58:59 +01:00 |
|
John McLear
|
c4959b089f
|
resolve merge conflict
|
2014-12-29 01:54:44 +01:00 |
|
John McLear
|
321d550d43
|
second fix for user list issue on #2413
|
2014-12-29 01:20:28 +01:00 |
|
John McLear
|
23570e80a7
|
unbind before rebind, partial fix towards #2413 issue
|
2014-12-29 01:17:24 +01:00 |
|
John McLear
|
248d7655d7
|
Merge pull request #2401 from ether/save-prefs
set prefs and get prefs
|
2014-12-29 01:01:09 +01:00 |
|
John McLear
|
60a05cc748
|
Merge pull request #2413 from ether/switch-to-pad-derosm2
Switch to pad derosm2
|
2014-12-29 00:49:55 +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 |
|
John McLear
|
cec9065df8
|
test for #2395 #2402
|
2014-12-29 00:30:11 +01:00 |
|
Gared
|
018821e98c
|
Use camel case
|
2014-12-28 22:20:09 +01:00 |
|
John McLear
|
9715e039cd
|
tests front chat going from stiky to smally
|
2014-12-28 20:25:46 +01:00 |
|
John McLear
|
74eca43965
|
Merge pull request #2014 from eyesonlyhack/closeExtendedChatWindow
Close extended chat window
|
2014-12-28 20:17:30 +01:00 |
|
Gared
|
2307c6fbda
|
Notify user if cookies can't be created
|
2014-12-28 15:02:56 +01:00 |
|
John McLear
|
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 |
|
Marcel Klehr
|
362315c638
|
AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left
|
2014-12-28 12:34:42 +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 |
|
webzwo0i
|
53ca26d030
|
add some import-export tests
|
2014-12-28 02:27:53 +01:00 |
|
John McLear
|
dd09f6144b
|
Merge pull request #2398 from ether/indentLevels
Indent levels
|
2014-12-27 23:27:11 +01:00 |
|
John McLear
|
c276343216
|
timeslider fixes
|
2014-12-27 22:31:23 +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
|
b1f29b914c
|
minor ts bg fix
|
2014-12-27 22:05:35 +01:00 |
|
webzwo0i
|
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 |
|
webzwo0i
|
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 |
|
webzwo0i
|
251a75346d
|
make stringIterator aware of newlines
|
2014-12-27 19:25:14 +01:00 |