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 |
|
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 |
|
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
|
a2d22a5764
|
Merge pull request #2377 from webzwo0i/avoid-global-vairables
declare var outside of loop
|
2014-12-16 16:18:01 +00:00 |
|
webzwo0i
|
0263d30b37
|
declare var outside of loop
|
2014-12-16 17:00:35 +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
|
a2dbf8761f
|
allow for timeslider custom messages
|
2014-12-10 01:23:24 +00:00 |
|
John McLear
|
197a41627d
|
allow plugins to add multiple styles
|
2014-12-09 17:34:52 +00:00 |
|
John McLear
|
fccfc3bd41
|
docs
|
2014-12-09 16:16:19 +00:00 |
|
John McLear
|
3a2669b704
|
additional tag support hook
|
2014-12-09 16:13:52 +00:00 |
|
John McLear
|
e57c8fa763
|
Merge pull request #2370 from simong/shardable-socket-io
Don't hardcode /socket.io
|
2014-12-09 15:58:51 +00:00 |
|
Simon Gaeremynck
|
45c1ad078b
|
Allow for shardable Etherpad
|
2014-12-09 14:59:18 +00:00 |
|
John McLear
|
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 |
|
John McLear
|
b94a525e07
|
docs
|
2014-12-09 01:35:59 +00:00 |
|
John McLear
|
f11bdc1b44
|
also logic to add attributes for properties
|
2014-12-09 01:31:40 +00:00 |