4feccff530
merge with develop branch
2018-05-21 15:41:49 +03:00
3c66425b60
List indent fix
2018-05-21 13:07:08 +03:00
016497dbb4
prevLine/nextLine check fix
2018-05-14 22:57:15 +03:00
bfec44e346
Release version 1.6.6
2018-05-05 00:53:59 +02:00
47e20a2f49
line parsing fix
2018-05-03 00:07:07 +03:00
6684f9bfe8
hook callAll to aCallAll
2018-05-02 11:45:48 +03:00
55ecf31786
html export fix
2018-05-02 11:12:58 +03:00
c9863f81ad
sync with ether/etherpad-lite
2018-05-02 11:08:57 +03:00
8d27f3cf03
upgrade to 1.6.5
2018-04-24 13:31:40 +03:00
7cc7bb1abc
upgrade to 1.6.5
2018-04-24 12:25:56 +03:00
d6fa065ef2
export html to original structure
2018-04-24 12:13:31 +03:00
ba322012d7
Localisation updates from https://translatewiki.net .
2018-04-23 08:52:57 +02:00
7b6a4aba30
Remove leftover code from earlier commits
2018-04-19 23:23:16 +02:00
b4068144c3
Refactor code
2018-04-19 23:23:16 +02:00
461ed413b7
Fix few mistakes
2018-04-19 23:23:16 +02:00
d41e184a3c
Send commits missed during the reconnect
2018-04-19 23:23:16 +02:00
bf05e9ae89
Handle client reconnect properly
2018-04-19 23:23:16 +02:00
4265f4175e
Handle socketio errors properly
2018-04-19 23:23:16 +02:00
fb20c26c5f
Don't send COMMIT-MESSAGE when socketio connection is not active
2018-04-19 23:23:16 +02:00
d26df86490
made url relative
2018-04-19 22:55:40 +02:00
4f2ff31a61
Localisation updates from https://translatewiki.net .
2018-04-19 09:20:05 +02:00
9daade0b95
fix: line numbers was not aligned with text
...
This change partially reverts 0a9d02562d#3280 .
Text size and line alignment are now reverted back to their 1.6.3
appearance (thus stay non customizable, for now).
Fixes #3378
2018-04-13 18:32:39 +02:00
6dc8ead8c9
Localisation updates from https://translatewiki.net .
2018-04-12 15:16:27 +02:00
686ce054fa
Localisation updates from https://translatewiki.net .
2018-04-12 09:12:18 +02:00
1d4e2b3b11
Release version 1.6.5
2018-04-10 00:47:40 +02:00
517b249394
D
2018-04-10 00:08:42 +03:00
92eee85f36
Escape data when listing available plugins
2018-04-09 22:31:13 +02:00
5b1e1f0c35
Fix typo in `apicalls.js` which prevents from importing `isValidJSONPName`.
2018-04-09 20:56:29 +02:00
8502c04bee
html lists export fix
2018-04-09 15:37:28 +03:00
1fdb01fd75
Localisation updates from https://translatewiki.net .
2018-04-09 08:17:36 +02:00
b16e7ad25e
unbreak Safari iOS line wrapping
...
fixes f5810957b4 (diff-f639eb4efeaabf5624f3229daa1e88cd)
2018-04-07 18:11:24 +01:00
fba2bf4df9
Update iframe_editor.css
2018-04-07 17:50:45 +01:00
6a38826e9d
Merge pull request #3366 from ether/release/1.6.4
...
Release/1.6.4
2018-04-07 11:05:31 +01:00
fa83de778c
Password check fix
2018-04-07 10:31:47 +01:00
6d5dc93dbf
merged
2018-04-07 10:23:49 +01:00
c34350f307
Beginning to make release
2018-04-07 09:22:13 +01:00
ffe24c3dd9
Update webaccess.js
2018-04-06 22:21:33 +02:00
86ec963775
Fixes #3137
...
#3137
2018-04-06 13:52:04 +01:00
b4ad7cf452
Export lists fix + code linting and readability update
2018-04-05 23:27:02 +03:00
a08c4383b8
check pad exists before importing / exporting
2018-04-04 21:48:32 +01:00
735052e1a2
Update package.json
2018-04-04 20:13:28 +01:00
6388055f51
Merge pull request #12 from nashe/no_findkeys_export
...
No findkeys during export
2018-04-04 19:36:59 +01:00
806c9207e3
remove findkeys from pad export
2018-04-04 18:02:54 +01:00
5a0afab02e
remove license thing from exports
2018-04-04 13:33:46 +01:00
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
20428bb427
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-04 13:52:27 +03:00
a67aaa8f49
Merge remote-tracking branch 'upstream/master' into develop
2018-04-04 13:52:08 +03:00
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
f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility
...
Improved readibility
2018-04-03 17:22:08 +01:00
8edd8e1291
Update package.json
2018-04-03 15:47:02 +01:00
f4f032afc0
Merge pull request #3297 from apenwarr/auth-sequence
...
Call authentication hooks before default basic authentication.
2018-04-03 13:41:51 +01:00
2765a95774
Merge pull request #3218 from klausweiss/develop
...
Feature: New server-side hook: onAccessCheck
2018-04-03 13:38:47 +01:00
d393bf4dd8
Merge pull request #3232 from michael-dev/develop
...
Make APIKEY and SESSIONKEY file customizable
2018-04-03 13:34:49 +01:00
bb83d39ff0
Merge pull request #3197 from User1m/patch-1
...
fixed plugin dependency issue
2018-04-03 13:13:11 +01:00
18dd90139a
Merge pull request #3115 from noerw/redirect_fix
...
redirect /admin properly (fix #3114 )
2018-04-03 13:10:36 +01:00
83ce73b77b
Merge pull request #3134 from psaavedra/develop
...
WA added in #1766 is not longer needed
2018-04-03 13:10:19 +01:00
022783a774
Merge pull request #3239 from jainendra/jainendra-feature-support-for-rtf
...
Feature: Support for uploading .rtf files rich text format
2018-04-03 13:07:00 +01:00
bb40aa00be
Update express.js
2018-04-03 10:59:10 +01:00
50bbcb87bb
Merge pull request #4 from nashe/jsonp_fix
...
Added a jsonp var checker
2018-04-03 10:29:52 +01:00
6f2466bebc
Merge with upstream develop.
2018-04-02 13:47:16 +03:00
cf82177b36
ueberDB2 update
2018-03-26 17:57:00 +03:00
b0da9a579d
Fix numbering line when plugin add padding-top (like ep_page_view)
2018-03-25 19:24:52 +02:00
6c2135bf9a
Merge pull request #6 from nashe/bumpDeps2
...
Update Deps
2018-03-24 11:08:19 +00:00
8767410a36
be more strict on password check
2018-03-23 19:21:52 +00:00
e285db9e80
Update Deps
...
https://i.imgur.com/cxFXNeY.png
2018-03-23 13:21:59 +00:00
dd7894d3c9
Added a jsonp var checker
2018-03-23 11:17:39 +00:00
cb856ea624
Localisation updates from https://translatewiki.net .
2018-03-22 08:09:21 +01:00
d80d64a217
Localisation updates from https://translatewiki.net .
2018-03-19 20:58:02 +01:00
49bbb0b59f
Localisation updates from https://translatewiki.net .
2018-03-12 08:57:37 +01:00
82816acf4a
Fix .doc export with LibreOffice (soffice) ( #3338 )
...
When using LibreOffice to convert pads to doc, we got `Error: no export filter for /tmp/xxxx.doc` (tested with LO 5 and 6). Maybe it's a regression from LO. Anyway, converting HTML to odt, then to doc works.
Thx to lpagliari for her review!
2018-03-08 10:44:11 -03:00
6aa19c56a8
Localisation updates from https://translatewiki.net .
2018-03-08 09:28:32 +01:00
6f979ca1ef
Localisation updates from https://translatewiki.net .
2018-02-22 12:08:59 +01:00
187e51948d
[fix] Don't show "pad deleted" message when copying pad ( #3320 )
...
Fix #3183
2018-02-16 14:18:51 -02:00
0c806b7fc0
Localisation updates from https://translatewiki.net .
2018-02-15 09:49:08 +01:00
0495dbdb16
Update ueberdb dep to 0.3.6 ( #3326 )
2018-02-14 15:07:50 -02:00
a2992b3624
fix jsonp checking.
2018-02-07 08:43:07 +00:00
1e25e7fc77
Release version 1.6.3
2018-02-03 12:57:22 +01:00
b292e137ed
Added missing require for is-var-name
2018-02-03 12:33:33 +01:00
a03422b094
Merge pull request #3313 from rhelmer/sanitize-window-location
...
better sanitize window location in error messages
2018-01-31 08:25:59 +00:00
f56936c936
better sanitize jsonp
2018-01-30 12:52:19 -08:00
38b1e0a35e
better sanitize window location in error messages
2018-01-30 12:51:53 -08:00
d7c93b0c0d
Localisation updates from https://translatewiki.net .
2018-01-29 09:05:18 +01:00
832855cc21
Localisation updates from https://translatewiki.net .
2018-01-25 05:17:41 +01:00
281b211332
Localisation updates from https://translatewiki.net .
2018-01-22 15:03:53 +01:00
a16bc9cd3a
Localisation updates from https://translatewiki.net .
2018-01-18 08:31:51 +01:00
454f539561
Select formatting button on selection ( #3301 )
...
[feat] Select button when selection is on formatted text
2018-01-04 12:28:00 -02:00
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
291f700376
Localisation updates from https://translatewiki.net .
2018-01-01 15:26:09 +01:00
e0582797f2
Call authentication hooks before default basic authentication.
...
This allows authenticators to do any extra session setup for a given user,
even if their username/password happens to match settings.json.
2017-12-31 12:32:50 +00:00
6ecc1c3895
Localisation updates from https://translatewiki.net .
2017-12-28 08:55:45 +01:00
d797344f56
Localisation updates from https://translatewiki.net .
2017-12-21 08:27:40 +01:00
924545525f
Localisation updates from https://translatewiki.net .
2017-12-07 08:58:49 +01:00
bb11d014ab
Update package.json
2017-12-04 20:06:58 +00:00
38cbff11a1
Adapted the padding due to the font-size modification
2017-11-23 16:24:08 +01:00
781b643775
Localisation updates from https://translatewiki.net .
2017-11-23 07:34:14 +01:00
54e834194b
Changed the color palette and changed the pad's font size to 16px
2017-11-22 16:04:17 +01:00
c0f74cac5d
Localisation updates from https://translatewiki.net .
2017-11-20 09:07:26 +01:00
69f0560529
Localisation updates from https://translatewiki.net .
2017-11-16 10:54:04 +01:00
d519714914
Localisation updates from https://translatewiki.net .
2017-11-09 08:09:41 +01:00
407d95868b
Localisation updates from https://translatewiki.net .
2017-11-06 09:00:43 +01:00
ilmar
