ilmar
4feccff530
merge with develop branch
2018-05-21 15:41:49 +03:00
ilmar
3c66425b60
List indent fix
2018-05-21 13:07:08 +03:00
ilmar
016497dbb4
prevLine/nextLine check fix
2018-05-14 22:57:15 +03:00
ilmar
47e20a2f49
line parsing fix
2018-05-03 00:07:07 +03:00
ilmar
6684f9bfe8
hook callAll to aCallAll
2018-05-02 11:45:48 +03:00
ilmar
55ecf31786
html export fix
2018-05-02 11:12:58 +03:00
ilmar
c9863f81ad
sync with ether/etherpad-lite
2018-05-02 11:08:57 +03:00
ilmar
8d27f3cf03
upgrade to 1.6.5
2018-04-24 13:31:40 +03:00
ilmar
7cc7bb1abc
upgrade to 1.6.5
2018-04-24 12:25:56 +03:00
ilmar
d6fa065ef2
export html to original structure
2018-04-24 12:13:31 +03:00
anugu-chegg
7b6a4aba30
Remove leftover code from earlier commits
2018-04-19 23:23:16 +02:00
anugu-chegg
b4068144c3
Refactor code
2018-04-19 23:23:16 +02:00
anugu-chegg
461ed413b7
Fix few mistakes
2018-04-19 23:23:16 +02:00
anugu-chegg
d41e184a3c
Send commits missed during the reconnect
2018-04-19 23:23:16 +02:00
anugu-chegg
bf05e9ae89
Handle client reconnect properly
2018-04-19 23:23:16 +02:00
ilmar
517b249394
D
2018-04-10 00:08:42 +03:00
Olivier Tétard
5b1e1f0c35
Fix typo in apicalls.js which prevents from importing isValidJSONPName.
2018-04-09 20:56:29 +02:00
ilmar
8502c04bee
html lists export fix
2018-04-09 15:37:28 +03:00
John McLear
fa83de778c
Password check fix
2018-04-07 10:31:47 +01:00
Peter 'Pita' Martischka
6d5dc93dbf
merged
2018-04-07 10:23:49 +01:00
thomas
ffe24c3dd9
Update webaccess.js
2018-04-06 22:21:33 +02:00
ilmar
b4ad7cf452
Export lists fix + code linting and readability update
2018-04-05 23:27:02 +03:00
Peter 'Pita' Martischka
a08c4383b8
check pad exists before importing / exporting
2018-04-04 21:48:32 +01:00
John McLear
6388055f51
Merge pull request #12 from nashe/no_findkeys_export
...
No findkeys during export
2018-04-04 19:36:59 +01:00
Peter 'Pita' Martischka
806c9207e3
remove findkeys from pad export
2018-04-04 18:02:54 +01:00
Mikk Andresen
20428bb427
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-04 13:52:27 +03:00
Mikk Andresen
a67aaa8f49
Merge remote-tracking branch 'upstream/master' into develop
2018-04-04 13:52:08 +03:00
John McLear
f15c7d7186
Merge pull request #3280 from lmagniez/ImprovedReadibility
...
Improved readibility
2018-04-03 17:22:08 +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
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
bb40aa00be
Update express.js
2018-04-03 10:59:10 +01:00
John McLear
50bbcb87bb
Merge pull request #4 from nashe/jsonp_fix
...
Added a jsonp var checker
2018-04-03 10:29:52 +01:00
Mikk Andresen
6f2466bebc
Merge with upstream develop.
2018-04-02 13:47:16 +03:00
John McLear
8767410a36
be more strict on password check
2018-03-23 19:21:52 +00:00
Peter 'Pita' Martischka
dd7894d3c9
Added a jsonp var checker
2018-03-23 11:17:39 +00: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
Luiza Pagliari
187e51948d
[fix] Don't show "pad deleted" message when copying pad ( #3320 )
...
Fix #3183
2018-02-16 14:18:51 -02:00
Man Yue Mo
a2992b3624
fix jsonp checking.
2018-02-07 08:43:07 +00:00
Stefan
b292e137ed
Added missing require for is-var-name
2018-02-03 12:33:33 +01:00
Robert Helmer
f56936c936
better sanitize jsonp
2018-01-30 12:52:19 -08: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
Avery Pennarun
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
Loick Magniez
54e834194b
Changed the color palette and changed the pad's font size to 16px
2017-11-22 16:04:17 +01:00
Rainer Rillke
f12debd5c7
Catch SIGTERM for graceful shutdown ( #3266 )
...
Shut down database connection and exit the node process
when SIGTERM is encountered. This is especially important
when nodejs is run as PID1, e.g. in a docker container.
Shutting down connections to clients (browsers) is beyond
this patche's scope.
Resolves #3265
2017-11-04 19:59:19 -02:00
ilmar
76f211b0bf
ExportHtml.js update
2017-11-01 09:48:23 +02:00
ilmar
5469ce85cd
exportHTML update
2017-10-31 22:46:24 +02:00
ilmar
724b1d734b
updated html export, run hooks also with lists
2017-10-31 16:23:41 +02:00
ilmar
c36a3264fe
fix to ether/etherpad-lite#2486
2017-10-21 01:04:53 +03:00
ilmar
69bf32cd46
fix to https://github.com/ether/etherpad-lite/issues/2486
2017-10-19 16:11:40 +03:00
Jainendra Mandavi
b4ddd0276d
Use abiword to process .rft files
2017-08-04 03:23:12 +05:30
Michael Braun
4cce3bcbed
Make APIKEY und SESSIONKEY file customizable
...
Running multiple instances sometimes requires different api- and session-keys for security reasons.
2017-07-31 15:31:45 +02:00
Stefan
5382b06ede
Merge pull request #3231 from jainendra/fix-2864-import-pdf
...
FIX-2864: Add useAbiword flag
2017-07-30 11:42:39 +02:00
Jainendra Mandavi
e4ddb42e11
FIX-2864: Add useAbiword flag
...
This is a fix for the issue - 2864
Which is import failure of PDF after importing a text file
2017-07-28 23:13:07 +05:30
Luiza Pagliari
3e5d71ad5a
Merge pull request #3214 from patrickeasters/add_credentials_arg
...
Add credentials arg to CLI module
2017-07-12 07:22:17 -03:00
Mikołaj Biel
2508b9749c
fix typo
2017-07-10 20:59:08 +02:00
Mikołaj Biel
35702a0589
[feat] New server-side hook: onAccessCheck
2017-07-10 20:54:32 +02:00
Patrick Easters
d72d79ea82
Fetch credentials arg from CLI
2017-07-05 15:20:02 -04:00
Luiza Pagliari
fc89034a55
[feat] New server-side hook: padCopy
...
Let plugins know when a pad is copied.
2017-05-18 18:52:14 -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
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
Luiza Pagliari
203a48b42d
Merge pull request #3136 from joassouza/fix_minify
...
Fix minification of JS files
2017-02-08 04:14:44 -02: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
Sjoerd Langkemper
21a6e66e25
Remove deprecated comment
...
The session key is currently stored in SESSIONKEY.txt, so it is no longer reset
every time the server starts.
2017-01-26 09:59:09 +01:00
noerw
cc69e76200
redirect /admin properly ( fix #3114 )
2017-01-06 18:19:38 +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
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
Nobody Really
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +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
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02: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
Stefan
4ea9c4f98d
Add secure flag to express-session cookies
2016-06-08 21:15:26 +02:00
Stefan
44370f11be
Merge pull request #2957 from ether/dependency_updates
...
Dependency updates
2016-06-07 21:32:20 +02:00
John McLear
d545630912
fixes #2945
2016-05-28 22:25:44 +01: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
Stefan
14e1f3bf22
Update socket.io to version 1.4.5
2016-04-26 18:55:58 +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
Brian Lim
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
John McLear
ef9cf974a2
Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-between-frames-sandbox
2016-01-10 14:37:44 +00:00
John McLear
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
John McLear
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
John McLear
638757fdb5
Update DB.js
2016-01-06 00:01:48 +00:00
John McLear
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
Chris Birk
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
