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 |
|