352cec1811
Updated socket.io to 1.6.0
2016-11-20 12:44:59 +01:00
39a3bedb7b
Updated option parameters for socket.io to work with latest version
2016-11-20 12:27:27 +01:00
602fd4629a
Localisation updates from https://translatewiki.net .
2016-11-17 09:50:45 +01:00
c76af79471
Merge pull request #3080 from ldidry/document-undocumented-API-function-restoreRevision
...
Add undocumented API function restoreRevision to doc
2016-11-16 19:34:12 -02:00
2341d09807
Add undocumented API function restoreRevision to doc
...
This commit is dedicated to Schoumi. Thx for supporting me on Tipeee :-)
2016-11-16 10:36:18 +01:00
0497e12d7b
Merge pull request #3077 from pcarver/typo-fix
...
Correct the spelling of occured to occurred
2016-11-14 10:50:18 -02:00
573b55af8b
Correct the spelling of occured to occurred
...
The correct spelling is occurred. See
http://www.gingersoftware.com/english-online/spelling-book/misspelling/occurred-occured-ocurred
or other dictionary search results.
2016-11-11 12:46:40 -05:00
223127bf39
Localisation updates from https://translatewiki.net .
2016-11-01 07:59:29 +01:00
7dd934f714
Localisation updates from https://translatewiki.net .
2016-10-17 20:19:22 +02:00
2c69511c62
Localisation updates from https://translatewiki.net .
2016-10-13 08:00:32 +02:00
965af5a40b
Localisation updates from https://translatewiki.net .
2016-10-06 07:41:01 +02:00
428e0cdbc2
Merge pull request #3044 from rugk/patch-3
...
Add Referrer-Policy (no-referrer)
2016-09-30 23:49:21 +02:00
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
...
Conflicts:
src/templates/index.html
2016-09-30 19:20:40 +02:00
f289611ba9
Merge pull request #3059 from paper-pauper/librejs
...
Added LibreJS support
2016-09-28 23:02:40 +01:00
93ca44f005
Localisation updates from https://translatewiki.net .
2016-09-27 13:58:36 +02:00
b6e5a2283b
Localisation updates from https://translatewiki.net .
2016-09-22 07:27:50 +02:00
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +02:00
32eb6a2288
Localisation updates from https://translatewiki.net .
2016-09-15 08:18:13 +02:00
7ecf240d9e
Localisation updates from https://translatewiki.net .
2016-09-13 07:44:27 +02:00
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
a0403ffc22
Remove unused parameter `noDocType`.
...
My editor also auto-stripped some EOL whitespace.
2016-09-08 09:46:13 -07:00
879ae7c67d
Remove the `noDocType` argument, which was only ever passed as `false`.
2016-09-08 09:41:23 -07:00
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
b502c855d2
Localisation updates from https://translatewiki.net .
2016-09-08 10:08:19 +02:00
fd7591c110
Localisation updates from https://translatewiki.net .
2016-09-05 07:14:04 +02:00
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
8ad9d4f6dd
Localisation updates from https://translatewiki.net .
2016-08-25 07:33:25 +02:00
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
b5632b3ac5
Index: No-referrer
2016-08-23 22:12:40 +02:00
bf99cf92ab
Pad: Add no-referrer
2016-08-23 22:12:12 +02:00
8f133abacc
Timeslider: Add no-referrer
2016-08-23 22:11:11 +02:00
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
ea562250d9
Perform drag and drop in one changeset, so UNDO works properly. Fix #3041
2016-08-22 18:44:17 -03:00
bd20d44e89
Localisation updates from https://translatewiki.net .
2016-08-18 07:52:23 +02:00
f147146519
Localisation updates from https://translatewiki.net .
2016-08-15 08:08:30 +02:00
9fc72194d9
Merge pull request #3035 from danfuzz/fix-docs
...
Fix value to be valid JSON.
2016-08-12 17:45:58 -03:00
219a1dc3e3
Fix value to be valid JSON.
...
Also fixed some errant EOL whitespace.
2016-08-12 11:05:40 -07:00
2996f0fad7
Localisation updates from https://translatewiki.net .
2016-08-04 07:57:38 +02:00
08b90437c1
Localisation updates from https://translatewiki.net .
2016-08-01 08:08:45 +02:00
cf3aaa334f
Localisation updates from https://translatewiki.net .
2016-07-28 07:59:29 +02:00
17726856c6
Localisation updates from https://translatewiki.net .
2016-07-25 07:56:41 +02:00
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
c92e3e4b5e
Fix #2918 . Re-enable editor after user is reconnected to server
2016-07-21 15:23:14 -03:00
3fcc7aa190
Localisation updates from https://translatewiki.net .
2016-07-18 08:48:25 +02:00
a2ee1d0b3f
Merge pull request #3009 from storytouch/selectMultipleLinesOnFESpecs
...
Enable multi-line selection on frontend tests
2016-07-15 15:05:54 -03:00
728ab9307e
Localisation updates from https://translatewiki.net .
2016-07-07 07:52:57 +02:00
ab4f23aae5
Merge pull request #2970 from xavidotron/url
...
Remove [ and ] from the regexp used by the URL filter.
2016-06-28 07:28:18 +01:00
28aa3b28d6
Add a frontend test for URLs followed by a ].
2016-06-27 16:20:12 -04:00
65dcb783d1
Merge pull request #3008 from Gared/directory_check
...
Fixed path check
2016-06-22 21:50:34 +01:00
a18d40df6b
Localisation updates from https://translatewiki.net .
2016-06-22 16:38:16 +02:00
Stefan