b43137ad2c
Localisation updates from https://translatewiki.net .
2017-05-04 07:42:20 +02:00
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
32ed4315e2
Localisation updates from https://translatewiki.net .
2017-05-02 07:52:46 +02:00
51910e9187
Localisation updates from https://translatewiki.net .
2017-04-27 08:11:23 +02:00
5f0e7e01d7
Localisation updates from https://translatewiki.net .
2017-04-24 19:46:41 +02:00
bc5c8ec0cf
Localisation updates from https://translatewiki.net .
2017-04-20 07:28:20 +02:00
8081164a72
Merge pull request #3161 from ether/feature/automatic_force_reconnect
...
Feature: automatic force reconnect
2017-04-18 10:21:19 -03:00
11813f33a5
Butt On -> button
2017-04-15 20:12:44 -04:00
eea9304b4d
Localisation updates from https://translatewiki.net .
2017-04-06 07:14:59 +02:00
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
0eae83f252
[feature] i18n for automatic reconnection messages/buttons
2017-04-04 18:09:33 -03:00
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
cf6b246688
Localisation updates from https://translatewiki.net .
2017-04-03 07:25:13 +02:00
ed029b599e
Localisation updates from https://translatewiki.net .
2017-03-30 07:40:12 +02:00
ce2c74d120
Localisation updates from https://translatewiki.net .
2017-03-20 07:24:19 +01:00
5eadc715a6
Localisation updates from https://translatewiki.net .
2017-03-13 08:08:38 +01:00
bc0eff6dd0
Localisation updates from https://translatewiki.net .
2017-03-06 08:49:04 +01:00
9515109308
Localisation updates from https://translatewiki.net .
2017-02-27 07:48:12 +01:00
393f651770
Localisation updates from https://translatewiki.net .
2017-02-23 09:00:01 +01:00
203a48b42d
Merge pull request #3136 from joassouza/fix_minify
...
Fix minification of JS files
2017-02-08 04:14:44 -02:00
0025613ba6
Refactor code
2017-02-07 15:06:49 -02:00
d1e6c8492d
Fix minification of code
2017-02-07 13:04:22 -02:00
306e63c3f5
Localisation updates from https://translatewiki.net .
2017-02-06 07:52:00 +01:00
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
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
40f54fed38
Merge pull request #3131 from Sjord/remove-outdated-comment
...
Remove deprecated comment
2017-01-29 12:54:17 +01:00
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
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
cc69e76200
redirect /admin properly ( fix #3114 )
2017-01-06 18:19:38 +01:00
deed74c8c8
Localisation updates from https://translatewiki.net .
2017-01-02 09:00:13 +01:00
f217e29071
Localisation updates from https://translatewiki.net .
2016-12-29 08:24:55 +01:00
6dc808ad54
Release version 1.6.1
2016-12-23 21:59:57 +01:00
be9ff4a0de
Fixed crash on invalid export url
2016-12-22 23:04:06 +01:00
efb25f417a
Merge pull request #2993 from ether/fixes-2945
...
fixes #2945
2016-12-20 22:08:05 +01:00
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
8084400e13
Try to init cookies before testing if it exists
2016-12-20 21:57:01 +01:00
aefa617797
Merge branch 'develop' into improve_cookies
2016-12-20 21:31:11 +01:00
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
db94ce9413
Localisation updates from https://translatewiki.net .
2016-12-19 07:36:35 +01:00
d13a28a1ea
Localisation updates from https://translatewiki.net .
2016-12-15 07:31:34 +01:00
01d23b1f6a
Merge pull request #2929 from xavidotron/develop
...
Pass through the "item" parameter to registerAceCommand callbacks.
2016-12-13 06:12:26 -02:00
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
b41b4726d6
Localisation updates from https://translatewiki.net .
2016-11-24 08:24:37 +01:00
352cec1811
Updated socket.io to 1.6.0
2016-11-20 12:44:59 +01:00
39a3bedb7b
Updated option parameters for socket.io to work with latest version
2016-11-20 12:27:27 +01:00
00c9caf7a3
Updated npm to 4.0.2 and removed recursive searching for ep-plugins
2016-11-20 11:28:17 +01:00
602fd4629a
Localisation updates from https://translatewiki.net .
2016-11-17 09:50:45 +01:00
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
223127bf39
Localisation updates from https://translatewiki.net .
2016-11-01 07:59:29 +01:00
7dd934f714
Localisation updates from https://translatewiki.net .
2016-10-17 20:19:22 +02:00
2c69511c62
Localisation updates from https://translatewiki.net .
2016-10-13 08:00:32 +02:00
965af5a40b
Localisation updates from https://translatewiki.net .
2016-10-06 07:41:01 +02:00
f29e813ca0
Merge https://github.com/ether/etherpad-lite into patch-3
...
Conflicts:
src/templates/index.html
2016-09-30 19:20:40 +02:00
f289611ba9
Merge pull request #3059 from paper-pauper/librejs
...
Added LibreJS support
2016-09-28 23:02:40 +01:00
93ca44f005
Localisation updates from https://translatewiki.net .
2016-09-27 13:58:36 +02:00
b6e5a2283b
Localisation updates from https://translatewiki.net .
2016-09-22 07:27:50 +02:00
97fd1ab2fe
Added LibreJS support
2016-09-20 09:30:35 +02:00
32eb6a2288
Localisation updates from https://translatewiki.net .
2016-09-15 08:18:13 +02:00
7ecf240d9e
Localisation updates from https://translatewiki.net .
2016-09-13 07:44:27 +02:00
0a9d02562d
Handle relative paths properly, when `@import`ing.
2016-09-09 12:59:02 -07:00
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
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
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
a0403ffc22
Remove unused parameter `noDocType`.
...
My editor also auto-stripped some EOL whitespace.
2016-09-08 09:46:13 -07:00
879ae7c67d
Remove the `noDocType` argument, which was only ever passed as `false`.
2016-09-08 09:41:23 -07:00
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
b502c855d2
Localisation updates from https://translatewiki.net .
2016-09-08 10:08:19 +02:00
fd7591c110
Localisation updates from https://translatewiki.net .
2016-09-05 07:14:04 +02:00
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
8ad9d4f6dd
Localisation updates from https://translatewiki.net .
2016-08-25 07:33:25 +02:00
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
b5632b3ac5
Index: No-referrer
2016-08-23 22:12:40 +02:00
bf99cf92ab
Pad: Add no-referrer
2016-08-23 22:12:12 +02:00
8f133abacc
Timeslider: Add no-referrer
2016-08-23 22:11:11 +02:00
ea562250d9
Perform drag and drop in one changeset, so UNDO works properly. Fix #3041
2016-08-22 18:44:17 -03:00
bd20d44e89
Localisation updates from https://translatewiki.net .
2016-08-18 07:52:23 +02:00
f147146519
Localisation updates from https://translatewiki.net .
2016-08-15 08:08:30 +02:00
2996f0fad7
Localisation updates from https://translatewiki.net .
2016-08-04 07:57:38 +02:00
08b90437c1
Localisation updates from https://translatewiki.net .
2016-08-01 08:08:45 +02:00
cf3aaa334f
Localisation updates from https://translatewiki.net .
2016-07-28 07:59:29 +02:00
17726856c6
Localisation updates from https://translatewiki.net .
2016-07-25 07:56:41 +02:00
c92e3e4b5e
Fix #2918 . Re-enable editor after user is reconnected to server
2016-07-21 15:23:14 -03:00
3fcc7aa190
Localisation updates from https://translatewiki.net .
2016-07-18 08:48:25 +02:00
009b61b338
Make express-session cookie scheme dependent
2016-07-10 12:44:45 +02:00
728ab9307e
Localisation updates from https://translatewiki.net .
2016-07-07 07:52:57 +02:00
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
65dcb783d1
Merge pull request #3008 from Gared/directory_check
...
Fixed path check
2016-06-22 21:50:34 +01:00
a18d40df6b
Localisation updates from https://translatewiki.net .
2016-06-22 16:38:16 +02:00
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
3f4c8d35d6
Localisation updates from https://translatewiki.net .
2016-06-20 07:52:44 +02:00
6b9711cb70
Fixed path check
2016-06-20 00:22:29 +02:00
85cdb1cf4e
Localisation updates from https://translatewiki.net .
2016-06-16 08:11:53 +02:00
b3b17c2190
Merge pull request #2991 from LokeshN/deactivate-settings
...
Issue #2960 - deactivate settings.json
2016-06-13 14:41:30 +08:00
25fd246091
Localisation updates from https://translatewiki.net .
2016-06-13 07:44:13 +02:00
4ea9c4f98d
Add secure flag to express-session cookies
2016-06-08 21:15:26 +02:00
06ff023047
Add secure flag to cookies on client side if pad accessed through https
2016-06-08 21:14:10 +02:00
93dae51cda
Remove test cookie
2016-06-08 21:12:27 +02:00
44370f11be
Merge pull request #2957 from ether/dependency_updates
...
Dependency updates
2016-06-07 21:32:20 +02:00
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
3ea27d2613
Localisation updates from https://translatewiki.net .
2016-06-06 08:09:26 +02:00
d545630912
fixes #2945
2016-05-28 22:25:44 +01:00
a7405825a8
Localisation updates from https://translatewiki.net .
2016-05-26 07:57:20 +02:00
a8d5dc0693
Issue #2960 - deactivate settings.json
...
Deactivate settings.json in Admin dashboard
2016-05-22 21:12:21 +05:30
73414df3c7
heh whoops :)
2016-05-20 14:43:01 +01:00
a8487dd5dc
client Var value for disabling scripts
2016-05-20 14:42:05 +01:00
94920e5552
Localisation updates from https://translatewiki.net .
2016-05-19 09:25:51 +02:00
835bca7967
Use fs.statSync instead of fs.existsSync (deprecated)
2016-05-16 16:51:12 +02:00
b24e62f90a
Localisation updates from https://translatewiki.net .
2016-05-12 08:59:06 +02:00
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
56b851a46f
Pass through the "item" parameter to registerAceCommand callbacks.
2016-05-06 21:58:24 -04:00
2c177f553a
Updated several dependencies to latest version
2016-05-02 19:46:36 +02:00
c5638dd7e5
Localisation updates from https://translatewiki.net .
2016-05-02 07:25:28 +02:00
14e1f3bf22
Update socket.io to version 1.4.5
2016-04-26 18:55:58 +02:00
ebe44b0eab
Release version 1.6.0
2016-04-24 21:03:42 +02:00
15c9041f12
Localisation updates from https://translatewiki.net .
2016-04-18 07:04:42 +02:00
6e78895cdd
Localisation updates from https://translatewiki.net .
2016-04-11 07:07:32 +02:00
6b6a028355
include the padId
2016-04-09 20:01:49 +01:00
21372c93a3
Localisation updates from https://translatewiki.net .
2016-04-07 08:00:19 +02:00
282b1cdcfe
Merge pull request #2940 from ether/extend-getAttributesOnSelection
...
extend attributesonselection method
2016-04-05 22:30:15 +01:00
3fb695a7a0
Create hook to register events that won't scroll editor after aceEditEvt
2016-03-30 11:51:18 -03:00
103e07e828
Fix document.domain error in frontend tests
2016-03-29 16:16:22 +02:00
8f2f01dff8
Localisation updates from https://translatewiki.net .
2016-03-28 10:09:39 +02:00
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
8df8228a36
Merge pull request #2926 from storytouch/addAuthorOnRemoveAttributeOnLine
...
Update author when removing line attribute from line
2016-03-26 22:11:22 +08:00
97b971747f
forgot this one
2016-03-26 22:01:26 +08:00
4846798528
extend attributesonselection method
2016-03-26 22:00:34 +08:00
7dd26bd250
Localisation updates from https://translatewiki.net .
2016-03-24 07:15:23 +01:00
04e8b0c184
Localisation updates from https://translatewiki.net .
2016-03-21 07:09:41 +01:00
02551d772c
Fix a possible xss attack in iframe link
2016-03-20 16:28:06 +01:00
175c29ff66
Localisation updates from https://translatewiki.net .
2016-03-17 08:47:38 +01:00
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
a3188cf357
Localisation updates from https://translatewiki.net .
2016-03-14 08:09:25 +01:00
b6ab6f2b13
Localisation updates from https://translatewiki.net .
2016-03-09 13:38:20 +01:00
d88052726d
Localisation updates from https://translatewiki.net .
2016-02-19 15:05:09 +01:00
6df7ff2d08
Merge pull request #2893 from bhldev/cssFontColors
...
Css default colors Issue #2853
2016-02-14 14:54:13 +01:00
8b8811c7ad
Localisation updates from https://translatewiki.net .
2016-02-08 11:36:53 +01:00
32d90418ca
Merge pull request #2890 from bhldev/languageTimesliderUrlParameter
...
Timeslider Not Translated Issue 2885
2016-02-06 22:38:02 +01:00
319ebb29fd
Localisation updates from https://translatewiki.net .
2016-02-01 09:23:34 +01:00
dde4fdfdbd
Highlight and link more URI schemes: about, geo, tel
2016-01-30 19:03:42 +01:00
b46e5db777
Localisation updates from https://translatewiki.net .
2016-01-25 07:38:47 +01:00
fbe3710dda
Merge pull request #2863 from gutobenn/padname-size
...
Limit padname input field to 50 characters
2016-01-23 13:51:57 +01:00
aaa28640cf
CSS Default Font Colors for Issue 2853
2016-01-22 19:42:06 -05:00
26aeb7b705
Added pad shortcut disabling feature
2016-01-21 07:38:41 -05:00
49d38522b1
Timeslider Not Translated Issue 2885
2016-01-20 02:30:25 -05:00
d994baeefa
Merge pull request #2886 from bhldev/padOptionsLang
...
Set language cookie on initial load Issue #2882
2016-01-19 23:48:30 +00:00
13d9bdf03a
Merge pull request #2887 from bhldev/editorListIndentOutdent
...
Editor List Fix for 2844 and 2812
2016-01-19 23:48:20 +00:00
ae033a1e86
Fix for 2844 and 2812
2016-01-18 23:57:40 -05:00
0b521f6528
Localisation updates from https://translatewiki.net .
2016-01-18 08:01:50 +01:00
295672f598
Set language cookie on initial load
2016-01-17 21:44:03 -05:00
f9937343c7
fix drop event on last char
2016-01-17 15:11:54 +00:00
855bd270bd
Localisation updates from https://translatewiki.net .
2016-01-11 08:28:02 +01:00
935b921c2b
more tidy
2016-01-10 14:40:57 +00:00
50c6b5ed61
tidy up
2016-01-10 14:39:41 +00:00
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
f80407c6ff
removal
2016-01-08 13:41:52 +00:00
cb874b695b
herp
2016-01-08 13:40:25 +00:00
ae6110919f
removal
2016-01-08 13:39:59 +00:00
793b34d17b
hrm, removal
2016-01-08 13:39:32 +00:00
f16616d23b
seems to work
2016-01-08 13:26:46 +00:00
638757fdb5
Update DB.js
2016-01-06 00:01:48 +00:00
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
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
239f517afd
Update package.json
2016-01-03 01:03:05 +00:00
aab7186486
Fix handleClientMessage_USER_* payloads not containing user info
2015-12-31 14:19:23 +02:00
2e81b39028
Localisation updates from https://translatewiki.net .
2015-12-29 10:44:17 +01:00
34a46d6318
should be clean enough to push
2015-12-23 14:35:52 +00:00
a34c8e4721
Limit padname size to 50 characters
2015-12-22 13:25:56 -02:00
b519f9f156
include req and res in export convert hook
2015-12-21 17:32:05 +00:00
577102b025
license
2015-12-21 16:29:09 +00:00
d6033de0da
Use new exportAvailable() check to include check for SOffice along with Abiword in importexport hook
2015-12-18 00:14:13 -06:00
313f390e7a
remove logging
2015-12-17 21:56:33 -06:00
7f517eca0b
check for soffice before removing export paths
2015-12-17 21:54:04 -06:00
e98821cef7
bump socketio
2015-12-07 13:48:05 +00:00
bf6e225aa2
include event on paste and drrororororop
2015-12-05 19:06:40 +00:00
b3d44b6956
remove con log
2015-12-05 18:51:27 +00:00
fa492dc926
ace drop event
2015-12-05 18:50:51 +00:00
e2a0e3cd7f
whoops
2015-12-02 12:10:25 +00:00
98016665e4
working logic
2015-12-02 11:54:37 +00:00
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
f44c444720
Merge pull request #2831 from fcassin/develop
...
Protect against a null atext value in cloneAText
2015-12-01 17:50:29 +00:00
16bb28a0ff
Merge pull request #2848 from storytouch/develop
...
Update the bowser.js to the new version
2015-12-01 17:47:00 +00:00
1a8462fb4f
remove unused variable
2015-12-01 17:40:16 +00:00
4ae88b2ee7
Hook for export ocnvert control
2015-12-01 17:38:52 +00:00
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
ad2ea924b5
aceEditorCSS to allow absolute paths to resources to include external CSS
2015-12-01 14:16:44 +02:00
8a79ae6e02
regex incoming colors
2015-11-26 15:55:26 +00:00
a8c2833759
clean up
2015-11-24 14:03:38 +00:00
039a761eaf
allow settings to be applied from the filesystem
2015-11-24 14:02:37 +00:00
2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01:00
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +00:00
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
d05fa6d97e
Merge pull request #2819 from bradarv90/develop
...
Fix for #2809
2015-11-02 13:09:42 +00:00
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
2b980653d6
Merge pull request #2822 from storytouch/esc
...
Allow plugins handle "esc" key event
2015-11-02 13:08:01 +00:00
478f5788e3
Add callstack to aceSelectionChanged context
2015-10-30 12:13:43 -02:00
959de82e2a
Allow plugins handle "esc" key event
2015-10-29 14:54:21 -03:00
a9d7ab9e18
Fix for #2809
2015-10-28 13:28:54 -04:00
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
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
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
0d769632df
Merge pull request #2748 from CodeMichael/develop
...
allow /admin to run in a subdirectory
2015-10-22 16:17:10 +01:00
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
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
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
5df580ddee
Merge pull request #2810 from luser/append-text
...
Add an appendText API
2015-10-22 16:10:21 +01:00
7289e89070
Use `Etherpad` rather than `Etherpad Lite` when exporting HTML
2015-10-22 16:09:44 +01:00
f57aaa62fc
Localisation updates from https://translatewiki.net .
2015-10-22 11:32:46 +02:00
82c7ca4ac3
add classes for bootstrap targeting, pew pew
2015-10-22 01:32:02 +01:00
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
a675659dc2
Add an appendText API
2015-10-19 15:27:09 -04:00
504cc102a0
Merge pull request #2762 from storytouch/exportTagsAsArrays
...
Accepting Arrays on 'exportHtmlAdditionalTags'
2015-10-17 18:24:18 +02:00
0ab3f3133e
Localisation updates from https://translatewiki.net .
2015-10-14 12:54:49 +02:00
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
9d29b15def
Merge pull request #2730 from emilyxxie/clientready_hook
...
added clientReady hook
2015-10-10 13:30:36 +02:00
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
1ee1f818db
if granularity is negative, endNum is negative and loop
2015-10-09 14:55:59 +02:00
31f7c7e0f2
check if ChangesetRequest granularity is a number ( #2796 )
2015-10-09 14:55:19 +02:00
f6cebdad98
Fix decode error if pad name contains special characters and is sanitized
2015-10-08 20:46:15 +02:00
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
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
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
9c8c3de1d8
Localisation updates from https://translatewiki.net .
2015-09-25 16:07:09 +02:00
1d134f0b13
Fixing ed52626. It was closing the span with </span data-TAG=VALUE>, not </span>
2015-09-17 15:30:09 -03:00
442f2a08f7
Merge pull request #2774 from ether/timeslider-fix
...
Timeslider: Fix "Return to pad" button
2015-09-16 16:07:37 +02:00
c215795ab5
Localisation updates from https://translatewiki.net .
2015-09-10 10:30:24 +02:00
330d2b079d
Fix 2772. Skipping line marker when applying attribs to a range
2015-09-08 11:55:36 -03:00
ed5262650a
Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VALUE>
2015-09-07 03:55:56 -07:00
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
04a26a3e24
Timeslider: Fix "Return to pad" button
...
Closes #2768
2015-09-03 23:04:40 +02:00
cc9f88e7ed
Merge pull request #2757 from Gared/doc_append_chat_message
...
Add appendChatMessage API to docs
2015-08-30 18:15:51 +02:00
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
f27aacc5bf
Fix missing bracket
2015-08-15 22:41:59 +02:00
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
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
6f6de64c4a
allow /admin to run on a sub-directory
2015-08-07 08:31:08 -05:00
3b08ea6158
allow admin to run on a sub-directory
2015-08-07 08:30:29 -05:00
93fd05ba02
Release version 1.5.7
2015-08-05 19:15:27 +02:00
856fc5975b
Fix broken switchToPad method
2015-08-05 18:23:54 +02:00
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
b557927b72
Fix link to etherpad-lite on GitHub
2015-08-03 21:53:54 -05:00
275a7d31e0
Avoid space removal when pasting text from word processor.
...
Since bf380eea50
2015-07-27 16:38:57 +02:00
5c531eebc5
Localisation updates from https://translatewiki.net .
2015-07-23 18:52:24 +02:00
21f0d12d31
clientReady hook- pass entire message, updated doc
2015-07-20 11:45:41 -04:00
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
a31e6cd332
Localisation updates from https://translatewiki.net .
2015-07-14 16:22:35 +02:00
008d4e653c
Add a aceSelectionChanged hook to allow plugins to react when the cursor
...
location changes.
2015-07-11 11:33:20 -04:00
2003968263
Localisation updates from https://translatewiki.net .
2015-07-08 08:18:32 +02:00
67f4ad5887
Fix editbar height for read-only pads
2015-07-07 16:55:19 -03:00
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
47c4ca9c29
Fixing chat on bottom of the page for mobile devices
2015-07-03 18:38:46 -03:00
translatewiki.net