summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-20Updated socket.io to 1.6.0Stefan
2016-11-20Updated option parameters for socket.io to work with latest versionStefan
2016-11-17Localisation updates from https://translatewiki.net.Siebrand Mazeland
2016-11-16Merge pull request #3080 from ↵Luiza Pagliari
ldidry/document-undocumented-API-function-restoreRevision Add undocumented API function restoreRevision to doc
2016-11-16Add undocumented API function restoreRevision to docLuc Didry
This commit is dedicated to Schoumi. Thx for supporting me on Tipeee :-)
2016-11-14Merge pull request #3077 from pcarver/typo-fixLuiza Pagliari
Correct the spelling of occured to occurred
2016-11-11Correct the spelling of occured to occurredPaul Carver
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-01Localisation updates from https://translatewiki.net.Niklas Laxström
2016-10-17Localisation updates from https://translatewiki.net.Niklas Laxström
2016-10-13Localisation updates from https://translatewiki.net.Niklas Laxström
2016-10-06Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-30Merge pull request #3044 from rugk/patch-3Stefan
Add Referrer-Policy (no-referrer)
2016-09-30Merge https://github.com/ether/etherpad-lite into patch-3rugk
Conflicts: src/templates/index.html
2016-09-28Merge pull request #3059 from paper-pauper/librejsJohn McLear
Added LibreJS support
2016-09-27Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-22Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-20Added LibreJS supportNobody Really
2016-09-15Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-13Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-08Merge pull request #3045 from danfuzz/extract-export-cssLuiza Pagliari
Use an EEJS template for HTML export instead of inlining it in the JS code.
2016-09-08Remove unused parameter `noDocType`.Dan Bornstein
My editor also auto-stripped some EOL whitespace.
2016-09-08Remove the `noDocType` argument, which was only ever passed as `false`.Dan Bornstein
2016-09-08Merge pull request #3048 from danfuzz/fix-first-line-margin-topLuiza Pagliari
Account for any top margin on the first line.
2016-09-08Localisation updates from https://translatewiki.net.Niklas Laxström
2016-09-05Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-30Account for any top margin on the first line.Dan Bornstein
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-25Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-24Use an EEJS template for HTML export instead of inlining it in the JS code.Dan Bornstein
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-23Index: No-referrerrugk
2016-08-23Pad: Add no-referrerrugk
2016-08-23Timeslider: Add no-referrerrugk
2016-08-22Merge pull request #3042 from storytouch/fix_dndLuiza Pagliari
Perform DnD in one changeset, so UNDO works properly. Fix #3041
2016-08-22Perform drag and drop in one changeset, so UNDO works properly. Fix #3041Luiza Pagliari
2016-08-18Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-15Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-12Merge pull request #3035 from danfuzz/fix-docsLuiza Pagliari
Fix value to be valid JSON.
2016-08-12Fix value to be valid JSON.Dan Bornstein
Also fixed some errant EOL whitespace.
2016-08-04Localisation updates from https://translatewiki.net.Niklas Laxström
2016-08-01Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-28Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-25Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-21Merge pull request #3026 from storytouch/developLuiza Pagliari
Fix #2918. Re-enable editor after user is reconnected to server
2016-07-21Fix #2918. Re-enable editor after user is reconnected to serverLuiza Pagliari
2016-07-18Localisation updates from https://translatewiki.net.Niklas Laxström
2016-07-15Merge pull request #3009 from storytouch/selectMultipleLinesOnFESpecsLuiza Pagliari
Enable multi-line selection on frontend tests
2016-07-07Localisation updates from https://translatewiki.net.Niklas Laxström
2016-06-28Merge pull request #2970 from xavidotron/urlJohn McLear
Remove [ and ] from the regexp used by the URL filter.
2016-06-27Add a frontend test for URLs followed by a ].Xavid
2016-06-22Merge pull request #3008 from Gared/directory_checkJohn McLear
Fixed path check
2016-06-22Localisation updates from https://translatewiki.net.Siebrand Mazeland
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 04:27:22 +0000