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 |
|
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 |
|
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 |
|
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 |
|
John McLear
|
b1f29b914c
|
minor ts bg fix
|
2014-12-27 22:05:35 +01:00 |
|
John McLear
|
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 |
|
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 |
|
Siebrand Mazeland
|
ddd6a8ebce
|
Localisation updates from https://translatewiki.net.
|
2014-12-27 17:59:55 +01:00 |
|
webzwo0i
|
07a6702363
|
Revert "be more strict in checkRep"
This reverts commit 22803da42f.
|
2014-12-27 17:56:20 +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 |
|
Marcel Klehr
|
a63880dcb1
|
Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib
|
2014-12-27 16:15:20 +01:00 |
|
John McLear
|
a151c207c2
|
set prefs and get prefs
|
2014-12-27 15:08:54 +01:00 |
|
John McLear
|
5b7ae4bd5f
|
Merge pull request #2399 from ether/remove-dokuwiki
removing dokuwiki
|
2014-12-27 14:27:02 +01:00 |
|
Gared
|
40c7ee9df9
|
Prevent server crash if author is not set
|
2014-12-27 14:26:05 +01:00 |
|
John McLear
|
444bbf4cbc
|
remove trailing enter from apikey
|
2014-12-27 14:19:31 +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
|
9d66a446dc
|
support indentation up to 16 levels and dont go back afterwards
|
2014-12-27 13:18:58 +01:00 |
|
John McLear
|
10d92b6bf1
|
slightly better attribute selection logic but still pretty b0rked
|
2014-12-26 23:42:00 +00:00 |
|
John McLear
|
88ab74b1e9
|
fix flowing of items in editbar
|
2014-12-24 17:54:13 +00:00 |
|
John McLear
|
c409495b5e
|
test for pad users
|
2014-12-24 04:01:18 +00:00 |
|
John McLear
|
80fa2c2868
|
move docs
|
2014-12-24 02:45:21 +00:00 |
|
John McLear
|
1ab7dfdb7b
|
Merge pull request #2358 from BjarniRunar/develop
Created dirty-db-cleaner.py - prunes old history from dirty.db files
|
2014-12-23 15:50:59 +00:00 |
|
John McLear
|
b71fb3ad20
|
fix issue with attributes
|
2014-12-23 02:38:50 +00:00 |
|
John McLear
|
70ba525430
|
Merge pull request #2368 from ether/hook_for_exportHTMLStyles
Hook for export html styles
|
2014-12-22 02:32:50 +00: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
|
4573796166
|
fix
|
2014-12-21 23:16:23 +00:00 |
|
John McLear
|
3fe58068c0
|
more fixes
|
2014-12-21 23:16:00 +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 |
|
John McLear
|
745ef5db1c
|
fix timeslider socket issue
|
2014-12-21 23:10:56 +00:00 |
|
John McLear
|
ffdce760d5
|
remove unused long paths from windows build
|
2014-12-21 22:05:07 +00:00 |
|
Marcel Klehr
|
70dc5e7ed9
|
Merge pull request #2380 from webzwo0i/fix-add-saved-revision-typo
fix typo in addSavedRevisions
|
2014-12-18 20:21:42 +01:00 |
|