muxator
df5618b274
ImportHandler: flattened code
...
Removed redundant else, no functional changes
2018-10-31 23:34:15 +01:00
muxator
fcd88de900
ImportHandler: flattened code
...
Removed redundant else, no functional changes
2018-10-31 23:31:23 +01:00
muxator
49a7572cee
ImportHandler: early return by condition inversion
...
No functional changes
2018-10-31 23:28:52 +01:00
muxator
df15daac0e
ImportHandler: early return by condition inversion
...
No functional changes
2018-10-31 23:27:22 +01:00
muxator
12bb97dc2d
ImportHandler: early return by condition inversion
...
No functional changes
2018-10-31 23:24:56 +01:00
muxator
2b8e45e2bd
ImportHandler: anticipated the error checking
...
No functional changes.
2018-10-31 23:22:50 +01:00
muxator
4c2ad68b69
ImportHandler: early return via DeMorgan's law
...
Inverted a boolean condition, no functional changes.
2018-10-31 23:20:55 +01:00
muxator
f652ba8c52
ImportHandler: flattened code
...
Removed redundant else, no functional changes
2018-10-31 23:16:20 +01:00
muxator
fb552b2dbb
ImportHandler: early return via DeMorgan's law
...
Inverted a boolean condition, no functional changes.
2018-10-31 23:15:01 +01:00
muxator
9d104cc4b0
ImportHandler: early return via DeMorgan's law
...
Inverted a boolean condition, no functional changes.
2018-10-31 23:09:27 +01:00
muxator
395db73eb1
ImportHandler: early return by condition inversion
...
No functional changes
2018-10-31 23:00:45 +01:00
muxator
6727a77073
ImportHandler: flatten code
...
No functional changes
2018-10-31 22:55:58 +01:00
Luc Didry
e8558e3497
Allow to import files using soffice
...
Currently, you have to use Abiword to convert odt, pdf and doc files to be able to import those files.
This add soffice as convertor too.
2018-10-31 22:21:48 +01:00
muxator
f6cef9dfd2
skins: fix timeslider support
...
Found by Sebastian Castro <90scastro@gmail.com>
This was really meant to be part of 9c990ab08a
2018-10-29 21:46:19 +01:00
translatewiki.net
20be994d9b
Localisation updates from https://translatewiki.net .
2018-10-18 08:18:00 +02:00
muxator
9774518525
dependencies: update graceful-fs, 4.1.3 -> 4.1.11
2018-10-17 00:37:35 +02:00
muxator
e68edcd23d
dependencies: update cookie-parser, 1.3.4 -> 1.4.3
2018-10-17 00:34:28 +02:00
muxator
f67fc3ad38
dependencies: update ejs, 2.5.7 -> 2.6.1
2018-10-17 00:31:55 +02:00
muxator
a585487802
dependencies: update semver, 5.1.0 -> 5.6.0
2018-10-17 00:28:21 +02:00
muxator
50b245d260
dependencies: update request, 2.83.0 -> 2.88.0
2018-10-17 00:27:51 +02:00
muxator
c69c0053b6
dependencies: update npm, 6.4.0 -> 6.4.1
2018-10-17 00:27:25 +02:00
muxator
5734eea10b
dependencies: update express, 4.16.3 -> 4.16.4
2018-10-17 00:26:51 +02:00
translatewiki.net
4f756d3953
Localisation updates from https://translatewiki.net .
2018-10-15 09:25:07 +02:00
translatewiki.net
4121add1b8
Localisation updates from https://translatewiki.net .
2018-10-03 22:03:52 +02:00
muxator
23eab79946
pad.html: for each client plugin, add a class to #editorcontainerbox
...
This commit implements the following behaviour:
1. adds a function clientPluginNames() to hooks.js (mimicking what is done in
static.js), which returns an array containing the list of currently installed
client side plugins. The array is eventually empty.
2. calls that function in pad.html at rendering time (thus server-side) to
populate a class attribute.
Example results:
- with no client-side plugins installed:
<div id="editorcontainerbox" class="">
- with some client-side plugins installed:
<div id="editorcontainerbox" class="ep_author_neat ep_adminpads">
Looking at the existing code (src/node/hooks/express/static.js#L39-L57), a
client-side plugin is defined as a plugin that implements at least a client side
hook.
NOTE: there is currently no support for notifying plugin removal/installation
to the connected clients: for now, in order to get an updated class list,
the clients will have to refresh the page.
Fixes #3488
2018-10-02 21:22:13 +02:00
translatewiki.net
2a5e87cc7d
Localisation updates from https://translatewiki.net .
2018-09-20 11:05:16 +02:00
translatewiki.net
051a8765e4
Localisation updates from https://translatewiki.net .
2018-09-13 10:54:15 +02:00
translatewiki.net
1fce593779
Localisation updates from https://translatewiki.net .
2018-09-06 21:23:58 +02:00
translatewiki.net
4a514706cb
Localisation updates from https://translatewiki.net .
2018-09-03 08:10:53 +02:00
muxator
1a93ab4eb5
db/Pad: reversed truthy condition to make core logic evident
...
Since the original comparison compared for truthy and not for "===", and it's
3 AM now, I blindly negated it, in order to show how fragile it was in the first
instance.
No functional changes.
This is the final commit of this refactoring series.
2018-08-29 03:03:34 +02:00
muxator
69e1bf28aa
db/Pad: reversed condition to make core logic evident. No functional changes
...
Here it was legal to replace a lax comparison with a strict one, since we are
using indexOf(), whose return value is known.
2018-08-29 02:52:26 +02:00
muxator
d931a700b4
db/Pad: reversed condition to make error handling evident. No functional changes
...
Here it was legal to replace a lax comparison with a strict one, since we are
using indexOf(), whose return value is known.
2018-08-29 02:49:40 +02:00
muxator
0e8789863c
db/Pad: removed unuseful else clause, no functional changes
2018-08-29 02:46:08 +02:00
muxator
049f5f2859
db/Pad: removed unuseful else clause, no functional changes
2018-08-29 02:44:51 +02:00
muxator
e90487c3e2
db/GroupManager: early return, no functional changes
2018-08-29 02:42:29 +02:00
muxator
a1d21c0cd2
db/GroupManager: early return, no functional changes
2018-08-29 02:41:53 +02:00
muxator
9ed7608421
db/GroupManager: early return, no functional changes
2018-08-29 02:41:14 +02:00
muxator
da8faa1aa9
db/GroupManager: early return, no functional changes
2018-08-29 02:40:14 +02:00
muxator
f7254a47ea
db/GroupManager: early return, no functional changes
2018-08-29 02:39:05 +02:00
muxator
604952bc97
db/GroupManager: fix indentation
...
This is to make easier on the eye the next change.
2018-08-29 02:38:09 +02:00
muxator
c85bcf0614
db/GroupManager: move inner function on top. No functional change
...
This is to make easier on the eye the next change.
2018-08-29 02:36:25 +02:00
muxator
6af419a88e
SecurityManager.js: early return, no functional changes
2018-08-29 02:33:29 +02:00
muxator
61823e7689
db/AuthorManager: early return, no functional changes
2018-08-29 02:28:40 +02:00
muxator
2b8646a855
db/AuthorManager: early return, no functional changes
2018-08-29 02:28:35 +02:00
muxator
b59818676e
db/API.js: early return to make error handling evident. No functional changes
2018-08-29 02:18:32 +02:00
muxator
67ce19eddb
db/API.js: removed unuseful else clause, no functional changes
2018-08-29 02:16:24 +02:00
muxator
610a6db8c8
db/API.js: early return, no functional changes
2018-08-29 02:13:06 +02:00
muxator
fef57efd46
db/API.js: early return, no functional changes
2018-08-29 02:10:45 +02:00
muxator
42bc0a59e1
db/API.js: early return, no functional changes
2018-08-29 02:09:33 +02:00
muxator
05a33f1533
db/API.js, SessionManager: lot of copied & pasted code in integer parsing
...
Replaced with an early return, no functional changes.
2018-08-29 02:08:05 +02:00
muxator
1d45a63864
db/API.js: early return, no functional changes
2018-08-29 01:57:00 +02:00
muxator
30d814d8ed
db/API.js: early return, no functional changes
2018-08-29 01:57:28 +02:00
muxator
4728736dd8
db/PadManager: early return, no functional changes
2018-08-29 01:47:38 +02:00
muxator
ecb0c41d29
db/PadManager: early return, no functional changes
2018-08-29 01:46:18 +02:00
muxator
12f224ae72
db/PadManager: early return, no functional changes
2018-08-29 01:44:13 +02:00
muxator
391bd79e03
padurlsanitize: early return, no functional changes
2018-08-29 01:38:55 +02:00
muxator
d19436d044
adminsettings: early return, no functional changes.
2018-08-29 01:34:45 +02:00
muxator
b60c0b122c
PadMessageHandler: reversed condition to make core logic evident. No behavioural changes.
...
This one replaces a big "if (message)" negating its truthy condition.
Being lame, I erred on the safe side and wrote a super ugly statement that is
guaranteed to respect the original logic.
In the hope that eventual logic errors become more evident now.
See: https://stackoverflow.com/questions/36661748/what-is-the-exact-negation-of-ifvariable-in-javascript#36661843
2018-08-29 01:23:38 +02:00
muxator
324929ca2d
PadMessageHandler: early return to reduce code depth.
...
Get rid of an else branch to simplify code layout. No functional changes at all.
==============
This series is an attempt to reduce the control structure depth of the code
base, maintaining at the same time its exact same behaviour, bugs included. It
is, in a sense, an initial attempt at a refactoring in the spirit of its
original definition [0].
The idea beyond this refactoring is that reducing the code depth and, sometimes,
inverting some conditions, bugs and logic errors may become easier to spot, and
the code easier to read.
When looked at ignoring whitespace changes, all of these diffs should appear
trivial.
[0] https://refactoring.com/
2018-08-29 00:57:28 +02:00
anoy
07bc163cb6
url encode pad name
2018-08-27 14:15:50 +02:00
muxator
fb1f8dd239
toolbar: missing var declaration
...
Without this, Etherpad would fail to start in strict mode:
"ReferenceError: SelectButton is not defined"
2018-08-27 01:34:01 +02:00
muxator
27b3b0ecd2
logs: on the server, use template literals when possible
...
It's just synctactic sugar, but it is always better than executing string
concatenations in one's mind.
Do not do this with files in src/static, because we want to keep IE 11
compatibility.
2018-08-27 01:29:37 +02:00
muxator
0e972aaecf
settings: reword some log messages
2018-08-27 01:56:33 +02:00
muxator
36f39a6e13
ace.js: remove template literals to keep IE 11 compatibility
...
Files in "src/static" are executed on the client: do not break browser
compatibility because of syntactic sugar.
Introduced in 9c990ab08a
.
2018-08-27 02:18:34 +02:00
muxator
7f7efa22b7
javascript license: we cannot assert the license of a custom skin.
...
Even in the previous versions, it made no sense.
Removing.
2018-08-26 22:28:31 +02:00
muxator
9c990ab08a
skins: finalize support for multiple skins
...
The old "static/custom" directory is replaced by "static/skins/<skinName>",
where <skinName> is taken from settings.json.
When no value is found, a default of "no-skin" is assumed, so that backward
compatibility is maintained.
The most evident security concerns have been addressed.
Closes #3471 .
2018-08-26 21:17:04 +02:00
muxator
e34c74b24d
skins: the settings class understands skinName. Send skinName value to the client
...
skinName must be a single string (no directory separators in it) pointing to an
existing directory under /src/static/skins.
In case these conditions are not met, its value is rewritten to "no-skin".
Also, the value of skinName if sent to the client via clientVars for allowing
its use it in the browser.
2018-08-26 21:17:04 +02:00
muxator
aba1c6f8bd
skins: moved "static/custom" -> "static/skins/no-skin"
...
The old empty skin created by the startup scripts becomes the default: no-skin.
2018-08-26 21:17:04 +02:00
muxator
0c518cadf5
skins: replace {js,css}.template with actual files. Simplify startup scripts.
...
Currently, an Etherpad skin requires the existence of 6 files:
- index.{css,js}
- pad.{css,js}
- timeslider.{css,js}
In the default empty skin (in static/custom), there were 2 small placeholders
({js,css}.template) to be copied in place by the startup script in case no skin
was in use.
Now that we are moving to multiple directories (see #3471 ) we can simply commit
the example files and remove the copying code from the startup script.
2018-08-26 21:17:04 +02:00
muxator
6c56e7ca7a
ace.js: use URL encoding when building an URL via string concatenation
...
Not performing encoding/decoding when traversing logical domains is a security
risk.
String concatenation is not great, too, but this change is just focused on
allowing the implementation of skin support.
2018-08-26 02:40:36 +02:00
Luc Didry
2cc32d7fe9
Add --writer option to soffice convert command
...
If you edit `src/templates/export_html.html` to remove the
`<meta name="changedby" content="Etherpad">` tag[1], PDF export with
soffice has a bug: the first word of the pad is deleted and a blank page
is inserted as first page (the pad's text begins on the second page).
The `--writer` soffice option avoids that bug.
[1] you may want to delete that tag since it is inserted as a comment in
.doc or .odt soffice export.
2018-08-24 18:26:51 +02:00
muxator
d1481041c2
specialpages: replace relative paths for sendfile() with absolute ones
...
This file uses it for robots.txt and favicon.ico.
This makes use of the new stable settings.root introduced with #3466 , and will
be modified when introducing support for custom skins.
2018-08-23 23:39:38 +02:00
muxator
9db5fd7884
AbsolutePaths: introduced isSubdir()
...
It can be used to check whether a user input or a configuration settings tries
to traverse the directory hierarchy, going out of its allowed bounds.
source: https://stackoverflow.com/questions/37521893/determine-if-a-path-is-subdirectory-of-another-in-node-js#45242825
2018-08-23 07:20:17 +02:00
translatewiki.net
0728e66723
Localisation updates from https://translatewiki.net .
2018-08-23 08:15:56 +02:00
muxator
ce14a99606
settings, APIHandler: use makeAbsolute() for locating APIKEY and SESSIONKEY
2018-08-23 07:02:45 +02:00
muxator
8247d5eef3
settings: use makeAbsolute() for locating settings.json and credentials.json
...
This should look to consistent locations when looking for relative paths,
without depending on current working directory.
For absolute paths, nothing changes.
2018-08-23 07:02:45 +02:00
muxator
435b2a4edf
settings: the dirtyDb file path is interpreted using makeAbsolute()
...
Otherwise its position depended on process.cwd
2018-08-23 07:02:45 +02:00
muxator
5406472d65
AbsolutePaths: makeAbsolute() computes an absolute path from a relative one
...
The base is assumed to be exports.findEtherpadRoot(), without depending on
process.cwd.
2018-08-23 07:02:45 +02:00
muxator
1b938a7a40
settings: compute exports.root via AbsolutePaths.findEtherpadRoot()
...
First steps for fixing #3466 .
2018-08-23 07:02:45 +02:00
muxator
b1a0e14ee2
AbsolutePaths: written findEtherpadRoot()
...
This is just a function (with an ugly side effect for caching purposes) that
heuristically tries to compute the Etherpad installation path when running under
Unix and win32 (they have different file system layouts).
This path can be used by Etherpad as a base for all the relative paths, in order
to be deterministic and not depending on cwd.
2018-08-23 07:02:45 +02:00
muxator
cbce3c1b08
AbsolutePaths: written utility function popIfEndsWith()
...
It will be necessary in the next commit to evaluate the Etherpad base
install path.
2018-08-23 07:02:45 +02:00
muxator
dbf7eff1fc
AbsolutePaths: module for deterministically computing relative Etherpad paths
...
Empty for now.
2018-08-23 07:02:45 +02:00
muxator
ec5573f88c
settings, APIHandler: generate more informative logs
2018-08-21 00:05:15 +02:00
muxator
b635371d52
settings: the default dirty.db location should be var/dirty.db
...
This is the location that is choosen by default when Etherpad starts with no
settings.json file.
It was different than the one contained into setting.json.template.
2018-08-21 21:57:13 +02:00
muxator
cb07805022
NodeVersion: take responsibility for ugly code
2018-08-22 00:12:53 +02:00
muxator
93641a165d
dependencies: update socket.io 1.7.3 -> 2.1.1
...
Version 2.x is not backwards compatible with 1.x.
However, according to [0], [1] and [2], it seems that the biggest concern is
when mixing different server and client versions, and this is not Etherpad's
case.
Smoke tested (successfully) on Firefox 61, Chromium 68.
npm audit before this change:
found 12 vulnerabilities (9 low, 3 high) in 8205 scanned packages
11 vulnerabilities require semver-major dependency updates.
1 vulnerability requires manual review. See the full report for details.
npm audit after this change:
found 1 low severity vulnerability in 8196 scanned packages
1 vulnerability requires manual review. See the full report for details.
Fixes #3462
[0] https://socket.io/blog/socket-io-2-0-0/
[1] https://github.com/socketio/socket.io/issues/3007#issuecomment-336791836
[2] a0d7a794de
2018-08-18 19:42:42 +02:00
muxator
4408a1e505
release: prepare for 1.7.0
...
Written the changelog and updated package.json.
From now on, releases will be cut from develop, and merged directly into master.
Each release will be a tag on the master branch (e.g. 1.7.0).
A "release/1.7.0" branch will eventually be created only if/when a hotfix will
be needed.
2018-08-17 00:18:31 +02:00
muxator
36b629346d
dependencies: updated npm to 6.4.0
2018-08-16 22:04:40 +02:00
muxator
fc14f60a4b
runtime: polyfill Object.values()
...
Minimum supported Node version is 6.9.0, but Object.values() was introduced in
Node < 7. Let's use a polyfill if needed.
This will be removed when minimum supported Node version is raised to 8.9.0.
Fixes #3459
2018-08-15 22:34:05 +02:00
muxator
9d815c58b8
deprecations: get rid of DEP0005 about Buffer()
...
Similar code still lives in some dependent libraries.
It will be updated when upgrading the dependencies.
Fixes #3446
2018-08-14 19:45:03 +02:00
muxator
6d5a6cf795
caching_middleware: removed unnecessary escape in regex
...
Found by eslint with "no-useless-escape"
2018-08-14 19:33:10 +02:00
"muxator ext:(%22)
42a0772955
dependencies: updated measured 1.1.0 -> measured-core 1.11.2
...
When installing dependencies, npm informed us that measured had been deprecated,
and renamed to measured-core. Let's follow the advice, and get rid of the
warning.
npm WARN deprecated measured@1.1.0: This package has been renamed to
measured-core, all versions of measured have been re-released under
measured-core, please update your package and consider updating to the newest
version. See https://github.com/yaorg/node-measured for latest updates.
This package is used to expose a single endpoint ("/stats"), whose output does
not change after this commit.
Fixes #3458
2018-08-14 13:22:41 +02:00
Masaru Nagaku
392f39b623
fix bug for getPadPlainText
2018-08-11 11:02:20 -03:00
Muh Muhten
3cedf474e5
Fix misparse of port when binding Unix socket
...
The hostname:port of URIs used in Minify are currently bogus and refer
to localhost only for historical reasons; there's no reason to retain
them and omitting them avoids generating an invalid URI when "port" is
not an integer.
Context: settings.port is passed to express's listen; if not numeric, it
is used a filename for a Unix domain socket.
This allows e.g. starting a server to be reverse-proxied on a multi-user
system, using the filesystem to handle access control and avoiding need
to allocate port numbers.
Before this change, etherpad-lite starts without error when configured
to listen on a Unix domain socket in this manner. However, `pad.js` and
`ace2_common.js` are generated incorrecting, causing an error
"Uncaught Error: The module at "ep_etherpad-lite/static/js/rjquery" does not exist."
when loading the editor:
When settings.port is a non-numeric string, e.g. `etherpad.sock`, a URI
of the form `http://localhost:etherpad.sock/static/js/rjquery.js ` is
generated and parsed to find the file needed. In this case, the file
searched for is `:etherpad.sock/static/js/rjquery.js`, rather than the
expected `static/js/rjquery.js`. No such file exists, and the required
code is silently omitted from the bundle.
As a workaround, hard-code a (meaningless) hostname which can be parsed
correctly, since the current code makes no use of it anyway.
2018-08-10 01:57:30 +02:00
Michael Braun
971853ca58
remove -k argument as it is currently for both sessionkey and apikey
2018-08-09 19:42:14 +02:00
muxator
65b9626669
dependencies: updated express & express-session
...
express: 4.13.4 -> 4.16.3
express-session: 1.13.0 -> 1.15.6
This, along with the previous commit, partially implements #3429 .
2018-07-29 01:44:49 +02:00
muxator
1101c0279f
dependencies: wd, 1.6.1 -> 1.10.3
...
It's a dev dependency, no breakages in backend and frontend tests.
2018-07-29 01:41:15 +02:00
muxator
a0d5eb18a0
tests: introduce istanbul.js to check code coverage
...
see: https://istanbul.js.org
2018-07-28 23:54:51 +02:00
muxator
f7000c786d
tests: update mocha 5.0.5 -> 5.2.0
...
This does not break any backend tests
2018-07-28 23:54:51 +02:00
muxator
4e10f4d52a
tests: sent Nyan Cat into eternal oblivion
...
Alive and kicking since 2014 (3ac833d455
), but it is now time to go on
2018-07-28 23:54:51 +02:00
muxator
379690abbf
tests: backend tests are now run with "npm test" instead of a custom bash script
2018-07-28 23:54:51 +02:00
muxator
1a4a26fc73
tests: move mocha among devDependencies in package.json
2018-07-28 23:54:51 +02:00
muxator
1f19b20796
tests: move supertest among devDependencies in package.json
2018-07-28 23:54:51 +02:00
muxator
a69f8a3db9
runtime: deprecate Node <= 7. From Etherpad 1.8.0 minimum Node version will be 8
2018-07-28 23:33:24 +02:00
muxator
7544585908
runtime: enforce minimal node version to 6.9.0
...
Etherpad 1.6.6 does not run on node <= 5 already.
Node 6.9 is the first LTS release in the 6 series, and comes with npm 3.10.8.
Declarations in package.json are advisory unless the user has set
`engine-strict` config flag.
Updated the docs accordingly.
2018-07-28 23:33:24 +02:00
translatewiki.net
7fa198d448
Localisation updates from https://translatewiki.net .
2018-07-26 10:04:02 +02:00
John McLear
a4c67f0d03
Update package.json
2018-07-20 17:54:48 +01:00
Dan Bornstein
2a876e5e9b
Ensure that all lines in the pad are marked with class ace-line
.
...
Without this change, lines that haven't ever been edited will have either
an empty class or, in the case of list start lines, a class that begins
with a space (because the `ace-line` before the space never got added).
2016-09-13 01:17:04 +02:00
translatewiki.net
7c971f24aa
Localisation updates from https://translatewiki.net .
2018-07-16 16:51:53 +02:00
Dan Bornstein
b98ee116b9
Fix typos in ordinal names
...
* `eigth` -> `eighth`
* `twelth` -> `twelfth`
* `sixthteenth` -> `sixteenth`
* `fixteenth` -> `sixteenth`
2016-09-09 00:52:04 +02:00
nashe
937ca09d74
Correctly display plugin list in troubleshooting tab
...
Fixes #3402 .
2018-07-15 23:47:44 +02:00
muxator
24b5817beb
package.json: last reformatting
...
These are the remaining non-whitespace changes needed to normalize package.json
formatting, bringing it in line with the npm 6.1.0 default format.
Future edits to this file should follow this default format, in order to
minimize churn.
2018-07-14 14:58:38 +02:00
muxator
896230ad7c
package.json: whitespace changes
...
Only cosmetic changes to make it easier to understand what changes in the other
commits.
This command:
git diff this-commit-hash^! --ignore-all-space
should give an empty output on this commit.
2018-07-14 14:44:48 +02:00
muxator
7992316c23
package.json: sorted dependencies alphabetically
...
When npm saves packages.json, it sorts the dependencies alphabetically. This
change reorders them.
Its aim, togheter with the next ones, is to have a diff that is inspectable.
Moreover, the mutation of package.json by installDeps.sh will be disabled with
a future change.
2018-07-14 14:19:50 +02:00
Luiza Pagliari
58c3154769
[fix] Ignore default line attribs when detecting edges of changeset ( #3420 )
...
When comparing original content with the changes made by the user, we
need to ignore some line attribs that are added by content collector,
otherwise we would consider the change started on the first char of the
line -- the '*' that is added when line has line attribs.
In order to be able to handle both #3354 and #3118 , we need to take into
account both the styles attribs (to fix #3354 ) and the line attribs
defined by any of the plugins (to fix #3118 ), but we can ignore those
extra line attribs that are added by Etherpad and do not add any
functionality (`'lmkr', 'insertorder', 'start'`).
2018-07-09 17:44:38 -03:00
translatewiki.net
380889b218
Localisation updates from https://translatewiki.net .
2018-07-02 07:56:19 +02:00
Mantary
2be873e3c7
Use keydown instead of keypress on Firefox.
2018-07-01 12:05:46 +02:00
Luc Didry
f35d3456cf
Fix FR dateformat
...
FYI, the dateformat in translatewiki is correct.
2018-06-29 01:23:17 +02:00
translatewiki.net
599b1f4568
Localisation updates from https://translatewiki.net .
2018-06-28 07:21:00 +02:00
translatewiki.net
dfd45f0f57
Localisation updates from https://translatewiki.net .
2018-06-21 08:17:13 +02:00
translatewiki.net
3362c683bc
Localisation updates from https://translatewiki.net .
2018-06-14 12:22:22 +02:00
translatewiki.net
d42393dc93
Localisation updates from https://translatewiki.net .
2018-05-31 08:22:54 +02:00
John McLear
fe08d2a1db
Merge pull request #3268 from citizenos/develop
...
getLineHTMLForExport - Fixes #2486 but breaks plugins
2018-05-21 15:56:58 +01:00
translatewiki.net
bacc37cf9b
Localisation updates from https://translatewiki.net .
2018-05-21 16:02:15 +02:00
ilmar
a96aa88dad
merge with ether/etherpad-lite develop branch
2018-05-21 16:18:40 +03:00
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
muxator
bfec44e346
Release version 1.6.6
2018-05-05 00:53:59 +02: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
translatewiki.net
ba322012d7
Localisation updates from https://translatewiki.net .
2018-04-23 08:52:57 +02: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
anugu-chegg
4265f4175e
Handle socketio errors properly
2018-04-19 23:23:16 +02:00
anugu-chegg
fb20c26c5f
Don't send COMMIT-MESSAGE when socketio connection is not active
2018-04-19 23:23:16 +02:00
Benjamin Schweizer
d26df86490
made url relative
2018-04-19 22:55:40 +02:00
translatewiki.net
4f2ff31a61
Localisation updates from https://translatewiki.net .
2018-04-19 09:20:05 +02:00
muxator
9daade0b95
fix: line numbers was not aligned with text
...
This change partially reverts 0a9d02562d
, which got released in 1.6.4
due to #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
translatewiki.net
6dc8ead8c9
Localisation updates from https://translatewiki.net .
2018-04-12 15:16:27 +02:00
translatewiki.net
686ce054fa
Localisation updates from https://translatewiki.net .
2018-04-12 09:12:18 +02:00
muxator
1d4e2b3b11
Release version 1.6.5
2018-04-10 00:47:40 +02:00
ilmar
517b249394
D
2018-04-10 00:08:42 +03:00
nashe
92eee85f36
Escape data when listing available plugins
2018-04-09 22:31:13 +02: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
translatewiki.net
1fdb01fd75
Localisation updates from https://translatewiki.net .
2018-04-09 08:17:36 +02:00
John McLear
b16e7ad25e
unbreak Safari iOS line wrapping
...
fixes f5810957b4 (diff-f639eb4efeaabf5624f3229daa1e88cd)
2018-04-07 18:11:24 +01:00
John McLear
fba2bf4df9
Update iframe_editor.css
2018-04-07 17:50:45 +01:00
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
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
John McLear
c34350f307
Beginning to make release
2018-04-07 09:22:13 +01:00
thomas
ffe24c3dd9
Update webaccess.js
2018-04-06 22:21:33 +02:00
John McLear
86ec963775
Fixes #3137
...
#3137
2018-04-06 13:52:04 +01: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
735052e1a2
Update package.json
2018-04-04 20:13:28 +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
John McLear
5a0afab02e
remove license thing from exports
2018-04-04 13:33:46 +01:00
Mikk Andresen
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
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
Mikk Andresen
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
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
bb83d39ff0
Merge pull request #3197 from User1m/patch-1
...
fixed plugin dependency issue
2018-04-03 13:13:11 +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
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
ilmar
cf82177b36
ueberDB2 update
2018-03-26 17:57:00 +03:00
Luc Didry
b0da9a579d
Fix numbering line when plugin add padding-top (like ep_page_view)
2018-03-25 19:24:52 +02:00
John McLear
6c2135bf9a
Merge pull request #6 from nashe/bumpDeps2
...
Update Deps
2018-03-24 11:08:19 +00:00
John McLear
8767410a36
be more strict on password check
2018-03-23 19:21:52 +00:00
John McLear
e285db9e80
Update Deps
...
https://i.imgur.com/cxFXNeY.png
2018-03-23 13:21:59 +00:00
Peter 'Pita' Martischka
dd7894d3c9
Added a jsonp var checker
2018-03-23 11:17:39 +00: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
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
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
Man Yue Mo
a2992b3624
fix jsonp checking.
2018-02-07 08:43:07 +00: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
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
translatewiki.net
291f700376
Localisation updates from https://translatewiki.net .
2018-01-01 15:26:09 +01: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
translatewiki.net
6ecc1c3895
Localisation updates from https://translatewiki.net .
2017-12-28 08:55:45 +01:00
translatewiki.net
d797344f56
Localisation updates from https://translatewiki.net .
2017-12-21 08:27:40 +01:00
translatewiki.net
924545525f
Localisation updates from https://translatewiki.net .
2017-12-07 08:58:49 +01:00
John McLear
bb11d014ab
Update package.json
2017-12-04 20:06:58 +00:00
Loïck Magniez
38cbff11a1
Adapted the padding due to the font-size modification
2017-11-23 16:24:08 +01:00
translatewiki.net
781b643775
Localisation updates from https://translatewiki.net .
2017-11-23 07:34:14 +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
translatewiki.net
c0f74cac5d
Localisation updates from https://translatewiki.net .
2017-11-20 09:07:26 +01:00
translatewiki.net
69f0560529
Localisation updates from https://translatewiki.net .
2017-11-16 10:54:04 +01:00
translatewiki.net
d519714914
Localisation updates from https://translatewiki.net .
2017-11-09 08:09:41 +01:00
translatewiki.net
407d95868b
Localisation updates from https://translatewiki.net .
2017-11-06 09:00:43 +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
Stefan (Gared)
baa372763c
Release version 1.6.2
2017-11-04 17:24:29 +01:00
Stefan (Gared)
e7b72f2234
Fix #3111 updating request to 2.83.0
2017-11-04 17:17:58 +01:00
ilmar
30400509ba
added tiblus ep_prefs_different_cookie_for_different_protocol
2017-11-03 10:47:54 +02:00
translatewiki.net
097c07adec
Localisation updates from https://translatewiki.net .
2017-11-02 08:12:10 +01: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
translatewiki.net
266b4a6a51
Localisation updates from https://translatewiki.net .
2017-10-23 04:59:18 +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
translatewiki.net
8c85205a80
Localisation updates from https://translatewiki.net .
2017-10-19 09:01:31 +02:00
Stefan
c85ffd663e
Merge pull request #3241 from djmaze/fix-socket-io-crash
...
Update socket.io to 1.7.3
2017-10-12 23:12:19 +02:00
translatewiki.net
bb80085c9a
Localisation updates from https://translatewiki.net .
2017-10-12 08:36:19 +02:00
Luiza Pagliari
0e1414dcca
Allow 'placeholder' to be a localizable attribute on HTML elements ( #3257 )
2017-09-21 17:49:33 -03:00
translatewiki.net
67439545a6
Localisation updates from https://translatewiki.net .
2017-09-21 09:21:11 +02:00
translatewiki.net
3f875a56e3
Localisation updates from https://translatewiki.net .
2017-09-11 07:16:33 +02:00
translatewiki.net
457fdaa360
Localisation updates from https://translatewiki.net .
2017-09-07 07:17:26 +02:00
translatewiki.net
a0aedd6793
Localisation updates from https://translatewiki.net .
2017-08-31 07:54:29 +02:00
translatewiki.net
c62f00477e
Localisation updates from https://translatewiki.net .
2017-08-21 07:36:39 +02:00
translatewiki.net
392d649f4d
Localisation updates from https://translatewiki.net .
2017-08-17 15:31:28 +02: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
translatewiki.net
9b9d604c09
Localisation updates from https://translatewiki.net .
2017-08-14 08:14:37 +02:00
translatewiki.net
e93d607165
Localisation updates from https://translatewiki.net .
2017-08-07 07:22:05 +02:00
Martin Honermeyer
f10e60713b
Update socket.io to 1.7.3
...
That in turn upgrades engine.io to 1.8.2. This fixes a crash for me when
running behind a traefik reverse proxy.
https://github.com/socketio/engine.io/issues/465
2017-08-04 15:42:25 +02:00
Jainendra Mandavi
b4ddd0276d
Use abiword to process .rft files
2017-08-04 03:23:12 +05:30
translatewiki.net
8abba28756
Localisation updates from https://translatewiki.net .
2017-08-03 10:39:40 +02:00
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
translatewiki.net
67c4e336e0
Localisation updates from https://translatewiki.net .
2017-07-31 14:58:13 +02: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
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
translatewiki.net
65fc8d830b
Localisation updates from https://translatewiki.net .
2017-07-27 10:10:28 +02:00
Matic Potočnik
cdaee77a76
Fix AbiWord wikilink and capitalization ( #3227 )
2017-07-26 21:42:42 -03: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
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
translatewiki.net
f9203524a4
Localisation updates from https://translatewiki.net .
2017-07-06 11:10:08 +02:00
Patrick Easters
d72d79ea82
Fetch credentials arg from CLI
2017-07-05 15:20:02 -04:00
translatewiki.net
12cb8e0dc1
Localisation updates from https://translatewiki.net .
2017-07-04 10:04:28 +02:00
translatewiki.net
b2ba0625f7
Localisation updates from https://translatewiki.net .
2017-07-03 07:35:44 +02:00
translatewiki.net
7b4f672b79
Localisation updates from https://translatewiki.net .
2017-06-26 09:07:27 +02: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
translatewiki.net
2e77a28695
Localisation updates from https://translatewiki.net .
2017-06-19 14:10:49 +02:00
translatewiki.net
0fdb031839
Localisation updates from https://translatewiki.net .
2017-06-15 07:47:04 +02:00
translatewiki.net
1db87e1133
Localisation updates from https://translatewiki.net .
2017-06-05 07:34:21 +02:00
translatewiki.net
1c26ac5c6f
Localisation updates from https://translatewiki.net .
2017-06-01 07:15:35 +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
translatewiki.net
faefa8a9ef
Localisation updates from https://translatewiki.net .
2017-05-29 07:50:59 +02:00
translatewiki.net
c7dac38af5
Localisation updates from https://translatewiki.net .
2017-05-21 09:52:24 +02:00
translatewiki.net
66df56559c
Localisation updates from https://translatewiki.net .
2017-05-20 10:53:31 +02: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
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
translatewiki.net
ef415880f0
Localisation updates from https://translatewiki.net .
2017-05-11 08:32:44 +02: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
translatewiki.net
b43137ad2c
Localisation updates from https://translatewiki.net .
2017-05-04 07:42:20 +02: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
translatewiki.net
32ed4315e2
Localisation updates from https://translatewiki.net .
2017-05-02 07:52:46 +02:00
translatewiki.net
51910e9187
Localisation updates from https://translatewiki.net .
2017-04-27 08:11:23 +02:00
translatewiki.net
5f0e7e01d7
Localisation updates from https://translatewiki.net .
2017-04-24 19:46:41 +02:00
translatewiki.net
bc5c8ec0cf
Localisation updates from https://translatewiki.net .
2017-04-20 07:28:20 +02:00
Luiza Pagliari
8081164a72
Merge pull request #3161 from ether/feature/automatic_force_reconnect
...
Feature: automatic force reconnect
2017-04-18 10:21:19 -03:00
Adam Niederer
11813f33a5
Butt On -> button
2017-04-15 20:12:44 -04:00
translatewiki.net
eea9304b4d
Localisation updates from https://translatewiki.net .
2017-04-06 07:14:59 +02: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
translatewiki.net
cf6b246688
Localisation updates from https://translatewiki.net .
2017-04-03 07:25:13 +02:00
translatewiki.net
ed029b599e
Localisation updates from https://translatewiki.net .
2017-03-30 07:40:12 +02:00
translatewiki.net
ce2c74d120
Localisation updates from https://translatewiki.net .
2017-03-20 07:24:19 +01:00
translatewiki.net
5eadc715a6
Localisation updates from https://translatewiki.net .
2017-03-13 08:08:38 +01:00
translatewiki.net
bc0eff6dd0
Localisation updates from https://translatewiki.net .
2017-03-06 08:49:04 +01:00
translatewiki.net
9515109308
Localisation updates from https://translatewiki.net .
2017-02-27 07:48:12 +01:00
translatewiki.net
393f651770
Localisation updates from https://translatewiki.net .
2017-02-23 09:00:01 +01: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
translatewiki.net
306e63c3f5
Localisation updates from https://translatewiki.net .
2017-02-06 07:52:00 +01:00
Luiza Pagliari
a6436ac8d2
Merge pull request #3119 from storytouch/fix_3118
...
Create plugin to run tests for line attribs + fix #3118
2017-02-02 17:54:20 -02: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
Stefan
40f54fed38
Merge pull request #3131 from Sjord/remove-outdated-comment
...
Remove deprecated comment
2017-01-29 12:54:17 +01: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
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
noerw
cc69e76200
redirect /admin properly ( fix #3114 )
2017-01-06 18:19:38 +01:00
Niklas Laxström
deed74c8c8
Localisation updates from https://translatewiki.net .
2017-01-02 09:00:13 +01:00
Niklas Laxström
f217e29071
Localisation updates from https://translatewiki.net .
2016-12-29 08:24:55 +01:00
Stefan
6dc808ad54
Release version 1.6.1
2016-12-23 21:59:57 +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
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
Niklas Laxström
db94ce9413
Localisation updates from https://translatewiki.net .
2016-12-19 07:36:35 +01:00
Niklas Laxström
d13a28a1ea
Localisation updates from https://translatewiki.net .
2016-12-15 07:31:34 +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
da5ae8b1f7
Merge pull request #3085 from Gared/fix_socketio_options
...
Updated option parameters for socket.io to work with latest version
2016-12-12 23:40:29 +01:00
Niklas Laxström
b41b4726d6
Localisation updates from https://translatewiki.net .
2016-11-24 08:24:37 +01:00
Stefan
352cec1811
Updated socket.io to 1.6.0
2016-11-20 12:44:59 +01: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
Siebrand Mazeland
602fd4629a
Localisation updates from https://translatewiki.net .
2016-11-17 09:50:45 +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
Niklas Laxström
223127bf39
Localisation updates from https://translatewiki.net .
2016-11-01 07:59:29 +01:00
Niklas Laxström
7dd934f714
Localisation updates from https://translatewiki.net .
2016-10-17 20:19:22 +02:00
Niklas Laxström
2c69511c62
Localisation updates from https://translatewiki.net .
2016-10-13 08:00:32 +02:00
Niklas Laxström
965af5a40b
Localisation updates from https://translatewiki.net .
2016-10-06 07:41:01 +02:00
rugk
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
...
Conflicts:
src/templates/index.html
2016-09-30 19:20:40 +02:00
John McLear
f289611ba9
Merge pull request #3059 from paper-pauper/librejs
...
Added LibreJS support
2016-09-28 23:02:40 +01:00
Niklas Laxström
93ca44f005
Localisation updates from https://translatewiki.net .
2016-09-27 13:58:36 +02:00
Niklas Laxström
b6e5a2283b
Localisation updates from https://translatewiki.net .
2016-09-22 07:27:50 +02:00
Nobody Really
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +02:00
Niklas Laxström
32eb6a2288
Localisation updates from https://translatewiki.net .
2016-09-15 08:18:13 +02:00
Niklas Laxström
7ecf240d9e
Localisation updates from https://translatewiki.net .
2016-09-13 07:44:27 +02:00
Dan Bornstein
0a9d02562d
Handle relative paths properly, when @import
ing.
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
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
Luiza Pagliari
7dd252f763
Merge pull request #3045 from danfuzz/extract-export-css
...
Use an EEJS template for HTML export instead of inlining it in the JS code.
2016-09-08 19:15:10 -03: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
Luiza Pagliari
5022912895
Merge pull request #3048 from danfuzz/fix-first-line-margin-top
...
Account for any top margin on the first line.
2016-09-08 05:59:36 -03:00
Niklas Laxström
b502c855d2
Localisation updates from https://translatewiki.net .
2016-09-08 10:08:19 +02:00
Niklas Laxström
fd7591c110
Localisation updates from https://translatewiki.net .
2016-09-05 07:14:04 +02: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
Niklas Laxström
8ad9d4f6dd
Localisation updates from https://translatewiki.net .
2016-08-25 07:33:25 +02: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
rugk
b5632b3ac5
Index: No-referrer
2016-08-23 22:12:40 +02:00
rugk
bf99cf92ab
Pad: Add no-referrer
2016-08-23 22:12:12 +02:00
rugk
8f133abacc
Timeslider: Add no-referrer
2016-08-23 22:11:11 +02: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
Niklas Laxström
bd20d44e89
Localisation updates from https://translatewiki.net .
2016-08-18 07:52:23 +02:00
Niklas Laxström
f147146519
Localisation updates from https://translatewiki.net .
2016-08-15 08:08:30 +02:00
Niklas Laxström
2996f0fad7
Localisation updates from https://translatewiki.net .
2016-08-04 07:57:38 +02:00
Niklas Laxström
08b90437c1
Localisation updates from https://translatewiki.net .
2016-08-01 08:08:45 +02:00
Niklas Laxström
cf3aaa334f
Localisation updates from https://translatewiki.net .
2016-07-28 07:59:29 +02:00
Niklas Laxström
17726856c6
Localisation updates from https://translatewiki.net .
2016-07-25 07:56:41 +02:00
Luiza Pagliari
c92e3e4b5e
Fix #2918 . Re-enable editor after user is reconnected to server
2016-07-21 15:23:14 -03:00
Niklas Laxström
3fcc7aa190
Localisation updates from https://translatewiki.net .
2016-07-18 08:48:25 +02:00
Stefan
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02:00
Niklas Laxström
728ab9307e
Localisation updates from https://translatewiki.net .
2016-07-07 07:52:57 +02:00
John McLear
ab4f23aae5
Merge pull request #2970 from xavidotron/url
...
Remove [ and ] from the regexp used by the URL filter.
2016-06-28 07:28:18 +01:00
John McLear
65dcb783d1
Merge pull request #3008 from Gared/directory_check
...
Fixed path check
2016-06-22 21:50:34 +01:00
Siebrand Mazeland
a18d40df6b
Localisation updates from https://translatewiki.net .
2016-06-22 16:38:16 +02:00
John McLear
f09e10b122
Merge pull request #2944 from storytouch/aceRegisterNonScrollableEditEvents
...
Create hook to register events that won't scroll editor after aceEditEvt
2016-06-20 10:36:53 +01:00
Niklas Laxström
3f4c8d35d6
Localisation updates from https://translatewiki.net .
2016-06-20 07:52:44 +02:00
Stefan
6b9711cb70
Fixed path check
2016-06-20 00:22:29 +02:00
Niklas Laxström
85cdb1cf4e
Localisation updates from https://translatewiki.net .
2016-06-16 08:11:53 +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
Niklas Laxström
25fd246091
Localisation updates from https://translatewiki.net .
2016-06-13 07:44:13 +02:00
Stefan
4ea9c4f98d
Add secure flag to express-session cookies
2016-06-08 21:15:26 +02:00
Stefan
06ff023047
Add secure flag to cookies on client side if pad accessed through https
2016-06-08 21:14:10 +02:00
Stefan
93dae51cda
Remove test cookie
2016-06-08 21:12:27 +02:00
Stefan
44370f11be
Merge pull request #2957 from ether/dependency_updates
...
Dependency updates
2016-06-07 21:32:20 +02:00
Stefan
5a868254e3
Merge pull request #2986 from Gared/fix_existssync_deprecated
...
Use fs.statSync instead of fs.existsSync (deprecated)
2016-06-07 21:30:22 +02:00
Niklas Laxström
3ea27d2613
Localisation updates from https://translatewiki.net .
2016-06-06 08:09:26 +02:00
John McLear
d545630912
fixes #2945
2016-05-28 22:25:44 +01:00
Niklas Laxström
a7405825a8
Localisation updates from https://translatewiki.net .
2016-05-26 07:57:20 +02:00
LokeshN
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
John McLear
73414df3c7
heh whoops :)
2016-05-20 14:43:01 +01:00
John McLear
a8487dd5dc
client Var value for disabling scripts
2016-05-20 14:42:05 +01:00
Niklas Laxström
94920e5552
Localisation updates from https://translatewiki.net .
2016-05-19 09:25:51 +02:00
Stefan
835bca7967
Use fs.statSync instead of fs.existsSync (deprecated)
2016-05-16 16:51:12 +02:00
Niklas Laxström
b24e62f90a
Localisation updates from https://translatewiki.net .
2016-05-12 08:59:06 +02:00
Xavid
9022877cc6
Remove [ and ] from the regexp used by the URL filter.
...
These characters are rarely used in URLs, and including them leads to
mislinkifying when editing various formats, such as wiki markup formats that
use [] around links.
2016-05-06 22:04:37 -04:00
Xavid
56b851a46f
Pass through the "item" parameter to registerAceCommand callbacks.
2016-05-06 21:58:24 -04:00
Stefan
2c177f553a
Updated several dependencies to latest version
2016-05-02 19:46:36 +02:00
Niklas Laxström
c5638dd7e5
Localisation updates from https://translatewiki.net .
2016-05-02 07:25:28 +02:00
Stefan
14e1f3bf22
Update socket.io to version 1.4.5
2016-04-26 18:55:58 +02:00
Stefan
ebe44b0eab
Release version 1.6.0
2016-04-24 21:03:42 +02:00
Niklas Laxström
15c9041f12
Localisation updates from https://translatewiki.net .
2016-04-18 07:04:42 +02:00
Niklas Laxström
6e78895cdd
Localisation updates from https://translatewiki.net .
2016-04-11 07:07:32 +02:00
John McLear
6b6a028355
include the padId
2016-04-09 20:01:49 +01:00
Niklas Laxström
21372c93a3
Localisation updates from https://translatewiki.net .
2016-04-07 08:00:19 +02:00
John McLear
282b1cdcfe
Merge pull request #2940 from ether/extend-getAttributesOnSelection
...
extend attributesonselection method
2016-04-05 22:30:15 +01:00
Luiza Pagliari
3fb695a7a0
Create hook to register events that won't scroll editor after aceEditEvt
2016-03-30 11:51:18 -03:00
Stefan
103e07e828
Fix document.domain error in frontend tests
2016-03-29 16:16:22 +02:00
Niklas Laxström
8f2f01dff8
Localisation updates from https://translatewiki.net .
2016-03-28 10:09:39 +02:00
John McLear
6f2e155668
Merge pull request #2898 from rohieb/feature/more-uri-schemes
...
Highlight and link more URI schemes: about, geo, tel
2016-03-26 22:14:38 +08:00
John McLear
8df8228a36
Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine
...
Update author when removing line attribute from line
2016-03-26 22:11:22 +08:00
John McLear
97b971747f
forgot this one
2016-03-26 22:01:26 +08:00
John McLear
4846798528
extend attributesonselection method
2016-03-26 22:00:34 +08:00
Niklas Laxström
7dd26bd250
Localisation updates from https://translatewiki.net .
2016-03-24 07:15:23 +01:00
Niklas Laxström
04e8b0c184
Localisation updates from https://translatewiki.net .
2016-03-21 07:09:41 +01:00
Stefan
02551d772c
Fix a possible xss attack in iframe link
2016-03-20 16:28:06 +01:00
Niklas Laxström
175c29ff66
Localisation updates from https://translatewiki.net .
2016-03-17 08:47:38 +01:00
Luiza Pagliari
9bcf8690c0
Update author when removing line attribute from line
...
This avoids raising error 'Trying to submit changes as another author in
changeset' when 2 authors change line attributes of the same line. This
fixes issue #2925 .
2016-03-15 15:44:00 -03:00
Niklas Laxström
a3188cf357
Localisation updates from https://translatewiki.net .
2016-03-14 08:09:25 +01:00
Siebrand Mazeland
b6ab6f2b13
Localisation updates from https://translatewiki.net .
2016-03-09 13:38:20 +01:00
Siebrand Mazeland
d88052726d
Localisation updates from https://translatewiki.net .
2016-02-19 15:05:09 +01:00
Stefan
6df7ff2d08
Merge pull request #2893 from bhldev/cssFontColors
...
Css default colors Issue #2853
2016-02-14 14:54:13 +01:00
Niklas Laxström
8b8811c7ad
Localisation updates from https://translatewiki.net .
2016-02-08 11:36:53 +01:00
Stefan
32d90418ca
Merge pull request #2890 from bhldev/languageTimesliderUrlParameter
...
Timeslider Not Translated Issue 2885
2016-02-06 22:38:02 +01:00
Niklas Laxström
319ebb29fd
Localisation updates from https://translatewiki.net .
2016-02-01 09:23:34 +01:00
Roland Hieber
dde4fdfdbd
Highlight and link more URI schemes: about, geo, tel
2016-01-30 19:03:42 +01:00
Niklas Laxström
b46e5db777
Localisation updates from https://translatewiki.net .
2016-01-25 07:38:47 +01:00
Stefan
fbe3710dda
Merge pull request #2863 from gutobenn/padname-size
...
Limit padname input field to 50 characters
2016-01-23 13:51:57 +01:00
Brian Lim
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
Brian Lim
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
Brian Lim
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
John McLear
d994baeefa
Merge pull request #2886 from bhldev/padOptionsLang
...
Set language cookie on initial load Issue #2882
2016-01-19 23:48:30 +00:00
John McLear
13d9bdf03a
Merge pull request #2887 from bhldev/editorListIndentOutdent
...
Editor List Fix for 2844 and 2812
2016-01-19 23:48:20 +00:00
Brian Lim
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
Niklas Laxström
0b521f6528
Localisation updates from https://translatewiki.net .
2016-01-18 08:01:50 +01:00
Brian Lim
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
John McLear
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00:00
Niklas Laxström
855bd270bd
Localisation updates from https://translatewiki.net .
2016-01-11 08:28:02 +01:00
John McLear
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
John McLear
50c6b5ed61
tidy up
2016-01-10 14:39:41 +00: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
f80407c6ff
removal
2016-01-08 13:41:52 +00:00
John McLear
cb874b695b
herp
2016-01-08 13:40:25 +00:00
John McLear
ae6110919f
removal
2016-01-08 13:39:59 +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
dbc777dd13
Merge pull request #2871 from tiblu/pad_userlist_add_usersOnline_fix_bug_in_users
...
pad_userlist.js: BUGFIX: users() returning duplicates on several calls. FEATURE: usersOnline() returns only online users
2016-01-05 21:15:52 +00:00
Mikk Andresen
ccbcf0ddce
Add usersOnline function to pad_userlist, fix a bug where several occurances of current user were pushed to users list.
2016-01-05 18:22:32 +02:00
John McLear
239f517afd
Update package.json
2016-01-03 01:03:05 +00:00
Mikk Andresen
aab7186486
Fix handleClientMessage_USER_* payloads not containing user info
2015-12-31 14:19:23 +02:00
Niklas Laxström
2e81b39028
Localisation updates from https://translatewiki.net .
2015-12-29 10:44:17 +01:00
John McLear
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
Augusto Bennemann
a34c8e4721
Limit padname size to 50 characters
2015-12-22 13:25:56 -02:00
John McLear
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
John McLear
577102b025
license
2015-12-21 16:29:09 +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
313f390e7a
remove logging
2015-12-17 21:56:33 -06:00
Chris Birk
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
John McLear
e98821cef7
bump socketio
2015-12-07 13:48:05 +00:00
John McLear
bf6e225aa2
include event on paste and drrororororop
2015-12-05 19:06:40 +00:00
John McLear
b3d44b6956
remove con log
2015-12-05 18:51:27 +00:00
John McLear
fa492dc926
ace drop event
2015-12-05 18:50:51 +00:00
John McLear
e2a0e3cd7f
whoops
2015-12-02 12:10:25 +00:00
John McLear
98016665e4
working logic
2015-12-02 11:54:37 +00:00
John McLear
1a303f06b6
Merge pull request #2850 from tiblu/aceEditorCSS_allow_external_css
...
aceEditorCSS hook to allow absolute paths to resources to include external CSS
2015-12-02 11:26:38 +00:00
John McLear
f44c444720
Merge pull request #2831 from fcassin/develop
...
Protect against a null atext value in cloneAText
2015-12-01 17:50:29 +00:00
John McLear
16bb28a0ff
Merge pull request #2848 from storytouch/develop
...
Update the bowser.js to the new version
2015-12-01 17:47:00 +00:00
John McLear
1a8462fb4f
remove unused variable
2015-12-01 17:40:16 +00:00
John McLear
4ae88b2ee7
Hook for export ocnvert control
2015-12-01 17:38:52 +00:00
joassouza
4c8c1f53b5
Update the bowser.js to the new version
...
With this new version of bowser.js is possible detect the OS as well,
no only the browser as the previous one. It brings support to
new browsers as well.
2015-12-01 11:53:49 -03:00
Mikk Andresen
ad2ea924b5
aceEditorCSS to allow absolute paths to resources to include external CSS
2015-12-01 14:16:44 +02:00
John McLear
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
John McLear
a8c2833759
clean up
2015-11-24 14:03:38 +00:00
John McLear
039a761eaf
allow settings to be applied from the filesystem
2015-11-24 14:02:37 +00:00
Francois Cassin
2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01:00
John McLear
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +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
d05fa6d97e
Merge pull request #2819 from bradarv90/develop
...
Fix for #2809
2015-11-02 13:09:42 +00:00
John McLear
c575c8b447
Merge pull request #2820 from storytouch/fix_2818
...
Fix logic to check if any hook handled ACE key event. Fix #2818
2015-11-02 13:08:30 +00:00
John McLear
2b980653d6
Merge pull request #2822 from storytouch/esc
...
Allow plugins handle "esc" key event
2015-11-02 13:08:01 +00:00
Luiza Pagliari
478f5788e3
Add callstack to aceSelectionChanged context
2015-10-30 12:13:43 -02:00
joassouza
959de82e2a
Allow plugins handle "esc" key event
2015-10-29 14:54:21 -03:00
Bradley Arvin
a9d7ab9e18
Fix for #2809
2015-10-28 13:28:54 -04:00
Luiza Pagliari
c551fe4c1e
Fix logic to check if any hook handled ACE key event. Fix #2818
...
Instead of checking if only the first hook had returned true, we check
all hooks.
2015-10-27 07:44:51 -02:00
John McLear
c337a0585c
Merge pull request #2724 from xavidotron/develop
...
Add a aceSelectionChanged hook to allow plugins to react when the cursor moves
2015-10-22 16:19:07 +01:00
John McLear
08c6e3e29f
Merge pull request #2739 from otetard/bugfix/fix_space_removal
...
Avoid space removal when pasting text from word processor.
2015-10-22 16:18:29 +01:00
John McLear
0d769632df
Merge pull request #2748 from CodeMichael/develop
...
allow /admin to run in a subdirectory
2015-10-22 16:17:10 +01: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
John McLear
5652adb4eb
Merge pull request #2813 from simong/export-libreoffice
...
Allow LibreOffice to be used when exporting a pad
2015-10-22 16:11:26 +01:00
John McLear
5df580ddee
Merge pull request #2810 from luser/append-text
...
Add an appendText API
2015-10-22 16:10:21 +01:00
Simon Gaeremynck
7289e89070
Use Etherpad
rather than Etherpad Lite
when exporting HTML
2015-10-22 16:09:44 +01:00
Siebrand Mazeland
f57aaa62fc
Localisation updates from https://translatewiki.net .
2015-10-22 11:32:46 +02:00
John McLear
82c7ca4ac3
add classes for bootstrap targeting, pew pew
2015-10-22 01:32:02 +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
Ted Mielczarek
a675659dc2
Add an appendText API
2015-10-19 15:27:09 -04:00
Stefan
504cc102a0
Merge pull request #2762 from storytouch/exportTagsAsArrays
...
Accepting Arrays on 'exportHtmlAdditionalTags'
2015-10-17 18:24:18 +02:00
Siebrand Mazeland
0ab3f3133e
Localisation updates from https://translatewiki.net .
2015-10-14 12:54:49 +02: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
Stefan
9d29b15def
Merge pull request #2730 from emilyxxie/clientready_hook
...
added clientReady hook
2015-10-10 13:30:36 +02:00
Stefan
22bf9c9297
Merge pull request #2799 from Gared/fix_url_location_error
...
Fix decode error if pad name contains special characters and is sanitized
2015-10-10 13:21:40 +02:00
webzwo0i
1ee1f818db
if granularity is negative, endNum is negative and loop
2015-10-09 14:55:59 +02:00
webzwo0i
31f7c7e0f2
check if ChangesetRequest granularity is a number ( #2796 )
2015-10-09 14:55:19 +02:00
Stefan
f6cebdad98
Fix decode error if pad name contains special characters and is sanitized
2015-10-08 20:46:15 +02: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
Andreas Fried
e6b0e954b5
Fix off-by-one: The chatHead is in fact a valid message index.
...
This fixes #2751 .
2015-09-30 00:48:15 +02:00
Luiza Pagliari
77496b357c
Merge pull request #2777 from storytouch/fix2772
...
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-28 15:28:26 -03:00
Siebrand Mazeland
9c8c3de1d8
Localisation updates from https://translatewiki.net .
2015-09-25 16:07:09 +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
Stefan
442f2a08f7
Merge pull request #2774 from ether/timeslider-fix
...
Timeslider: Fix "Return to pad" button
2015-09-16 16:07:37 +02:00
Siebrand Mazeland
c215795ab5
Localisation updates from https://translatewiki.net .
2015-09-10 10:30:24 +02:00
Luiza Pagliari
330d2b079d
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-08 11:55:36 -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
Stefan
92798f21e8
Merge pull request #2743 from lpagliari/develop
...
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-09-05 20:53:35 +02:00
Robin Buse
04a26a3e24
Timeslider: Fix "Return to pad" button
...
Closes #2768
2015-09-03 23:04:40 +02:00
Stefan
cc9f88e7ed
Merge pull request #2757 from Gared/doc_append_chat_message
...
Add appendChatMessage API to docs
2015-08-30 18:15:51 +02: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
Stefan
f27aacc5bf
Fix missing bracket
2015-08-15 22:41:59 +02:00
Stefan
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
CodeMichael
68e260783c
Merge pull request #2 from CodeMichael/patch-1
...
allow admin to run on a sub-directory
2015-08-07 08:34:31 -05:00
CodeMichael
6f6de64c4a
allow /admin to run on a sub-directory
2015-08-07 08:31:08 -05:00
CodeMichael
3b08ea6158
allow admin to run on a sub-directory
2015-08-07 08:30:29 -05:00
Stefan
93fd05ba02
Release version 1.5.7
2015-08-05 19:15:27 +02:00
Stefan
856fc5975b
Fix broken switchToPad method
2015-08-05 18:23:54 +02:00
Luiza Pagliari
0677501d0b
Removing style that makes editor scroll to the top on iOS without any action from the user
2015-08-04 07:46:46 -07:00
Thomas Russell Murphy
b557927b72
Fix link to etherpad-lite on GitHub
2015-08-03 21:53:54 -05:00
Olivier Tétard
275a7d31e0
Avoid space removal when pasting text from word processor.
...
Since bf380eea50
, some spaces were removed when pasting text from a word processor (at least using Libre Office). To avoid double space creations and space removal, we only remove line break which are tight to a space character.
2015-07-27 16:38:57 +02:00
Siebrand Mazeland
5c531eebc5
Localisation updates from https://translatewiki.net .
2015-07-23 18:52:24 +02:00
Emily Xie
21f0d12d31
clientReady hook- pass entire message, updated doc
2015-07-20 11:45:41 -04:00
Peter 'Pita' Martischka
31452b2db2
Merge pull request #2721 from lpagliari/develop
...
Complementing #2718 + Fixing empty toolbar when on read-only & menu_left has no button
2015-07-17 21:07:41 +01:00
Siebrand Mazeland
a31e6cd332
Localisation updates from https://translatewiki.net .
2015-07-14 16:22:35 +02:00
Xavid
008d4e653c
Add a aceSelectionChanged hook to allow plugins to react when the cursor
...
location changes.
2015-07-11 11:33:20 -04:00
Siebrand Mazeland
2003968263
Localisation updates from https://translatewiki.net .
2015-07-08 08:18:32 +02:00
Luiza Pagliari
67f4ad5887
Fix editbar height for read-only pads
2015-07-07 16:55:19 -03:00
Luiza Pagliari
8a0a1a65b1
Adding missing code to make toolbar be fixed on top/bottom of the screen for iOS devices.
...
This commit complements 9ccaeb5
.
2015-07-07 16:54:11 -03:00
Luiza Pagliari
47c4ca9c29
Fixing chat on bottom of the page for mobile devices
2015-07-03 18:38:46 -03:00
Luiza Pagliari
9ccaeb585b
Fixing toolbar on top of the page for mobile devices
2015-07-02 13:03:45 -07:00
Gerhard Großmann
7c0f3a6826
Added Helvetica Neue to the Normal font
2015-07-01 12:13:37 +02:00
Gerhard Großmann
c0f5b92e3d
Added CSS fallback fonts
...
I’m not sure if this is the correct and only place where to change this. I just gave the present fonts some fallbacks (when possible) but didn’t add, remove or merge fonts.
2015-07-01 10:42:33 +02:00
Xavid
ad137fa4c8
Restore newline-adding to setText() if passed string does not end in '\n'.
...
Add a test for the ending-in-'\n' case and update tests for the other case.
2015-06-30 04:47:55 -04:00
John McLear
90575064a9
aria-labels for everything
2015-06-28 17:14:37 +01:00
Clark Boylan
1060595676
Check for valid session in handleUserInfoUpdate
...
Address issue 2674 by checking that the session is valid and has a valid
author and padId before using it to update the userInfo for that
session. Otherwise it is possible that by the time we try to update a
session with new userInfo that session has disconnected and is no longer
available to be updated. Without this commit the etherpad-lite service
gracefully shutsdown whenever this happens.
2015-06-24 15:18:35 -07:00
Luiza Pagliari
6ed85b8787
Fixing @font-face src path to be able to use font icons on plugins when minify is on.
...
This is a commit similar to 56ce8e8
, which did the same for 'opendyslexic'.
2015-06-24 14:32:10 -03:00
John McLear
6b40961fc8
Merge pull request #2699 from xavidotron/develop
...
Add author information to the context for padCreate and padUpdate hooks.
2015-06-22 10:56:56 +01:00
Siebrand Mazeland
13fa863f4b
Localisation updates from https://translatewiki.net .
2015-06-22 11:52:20 +02:00
Xavid
a4fe0d0dc8
Add an 'author' entry to the context for the padCreate and padUpdate hooks.
2015-06-21 11:29:17 -04:00
Xavid
778e1e4641
Allow a return keypress in a list on the last line of a pad to create a new
...
line.
2015-06-19 14:03:22 -04:00
Xavid
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
Siebrand Mazeland
ef5e62e3a1
Localisation updates from https://translatewiki.net .
2015-06-18 13:25:28 +02:00
goldquest
32ba48835a
if variable not declared, test if null throws error
2015-06-17 18:54:19 +02:00
Luiza Pagliari
1353c093db
Add new icon to fontawesome subset: comment
2015-06-10 18:05:24 -03:00
John McLear
5a5d245c06
fix issues with redrawing focus back to input element would lose param selected name
2015-06-08 17:13:46 +01:00
Siebrand Mazeland
2fa2dc8a03
Localisation updates from https://translatewiki.net .
2015-06-08 16:09:38 +02:00
John McLear
b049f4bfc7
Merge pull request #2681 from lpagliari/develop
...
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 22:07:05 +01:00
Siebrand Mazeland
7e38e2c2b1
Localisation updates from https://translatewiki.net .
2015-05-25 13:00:34 +02:00
Luiza Pagliari
92aabe12dc
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 07:08:24 -03: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
0eb8b800cf
hide chat if its already open on readonly mode
2015-05-20 01:50:37 +01:00
John McLear
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
John McLear
fe7ab21c84
dont allow chat input or name input on read only pads
2015-05-19 17:52:43 +01:00
John McLear
818408cf49
other bits required for read only
2015-05-19 16:57:53 +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
John McLear
5615bab0d9
Merge pull request #2668 from simong/tidy
...
Tidy HTML before trying to convert it with abiword
2015-05-18 20:04:15 +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
Siebrand Mazeland
0c4b3f8124
Localisation updates from https://translatewiki.net .
2015-05-16 18:53:23 +02:00
John McLear
9e9207d8b6
Merge pull request #2657 from simong/cookie-parser
...
Use the cookie parser middleware
2015-05-11 15:10:45 +01:00
John McLear
3b91b46baa
always hide connected one second after connected
2015-05-10 11:46:49 +01:00
John McLear
f5ccd3ce6d
Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix
...
Bugfix innerText
2015-05-07 23:09:24 +01:00
Simon Gaeremynck
5a7750781b
Use the cookie parser middleware
2015-05-07 18:35:21 +01:00
John McLear
debca84ebe
Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys
2015-05-07 15:56:01 +00:00
John McLear
975bd99064
support for french stuff
2015-05-07 15:55:52 +00:00
Stefan Mintert
250afd0451
Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blob/WR-72-linebreak-cursorverhalten/static/hooks.js#L94
2015-05-07 16:47:14 +02:00
John McLear
ee0368fd0f
Merge pull request #2649 from xavidotron/develop
...
When using setText(), replace the entire existing text of the pad.
2015-05-06 16:37:07 +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
John McLear
361807e578
console msg should go to window
2015-05-06 00:36:42 +01:00
John McLear
c903cb3925
fix alt c and escape
2015-05-06 00:32:36 +01:00
John McLear
363d5d06b7
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-05 20:41:58 +01:00
John McLear
48c2b7cde1
fixes #2570
2015-05-05 20:41:40 +01:00
Xavid
5e64c292a4
When using setText(), replace the entire existing text of the pad,
...
rather than replacing all except the last letter.
2015-05-05 14:18:27 -04:00
0ip
9b85b8dc98
Fix popup border
2015-05-04 22:18:34 +02:00
Siebrand Mazeland
8967c3ea49
Localisation updates from https://translatewiki.net .
2015-05-04 10:39:03 +02:00
John McLear
0a9c631410
better fix for #2625
2015-05-01 20:44:36 +01:00
John McLear
4938c7be38
plugins always return html so use that endpoint
2015-04-29 20:54:41 +01:00
John McLear
da06ac6fd7
dont prompt twice on import fool
2015-04-29 16:40:29 +01:00
Alexander Sulfrian
74ad7a8584
timeslider: Fix export links
...
Names of the pads can contain more charaters than \w. So while
transforming the export links, we simply can allow all charaters
except the slash as pad names.
2015-04-29 16:39:40 +02:00
John McLear
ac41d150c0
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-04-28 23:42:11 +01:00
John McLear
1f471b0f81
show versions of plugins at startup, fixes #2642
2015-04-28 23:41:55 +01:00
John McLear
799b086216
Merge pull request #2641 from lpagliari/develop
...
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 23:05:39 +01:00
John McLear
dbb2956d2f
allow chrome to use control shift 1 to send ordered list
2015-04-28 15:48:12 +01:00
Luiza Pagliari
58ab17bf9e
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 05:31:07 -07:00
John McLear
254edffa9c
fixes #2547
2015-04-24 14:17:49 +01:00
John McLear
b349a4f226
probably fixes #2625
2015-04-23 17:49:08 +01:00
Andreas Åkre Solberg
ec7b3fc787
Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs
2015-04-22 20:29:19 +02:00
John McLear
b8192fd015
first attempt at fixing dead keys, it cant be this easy can it?
2015-04-17 17:01:15 +01:00
Stefan
2393ea01f0
Release version 1.5.6
2015-04-16 23:06:24 +02:00
Tom Hunkapiller
6ff7d4e9a6
revert to old path handling, but strip out "..". fixes #2614
2015-04-15 14:31:21 -05:00
Stefan
64d94cb346
Release version 1.5.5
2015-04-13 17:27:14 +02:00
John McLear
629f909d57
add some semicoolons to prevent chrome warning
2015-04-13 10:52:15 +01:00
louis
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
John McLear
6a027d88a9
fix older IEs
2015-04-12 13:00:01 +01:00
John McLear
5435063a2f
re-fix rtl
2015-04-12 10:35:24 +01: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
Stefan
43687f6e8b
Merge pull request #2601 from Gared/session_key_file
...
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 19:10:18 +02: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
John McLear
25092fcb90
Merge pull request #2600 from devoidfury/fix/junk-binary-files
...
fix: only match /javascript/* for caching middleware
2015-04-11 16:00:02 +01:00
Tom Hunkapiller
133188320a
fix: only match /javascript/* for caching middleware
2015-04-11 09:54:40 -05:00
John McLear
5ef22e649b
Merge pull request #2302 from Gared/create_pad_special_characters
...
Add check for special url characters to createPad API function
2015-04-11 14:56:26 +01:00
John McLear
27aa71f3a4
IE list fixes
2015-04-11 13:16:45 +01:00
John McLear
34c5441392
msg to self
2015-04-11 11:37:20 +01:00
John McLear
4d009ba445
bump underscore and require kernel
2015-04-11 11:32:46 +01:00
Stefan
aa0d14c7d7
Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters
2015-04-11 12:10:37 +02:00
John McLear
14fab9f441
FF middle click fix
2015-04-11 10:45:51 +01:00
John McLear
2ca0214661
bump versions outdated
2015-04-11 10:24:50 +01:00
Stefan
a69b2a9cd1
Merge pull request #2596 from ether/master
...
Master
2015-04-11 10:55:26 +02:00
John McLear
acc1a0626a
use latest ejs
2015-04-11 09:53:27 +01:00
Stefan
1b9a51c879
Release version 1.5.4
2015-04-11 10:19:02 +02:00
Tom Hunkapiller
0b0a349081
clearer comments about the path handling behavior
2015-04-11 09:05:51 +01:00
Tom Hunkapiller
5409eb314c
fix an issue in the path handling that allowed directory traversal
2015-04-11 09:05:32 +01:00
Tom Hunkapiller
2e4374c08d
clearer comments about the path handling behavior
2015-04-10 20:19:26 -05:00
Tom Hunkapiller
3ebb19d8a2
fix an issue in the path handling that allowed directory traversal
2015-04-10 20:03:00 -05:00
John McLear
402e53d88e
Merge pull request #2584 from devoidfury/express4
...
Express 4 support
2015-04-11 00:13:45 +01:00
Stefan
d47e201232
Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3
2015-04-11 00:49:26 +02:00
Stefan
d3277deafc
Increase etherpad version to 1.5.3
2015-04-11 00:32:18 +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
Tom Hunkapiller
fd1d285a77
fix the rest of the deprecation warnings
2015-04-10 14:18:30 -05:00
Tom Hunkapiller
6fad2ca39a
fix vulnerability
2015-04-10 06:16:17 -05:00
Tom Hunkapiller
de67714cf8
fix minify route path; update deprecated calls
2015-04-10 05:52:58 -05:00
Tom Hunkapiller
d0b39c01fb
update for express 4.x
2015-04-08 23:12:11 -05:00
John McLear
7b86eb09bc
new fix for #1766
2015-04-08 09:24:19 +01:00
John McLear
a5345524e1
Merge pull request #2566 from ether/editbar-accessibility
...
Accessibility
2015-04-07 21:25:27 +01:00
John McLear
a2e6a1bb4f
Merge pull request #2579 from ether/warnings-in-pad-contents
...
pass error messages to pad text if shown during startup
2015-04-07 21:24:47 +01:00
John McLear
7e99724fec
Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility
2015-04-06 13:19:42 +01:00
John McLear
a5aa58e28b
bump ueber
2015-04-06 13:18:44 +01:00
John McLear
e0270d0ba8
bump vs
2015-04-06 13:16:21 +01:00