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
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
joassouza
0025613ba6
Refactor code
2017-02-07 15:06:49 -02:00
joassouza
d1e6c8492d
Fix minification of code
2017-02-07 13:04:22 -02:00
Dan Bornstein
0a9d02562d
Handle relative paths properly, when @importing.
2016-09-09 12:59:02 -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
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
Dan Bornstein
6d7f128b87
Use an EEJS template for HTML export instead of inlining it in the JS code.
...
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-24 16:25:31 -07:00
Stefan
6b9711cb70
Fixed path check
2016-06-20 00:22:29 +02:00
John McLear
b3b17c2190
Merge pull request #2991 from LokeshN/deactivate-settings
...
Issue #2960 - deactivate settings.json
2016-06-13 14:41:30 +08:00
LokeshN
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
Stefan
835bca7967
Use fs.statSync instead of fs.existsSync (deprecated)
2016-05-16 16:51:12 +02:00
John McLear
6b6a028355
include the padId
2016-04-09 20:01:49 +01:00
Brian Lim
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
98016665e4
working logic
2015-12-02 11:54:37 +00:00
Luiza Pagliari
92a8253449
Create hook exportHtmlAdditionalTagsWithData
...
The new hook does the same as exportHtmlAdditionalTags, but is declared
in another hook to avoid confusion about how to export tags when they
are stored as ['tag', 'value'] on attribute pool.
This complements #2762 , as per @Gared suggestions.
2015-11-03 07:16:55 -02:00
John McLear
3aff0001a1
Merge pull request #2798 from ypid/fixed_get_git_hash
...
Get git commit hash even if the repo only points to a bare repo.
2015-10-22 16:13:58 +01:00
John McLear
50171a4c3c
Merge pull request #2805 from storytouch/indentationSetting
...
Create setting to control if a new line will be indented or not
2015-10-22 16:12:07 +01:00
Simon Gaeremynck
7289e89070
Use Etherpad rather than Etherpad Lite when exporting HTML
2015-10-22 16:09:44 +01:00
Simon Gaeremynck
2bfc3026d2
Allow LibreOffice to be used when exporting a pad
...
This commit adds support for LibreOffice when exporting a pad to doc, pdf, ..
This commit also cleans up some export logic when exporting to txt
2015-10-20 19:46:08 +01:00
Luiza Pagliari
5deb06d589
Create setting to control if a new line will be indented or not
...
Currently pressing ENTER on a line that ends with ':', '[', '(' or '{'
automaticaly indents the new line with 4 spaces. The variable added by
this commit to settings.json allow an Etherpad instance to not have this
behavior.
2015-10-13 18:39:23 -03:00
Robin Schneider
29441a8ae1
Get git commit hash even if the repo only points to a bare repo.
...
* Used by https://github.com/debops/ansible-etherpad
2015-10-07 15:43:29 +02:00
Luiza Pagliari
1d134f0b13
Fixing ed52626. It was closing the span with </span data-TAG=VALUE>, not </span>
2015-09-17 15:30:09 -03:00
Luiza Pagliari
ed5262650a
Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VALUE>
2015-09-07 03:55:56 -07:00
Luiza Pagliari
1a5985dc75
Accepting Arrays on 'exportHtmlAdditionalTags' to handle attributes stored as ['key', 'value'] (and not only ['key', 'true'])
2015-08-24 07:58:45 -07:00
Thomas Russell Murphy
b557927b72
Fix link to etherpad-lite on GitHub
2015-08-03 21:53:54 -05:00
Stéphane Alnet
0b3216ecb6
Do not extend Array.prototype
2015-05-22 12:27:08 +02:00
John McLear
757ad765d3
use removeItem instead of remove namespace
2015-05-22 11:09:21 +01:00
John McLear
41d24a8c8f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-19 16:44:57 +01:00
John McLear
b662d5c618
dont show editing buttons in R/O view
2015-05-19 16:43:19 +01:00
Simon Gaeremynck
7fe99cccad
Using log4js in TidyHtml
2015-05-18 17:43:46 +01:00
Simon Gaeremynck
786b43efc8
Tidy HTML before trying to convert it with abiword
2015-05-18 16:24:41 +01:00
Xavid
9e86fb279b
Fix backend tests with new setText() implementation; tests depended
...
on the old setText() behavior leaving the last character.
2015-05-06 08:45:22 -04:00
Tom Hunkapiller
6ff7d4e9a6
revert to old path handling, but strip out "..". fixes #2614
2015-04-15 14:31:21 -05:00
louis
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
John McLear
e3f95d0c9c
Merge pull request #2604 from ether/pad-options
...
session key is now ignored and also padOptions are available in settings
2015-04-11 22:33:46 +01:00
Peter 'Pita' Martischka
fc0cac0cad
merge object settings into default settings
2015-04-11 22:01:46 +01:00
John McLear
8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
John McLear
4a70837de9
Merge pull request #2602 from devoidfury/fix/import-large-etherpad
...
fix large etherpad import, fixes #2524
2015-04-11 20:09:01 +01:00
Tom Hunkapiller
a896d67e8c
make setPadRaw async; streamline .etherpad file import handling chain
2015-04-11 12:02:19 -05:00
Stefan
a3ed82ad06
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 18:45:14 +02:00
Stefan
db5bdc8719
Log version number and git-sha on server start
2015-04-11 00:13:04 +02:00
Stefan
8e4c961207
Add version number to plugins-info page
2015-04-10 23:52:17 +02:00
John McLear
9d4e5f6e35
dont allow directory traversal
2015-04-10 22:02:22 +01:00
John McLear
a5345524e1
Merge pull request #2566 from ether/editbar-accessibility
...
Accessibility
2015-04-07 21:25:27 +01:00
John McLear
3a969f8dd8
pass error messages to pad text if shown during startup
2015-04-06 00:13:38 +01:00
John McLear
e027083136
timeslider settings for fonts
2015-04-05 15:18:36 +01:00
John McLear
662216b6cf
slightly different alt stuff
2015-03-31 16:36:44 +01:00
