public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,509 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

5509 Commits (6fd2bf4472e26bf22dab0957029ae39b719778aa)

Author SHA1 Message Date
ilmar 47e20a2f49 line parsing fix 2018-05-03 00:07:07 +03:00
ilmar 6684f9bfe8 hook callAll to aCallAll 2018-05-02 11:45:48 +03:00
ilmar 55ecf31786 html export fix 2018-05-02 11:12:58 +03:00
ilmar c9863f81ad sync with ether/etherpad-lite 2018-05-02 11:08:57 +03:00
ilmar 8d27f3cf03 upgrade to 1.6.5 2018-04-24 13:31:40 +03:00
ilmar 7cc7bb1abc upgrade to 1.6.5 2018-04-24 12:25:56 +03:00
ilmar d6fa065ef2 export html to original structure 2018-04-24 12:13:31 +03:00
ilmar 517b249394 D 2018-04-10 00:08:42 +03:00
ilmar 8502c04bee html lists export fix 2018-04-09 15:37:28 +03:00
ilmar b4ad7cf452 Export lists fix + code linting and readability update 2018-04-05 23:27:02 +03:00
Mikk Andresen 64a2e5b7a3 Upgrade Ueberdb2 to 0.3.7 to fix https://github.com/ether/etherpad-lite/issues/3348 2018-04-04 13:52:59 +03:00
Mikk Andresen 20428bb427 Merge remote-tracking branch 'upstream/develop' into develop 2018-04-04 13:52:27 +03:00
Mikk Andresen a67aaa8f49 Merge remote-tracking branch 'upstream/master' into develop 2018-04-04 13:52:08 +03:00
Mikk Andresen a4819b21f2 Upgrade Ueberdb2 to 0.3.7 to fix https://github.com/ether/etherpad-lite/issues/3348 2018-04-04 13:40:02 +03:00
Mikk Andresen 6f2466bebc Merge with upstream develop. 2018-04-02 13:47:16 +03:00
ilmar cf82177b36 ueberDB2 update 2018-03-26 17:57:00 +03:00
ilmar 30400509ba added tiblus ep_prefs_different_cookie_for_different_protocol 2017-11-03 10:47:54 +02:00
ilmar 76f211b0bf ExportHtml.js update 2017-11-01 09:48:23 +02:00
ilmar 5469ce85cd exportHTML update 2017-10-31 22:46:24 +02:00
ilmar 724b1d734b updated html export, run hooks also with lists 2017-10-31 16:23:41 +02:00
ilmar c36a3264fe fix to ether/etherpad-lite#2486 2017-10-21 01:04:53 +03:00
ilmar 69bf32cd46 fix to https://github.com/ether/etherpad-lite/issues/2486 2017-10-19 16:11:40 +03:00
Luiza Pagliari 7dd252f763 Merge pull request #3045 from danfuzz/extract-export-css 
Use an EEJS template for HTML export instead of inlining it in the JS code.
 2016-09-08 19:15:10 -03:00
Dan Bornstein a0403ffc22 Remove unused parameter `noDocType`. 
My editor also auto-stripped some EOL whitespace.
 2016-09-08 09:46:13 -07:00
Dan Bornstein 879ae7c67d Remove the `noDocType` argument, which was only ever passed as `false`. 2016-09-08 09:41:23 -07:00
Luiza Pagliari 5022912895 Merge pull request #3048 from danfuzz/fix-first-line-margin-top 
Account for any top margin on the first line.
 2016-09-08 05:59:36 -03:00
Niklas Laxström b502c855d2 Localisation updates from https://translatewiki.net. 2016-09-08 10:08:19 +02:00
Niklas Laxström fd7591c110 Localisation updates from https://translatewiki.net. 2016-09-05 07:14:04 +02:00
Dan Bornstein a3765d9785 Account for any top margin on the first line. 
Without this change, a top margin on any element on the first line of pad
content would throw off the alignment of line numbers. The default stylesheet
doesn't define any elements with top margins, but plugins might. (This is also
explained in a code comment.)

In order to see the problem, add the following clause to `iframe_editor.css`
(before incorporating this commit):

    #innerdocbody > :first-child {
      margin-top: 100px;
    }
 2016-08-30 11:19:28 -07:00
Niklas Laxström 8ad9d4f6dd Localisation updates from https://translatewiki.net. 2016-08-25 07:33:25 +02:00
Dan Bornstein 6d7f128b87 Use an EEJS template for HTML export instead of inlining it in the JS code. 
The semantics of all the substitutions are identical to what they were before.
I _did_ take the liberty of formatting the CSS to be a bit more readable
(at the cost of adding a little bit of whitespace).
 2016-08-24 16:25:31 -07:00
Luiza Pagliari d6da6b3c63 Merge pull request #3027 from rugk/patch-2 
Download JQuery over HTTPS
 2016-08-23 17:23:47 -03:00
rugk b5632b3ac5 Index: No-referrer 2016-08-23 22:12:40 +02:00
rugk bf99cf92ab Pad: Add no-referrer 2016-08-23 22:12:12 +02:00
rugk 8f133abacc Timeslider: Add no-referrer 2016-08-23 22:11:11 +02:00
Luiza Pagliari 45266f90a3 Merge pull request #3042 from storytouch/fix_dnd 
Perform DnD in one changeset, so UNDO works properly. Fix #3041
 2016-08-22 18:52:01 -03:00
Luiza Pagliari ea562250d9 Perform drag and drop in one changeset, so UNDO works properly. Fix #3041 2016-08-22 18:44:17 -03:00
Niklas Laxström bd20d44e89 Localisation updates from https://translatewiki.net. 2016-08-18 07:52:23 +02:00
Niklas Laxström f147146519 Localisation updates from https://translatewiki.net. 2016-08-15 08:08:30 +02:00
Luiza Pagliari 9fc72194d9 Merge pull request #3035 from danfuzz/fix-docs 
Fix value to be valid JSON.
 2016-08-12 17:45:58 -03:00
Dan Bornstein 219a1dc3e3 Fix value to be valid JSON. 
Also fixed some errant EOL whitespace.
 2016-08-12 11:05:40 -07:00
Niklas Laxström 2996f0fad7 Localisation updates from https://translatewiki.net. 2016-08-04 07:57:38 +02:00
Niklas Laxström 08b90437c1 Localisation updates from https://translatewiki.net. 2016-08-01 08:08:45 +02:00
Niklas Laxström cf3aaa334f Localisation updates from https://translatewiki.net. 2016-07-28 07:59:29 +02:00
Niklas Laxström 17726856c6 Localisation updates from https://translatewiki.net. 2016-07-25 07:56:41 +02:00
rugk f4bbe00322 Download JQuery over HTTPS 
Otherwise anyone can MITM the connection and add rogue code there.
 2016-07-23 16:59:47 +02:00
Luiza Pagliari 81b11be54a Merge pull request #3026 from storytouch/develop 
Fix #2918. Re-enable editor after user is reconnected to server
 2016-07-21 15:42:38 -03:00
Luiza Pagliari c92e3e4b5e Fix #2918. Re-enable editor after user is reconnected to server 2016-07-21 15:23:14 -03:00
Niklas Laxström 3fcc7aa190 Localisation updates from https://translatewiki.net. 2016-07-18 08:48:25 +02:00
Luiza Pagliari a2ee1d0b3f Merge pull request #3009 from storytouch/selectMultipleLinesOnFESpecs 
Enable multi-line selection on frontend tests
 2016-07-15 15:05:54 -03:00