Commit Graph

4935 Commits (735052e1a22828337507f5168420f2daa242d864)

Author SHA1 Message Date
John McLear 735052e1a2
Update package.json 2018-04-04 20:13:28 +01:00
John McLear 5a0afab02e
remove license thing from exports 2018-04-04 13:33:46 +01:00
John McLear f5aed706b7
Update README.md 2018-04-03 19:55:55 +01:00
John McLear ba732a6b9e
Update README.md 2018-04-03 18:05:26 +01:00
John McLear f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility
Improved readibility
2018-04-03 17:22:08 +01:00
John McLear 8edd8e1291
Update package.json 2018-04-03 15:47:02 +01:00
John McLear f4f032afc0
Merge pull request #3297 from apenwarr/auth-sequence
Call authentication hooks before default basic authentication.
2018-04-03 13:41:51 +01:00
John McLear 2765a95774
Merge pull request #3218 from klausweiss/develop
Feature: New server-side hook: onAccessCheck
2018-04-03 13:38:47 +01:00
John McLear d393bf4dd8
Merge pull request #3232 from michael-dev/develop
Make APIKEY and SESSIONKEY file customizable
2018-04-03 13:34:49 +01:00
John McLear 18dd90139a
Merge pull request #3115 from noerw/redirect_fix
redirect /admin properly (fix #3114)
2018-04-03 13:10:36 +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
John McLear 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
John McLear 0c8b9e13fa
Merge pull request #3242 from BenaeSan/master
FIX the installOnWindows Error
2018-04-03 13:06:30 +01:00
John McLear ad89cb7d78
Merge pull request #3331 from sevu/pythonv2
specify python version in shebang
2018-04-03 13:00:45 +01:00
John McLear e6e46404d1
Merge pull request #3342 from caugner/patch-1
Add checkPad variant to check all pads/revisions
2018-04-03 12:58:23 +01:00
John McLear eb9875ee32
Merge pull request #3352 from ldidry/fix-line-numbers
Fix line number display when plugin add padding-top (like ep_page_view)
2018-04-03 12:57:55 +01:00
John McLear 074c9c6ddd
Merge pull request #3356 from meetbryce/patch-1
Fix bug with cleanRun.sh
2018-04-03 12:57:43 +01:00
John McLear 09c2c034c4
Continue to make README suck even less.. REALLY! 2018-04-03 12:57:14 +01:00
John McLear 6047c0de09
Make README not suck. 2018-04-03 12:52:34 +01:00
Bryce York 4a18f0d97d
Fix bug with cleanRun.sh
Now works if the output of `pwd` has a space in it.
2018-03-28 22:38:30 +11:00
Luc Didry b0da9a579d Fix numbering line when plugin add padding-top (like ep_page_view) 2018-03-25 19:24:52 +02:00
translatewiki.net cb856ea624 Localisation updates from https://translatewiki.net. 2018-03-22 08:09:21 +01:00
translatewiki.net d80d64a217 Localisation updates from https://translatewiki.net. 2018-03-19 20:58:02 +01:00
translatewiki.net 49bbb0b59f Localisation updates from https://translatewiki.net. 2018-03-12 08:57:37 +01:00
Claas Augner 5c915062e1
checkAllPads: Increase performance/resilience
Performance: Don't preload pads. Check for pool only once per pad.
Resilience: Handle missing revision.
2018-03-09 14:02:22 +01:00
Claas Augner 5c864ec47d
Add checkPad variant to check all pads/revisions 2018-03-09 13:45:24 +01:00
Luc Didry 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
translatewiki.net 6aa19c56a8 Localisation updates from https://translatewiki.net. 2018-03-08 09:28:32 +01:00
Severin Glöckner 0139965864 specify python version 2018-03-01 07:57:46 +01:00
sevu 67a4209df9 use apt instead of apt-get (#3330) 2018-02-28 06:53:13 -03:00
translatewiki.net 6f979ca1ef Localisation updates from https://translatewiki.net. 2018-02-22 12:08:59 +01:00
Luiza Pagliari 187e51948d
[fix] Don't show "pad deleted" message when copying pad (#3320)
Fix #3183
2018-02-16 14:18:51 -02:00
translatewiki.net 0c806b7fc0 Localisation updates from https://translatewiki.net. 2018-02-15 09:49:08 +01:00
Luc Didry 0495dbdb16 Update ueberdb dep to 0.3.6 (#3326) 2018-02-14 15:07:50 -02:00
pedro-nonfree 4ae95c4107 documentation now is in doc/ (#3322) 2018-02-08 16:58:27 -02:00
John McLear f8e7a24f5e
Merge pull request #3321 from mmosemmle/jsonp_fix
Fix jsonp checking
2018-02-08 16:19:04 +00:00
Man Yue Mo a2992b3624 fix jsonp checking. 2018-02-07 08:43:07 +00:00
Stefan 0c9475e366
Merge pull request #3316 from ether/release/1.6.3
Release version 1.6.3
2018-02-03 13:01:24 +01:00
Stefan 1e25e7fc77 Release version 1.6.3 2018-02-03 12:57:22 +01:00
Stefan b292e137ed Added missing require for is-var-name 2018-02-03 12:33:33 +01:00
John McLear 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
John McLear 626e58cc5a
Merge pull request #3314 from rhelmer/sanitize-jsonp
better sanitize jsonp
2018-01-31 08:25:43 +00:00
Robert Helmer f56936c936 better sanitize jsonp 2018-01-30 12:52:19 -08:00
Robert Helmer 38b1e0a35e better sanitize window location in error messages 2018-01-30 12:51:53 -08:00
translatewiki.net d7c93b0c0d Localisation updates from https://translatewiki.net. 2018-01-29 09:05:18 +01:00
translatewiki.net 832855cc21 Localisation updates from https://translatewiki.net. 2018-01-25 05:17:41 +01:00
translatewiki.net 281b211332 Localisation updates from https://translatewiki.net. 2018-01-22 15:03:53 +01:00
translatewiki.net a16bc9cd3a Localisation updates from https://translatewiki.net. 2018-01-18 08:31:51 +01: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