Commit graph

1159 commits

Author SHA1 Message Date
John McLear
6a38826e9d
Merge pull request #3366 from ether/release/1.6.4
Release/1.6.4
2018-04-07 11:05:31 +01:00
John McLear
86ec963775 Fixes #3137
#3137
2018-04-06 13:52:04 +01:00
John McLear
f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility
Improved readibility
2018-04-03 17:22:08 +01:00
John McLear
bb83d39ff0
Merge pull request #3197 from User1m/patch-1
fixed plugin dependency issue
2018-04-03 13:13:11 +01:00
John McLear
83ce73b77b
Merge pull request #3134 from psaavedra/develop
WA added  in #1766 is not longer needed
2018-04-03 13:10:19 +01:00
Luc Didry
b0da9a579d Fix numbering line when plugin add padding-top (like ep_page_view) 2018-03-25 19:24:52 +02:00
Robert Helmer
38b1e0a35e better sanitize window location in error messages 2018-01-30 12:51:53 -08:00
Joas Souza
454f539561 Select formatting button on selection (#3301)
[feat] Select button when selection is on formatted text
2018-01-04 12:28:00 -02:00
Joas Souza
f1fcd16894 Add settings to scroll on edition out of viewport (#3282)
* Add scroll when it edits a line out of viewport

By default, when there is an edition of a line, which is out of the
viewport, Etherpad scrolls the minimum necessary to make this line
visible. This makes that the line stays either on the top or the bottom
of the viewport. With this commit, we add a setting to make possible to
scroll to a position x% pixels from the viewport. Besides of that, we
add a setting to make an animation of this scroll.
If nothing is changed on settings.json the Etherpad default behavior is
kept
2018-01-03 19:57:28 -02:00
Loïck Magniez
38cbff11a1 Adapted the padding due to the font-size modification 2017-11-23 16:24:08 +01:00
Loick Magniez
54e834194b Changed the color palette and changed the pad's font size to 16px 2017-11-22 16:04:17 +01:00
Luiza Pagliari
0e1414dcca Allow 'placeholder' to be a localizable attribute on HTML elements (#3257) 2017-09-21 17:49:33 -03:00
Luiza Pagliari
ed5213c9a2 Revert "[feat] Update l10n lib (#3248)" (#3249)
This reverts commit 6bcaa00a4b.
2017-08-15 11:09:56 -03:00
Luiza Pagliari
6bcaa00a4b [feat] Update l10n lib (#3248)
Last update was from 2014.

Fix #3244.
2017-08-15 10:22:59 -03:00
Stefan
f6456c0aa7 Merge pull request #3187 from tiblu/ep_prefs_different_cookie_for_different_protocol
#3179 - Using EP on same domain, but over different protocols causes "Warning: it appears that your browser does not have cookies enabled.
2017-07-30 11:49:29 +02:00
Jan Holub
8bd8be97b9 Added support for the Montserrat Font as discussed in #3201 (#3205)
* Added support for the Montserrat Font as discussed in #3201

I chose a thin version of the Font (namely Montserrat Light) as the regular font and Montserrat Regular as the bold version. The thin fonts just look better in my opinion.
2017-07-12 12:21:48 -03:00
Luiza Pagliari
8c57c8d0d6 Merge pull request #3206 from 00SteinsGate00/RobotoMono
Added RobotoMono as a more modern and pretty monospaced font
2017-07-12 08:02:08 -03:00
Jan Holub
7029248a76 Added RobotoMono as a more modern and pretty monospaced font, addressing #3201
I added RobotoMono-Regular and RobotoMono-Bold as TrueTypeFont files and included them into the list. I tred to stay in alphabetical order where possible.

The author of #3201 was asking for a more modern monospaced font.
2017-06-21 23:44:23 +02:00
Claudius Mbemba
8d60bd5234 fixed plugin dependency issue
running ./bin/run.sh after the 1st time caused the following error "TypeError: Cannot read property 'dependencies' of undefined".
fixed it.
2017-05-30 05:36:29 +02:00
Luiza Pagliari
b6cb46271b Merge pull request #3182 from storytouch/fix/do_not_hide_force_reconnect_modal
Improvements on modals and "force reconnect" messages
2017-05-29 11:05:37 -03:00
Luiza Pagliari
894ebffcaf [fix] Do not close ANY "force reconnect" message
Fix previous commit. As "force reconnect" buttons have all the same id
on DOM, on the previous commit we were only disallowing the first button
with that id on DOM -- "userdup" -- to be closed by a click on editor.
Casually the tests were using the same error to simulate a "force
reconnect", so even the tests were not getting the issue.
2017-05-12 07:03:40 -03:00
Luiza Pagliari
0cb8d31e95 [fix] Have one setting for each shortcut to create ordered list
This is an adjustment to #2891.
2017-05-11 14:56:09 -03:00
Luiza Pagliari
97038c2183 [fix] Fix shortcut enabling flag for 'ESC'
This is an adjustment to #2891.
2017-05-11 12:36:20 -03:00
Luiza Pagliari
cf686282ef Do not use cookie for pad shortcuts
Users still cannot choose which shortcuts they want to enable/disable,
so it does not make sense (yet) to have a cookie with that preference.

This can be reverted once we create an UI to change shortcuts, but
PLEASE PLEASE PLEASE do not read the cookie every time handleKeyEvent is
called!!!

This is an adjustment to #2891.
2017-05-11 12:26:14 -03:00
Luiza Pagliari
1ebcf0dc47 Merge pull request #2891 from bhldev/padShortcutDisable
Added pad shortcut disabling feature to settings.json
2017-05-11 11:29:25 -03:00
Mikk Andresen
c959cdbaa7 Pad_cookie.js to have isCookiesEnabled() cause wasNoCookie() is also true when User visits first time. 2017-05-05 11:17:07 +03:00
Mikk Andresen
582e2c3819 Use padcookie instead of raw prefs cookie reading 2017-05-05 11:07:54 +03:00
Mikk Andresen
7790c5606b Fix regexp 2017-05-05 10:54:26 +03:00
Mikk Andresen
96cc1ad55a Use different cookie name for different protocols - https://github.com/ether/etherpad-lite/issues/3179 2017-05-05 10:28:44 +03:00
Luiza Pagliari
9176bf9bad [fix] Do not close "force reconnect" messages
If a "force reconnect" message is displayed to the user, it means the
only way to go back to a healthy state is to reload the pad. So we
cannot hide this kind of message, like what is done with other modals
(eg: "settings").
2017-05-04 14:34:01 -03:00
Luiza Pagliari
4eec3763b4 [fix] Close modals when user clicks both on pad inner and outer
Also: split tests for automatic reconnection and regular modal tests.
2017-05-04 11:22:18 -03:00
Luiza Pagliari
0bd4169663 [fix] Block user from changing pad after he/she is disconnected
Use same approach of when channel state is chaged to "DISCONNECTED".
2017-05-03 12:59:57 -03:00
Luiza Pagliari
384697f653 [feature] Only automatically reconnect if can establish connection to server
Avoid trying to reload pad when network is not available.
2017-04-05 15:07:37 -03:00
Luiza Pagliari
0eae83f252 [feature] i18n for automatic reconnection messages/buttons 2017-04-04 18:09:33 -03:00
Luiza Pagliari
009cd31243 [feature] Create option to automatically reconnect after a few seconds
On some erros that display a modal with "Force reconnect" button, allow
Etherpad to automatically reload pad after a few seconds. Amount of
seconds is defined on settings.json.

Still need to create tests for this feature, and implement i18n.
2017-04-04 11:09:24 -03:00
Pablo Saavedra
f5810957b4 This WA is not longer required in the newest Chrome see comments in the issue: ether#2078
The hack is still necessary in Firefox 51
2017-02-02 13:53:32 +01:00
Luiza Pagliari
b2d9f57338 [fix] Consider line attribs of plugins when building changesets
When checking the places on text that are identical between content
before and after a changeset, we were considering only the standard
(Etherpad-core) attributes, and not taking into account attributes
created by the plugins. One consequence was that the '*' marker of lines
with line attribs were being kept, even when the new lines have
different line attribs. See #3118 for more details.

Fix #3118.
2017-01-12 12:42:56 -02: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
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
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
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
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
Dan Bornstein
0a9d02562d Handle relative paths properly, when @importing. 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
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
Luiza Pagliari
ea562250d9 Perform drag and drop in one changeset, so UNDO works properly. Fix #3041 2016-08-22 18:44:17 -03:00
Luiza Pagliari
c92e3e4b5e Fix #2918. Re-enable editor after user is reconnected to server 2016-07-21 15:23:14 -03:00