fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,880 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

4880 Commits

Author SHA1 Message Date
Stefan 423d8e584e Merge pull request #3103 from ether/master 
Master to develop
 2016-12-23 23:12:32 +01:00
Stefan 9f51432175 Update CHANGELOG.md 2016-12-23 22:12:18 +01:00
Stefan 8992dd665a Merge new release into master branch! 2016-12-23 22:00:34 +01:00
Stefan 6dc808ad54 Release version 1.6.1 2016-12-23 21:59:57 +01:00
Stefan b8a4648d6d Merge pull request #3101 from Gared/fix_crash_on_invalid_export 
Fixed crash on invalid export url
 2016-12-23 21:14:56 +01:00
Stefan caabb4d8f7 Update nodejs for windows to 6.9.2 2016-12-22 23:15:49 +01:00
Stefan be9ff4a0de Fixed crash on invalid export url 2016-12-22 23:04:06 +01:00
Stefan efb25f417a Merge pull request #2993 from ether/fixes-2945 
fixes #2945
 2016-12-20 22:08:05 +01:00
Stefan a1ec061017 Merge pull request #3053 from danfuzz/fix-timeslider-lists 
Fix timeslider lists / indents, but also make CSS `@import` work
 2016-12-20 22:06:31 +01:00
Stefan db21a25eff Merge pull request #3000 from Gared/improve_cookies 
Improve cookies
 2016-12-20 22:00:12 +01:00
Stefan 8084400e13 Try to init cookies before testing if it exists 2016-12-20 21:57:01 +01:00
Stefan aefa617797 Merge branch 'develop' into improve_cookies 2016-12-20 21:31:11 +01:00
Stefan 368bbe4836 Merge pull request #3084 from Gared/fix_npm_node7 
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
 2016-12-20 00:07:26 +01:00
Niklas Laxström db94ce9413 Localisation updates from https://translatewiki.net. 2016-12-19 07:36:35 +01:00
Niklas Laxström d13a28a1ea Localisation updates from https://translatewiki.net. 2016-12-15 07:31:34 +01:00
Luiza Pagliari 01d23b1f6a Merge pull request #2929 from xavidotron/develop 
Pass through the "item" parameter to registerAceCommand callbacks.
 2016-12-13 06:12:26 -02:00
Stefan da5ae8b1f7 Merge pull request #3085 from Gared/fix_socketio_options 
Updated option parameters for socket.io to work with latest version
 2016-12-12 23:40:29 +01:00
Stefan 9d3f5781eb Merge pull request #3086 from Gared/update_node_for_windows 
Updated node for windows build to version 6.9.1
 2016-11-30 19:32:46 +01:00
Niklas Laxström b41b4726d6 Localisation updates from https://translatewiki.net. 2016-11-24 08:24:37 +01:00
Stefan 352cec1811 Updated socket.io to 1.6.0 2016-11-20 12:44:59 +01:00
Stefan d1d2e462d0 Updated node for windows build to version 6.9.1 2016-11-20 12:32:36 +01:00
Stefan 39a3bedb7b Updated option parameters for socket.io to work with latest version 2016-11-20 12:27:27 +01:00
Stefan 00c9caf7a3 Updated npm to 4.0.2 and removed recursive searching for ep-plugins 2016-11-20 11:28:17 +01:00
Siebrand Mazeland 602fd4629a Localisation updates from https://translatewiki.net. 2016-11-17 09:50:45 +01:00
Luiza Pagliari 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
Luc Didry 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
Luiza Pagliari 0497e12d7b Merge pull request #3077 from pcarver/typo-fix 
Correct the spelling of occured to occurred
 2016-11-14 10:50:18 -02:00
Paul Carver 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
Niklas Laxström 223127bf39 Localisation updates from https://translatewiki.net. 2016-11-01 07:59:29 +01:00
Niklas Laxström 7dd934f714 Localisation updates from https://translatewiki.net. 2016-10-17 20:19:22 +02:00
Niklas Laxström 2c69511c62 Localisation updates from https://translatewiki.net. 2016-10-13 08:00:32 +02:00
Niklas Laxström 965af5a40b Localisation updates from https://translatewiki.net. 2016-10-06 07:41:01 +02:00
Stefan 428e0cdbc2 Merge pull request #3044 from rugk/patch-3 
Add Referrer-Policy (no-referrer)
 2016-09-30 23:49:21 +02:00
rugk f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3 
Conflicts:
	src/templates/index.html
 2016-09-30 19:20:40 +02:00
John McLear f289611ba9 Merge pull request #3059 from paper-pauper/librejs 
Added LibreJS support
 2016-09-28 23:02:40 +01:00
Niklas Laxström 93ca44f005 Localisation updates from https://translatewiki.net. 2016-09-27 13:58:36 +02:00
Niklas Laxström b6e5a2283b Localisation updates from https://translatewiki.net. 2016-09-22 07:27:50 +02:00
Nobody Really 97fd1ab2fe Added LibreJS support 2016-09-20 09:30:35 +02:00
Niklas Laxström 32eb6a2288 Localisation updates from https://translatewiki.net. 2016-09-15 08:18:13 +02:00
Niklas Laxström 7ecf240d9e Localisation updates from https://translatewiki.net. 2016-09-13 07:44:27 +02:00
Dan Bornstein 0a9d02562d Handle relative paths properly, when `@import`ing. 2016-09-09 12:59:02 -07:00
Dan Bornstein d7940cf8c5 Harmonize list- and indent-related CSS in the pad editor and timeslider. 
* Add a new file `lists_and_indents.css` to hold the common CSS.
* Remove the corresponding CSS from `iframe_editor.css`, replacing it with
  an `@import` of the new file.
* Remove the list/indent code from `timeslider.css`, which was _unlike_ the
  corresponding editor CSS code, again replacing it with an `@import` of the
  new file.
 2016-09-09 12:33:46 -07:00
Dan Bornstein a5a7ebea3d Handle `@import` during CSS minification. 
This meant plumbing a callback through to `compressCSS()`, which meant that
I had to alter the innards of `getFileCompressed()`. I tried to	leave that
function looking more understandable than when I found it; for example,	I
flattened out the nested `if`.

I went ahead and upgraded the version of `clean-css` while I was in the
territory.
 2016-09-09 12:32:24 -07: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