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
9ccaeb585b
Fixing toolbar on top of the page for mobile devices
2015-07-02 13:03:45 -07:00
7c0f3a6826
Added Helvetica Neue to the Normal font
2015-07-01 12:13:37 +02:00
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
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
90575064a9
aria-labels for everything
2015-06-28 17:14:37 +01:00
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
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
2015-06-24 14:32:10 -03:00
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
13fa863f4b
Localisation updates from https://translatewiki.net .
2015-06-22 11:52:20 +02:00
a4fe0d0dc8
Add an 'author' entry to the context for the padCreate and padUpdate hooks.
2015-06-21 11:29:17 -04:00
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
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
ef5e62e3a1
Localisation updates from https://translatewiki.net .
2015-06-18 13:25:28 +02:00
32ba48835a
if variable not declared, test if null throws error
2015-06-17 18:54:19 +02:00
1353c093db
Add new icon to fontawesome subset: comment
2015-06-10 18:05:24 -03:00
5a5d245c06
fix issues with redrawing focus back to input element would lose param selected name
2015-06-08 17:13:46 +01:00
2fa2dc8a03
Localisation updates from https://translatewiki.net .
2015-06-08 16:09:38 +02:00
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
7e38e2c2b1
Localisation updates from https://translatewiki.net .
2015-05-25 13:00:34 +02:00
92aabe12dc
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 07:08:24 -03:00
0b3216ecb6
Do not extend Array.prototype
2015-05-22 12:27:08 +02:00
757ad765d3
use removeItem instead of remove namespace
2015-05-22 11:09:21 +01:00
0eb8b800cf
hide chat if its already open on readonly mode
2015-05-20 01:50:37 +01:00
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
fe7ab21c84
dont allow chat input or name input on read only pads
2015-05-19 17:52:43 +01:00
818408cf49
other bits required for read only
2015-05-19 16:57:53 +01:00
41d24a8c8f
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-19 16:44:57 +01:00
b662d5c618
dont show editing buttons in R/O view
2015-05-19 16:43:19 +01:00
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
7fe99cccad
Using log4js in TidyHtml
2015-05-18 17:43:46 +01:00
786b43efc8
Tidy HTML before trying to convert it with abiword
2015-05-18 16:24:41 +01:00
0c4b3f8124
Localisation updates from https://translatewiki.net .
2015-05-16 18:53:23 +02:00
9e9207d8b6
Merge pull request #2657 from simong/cookie-parser
...
Use the cookie parser middleware
2015-05-11 15:10:45 +01:00
3b91b46baa
always hide connected one second after connected
2015-05-10 11:46:49 +01:00
f5ccd3ce6d
Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix
...
Bugfix innerText
2015-05-07 23:09:24 +01:00
5a7750781b
Use the cookie parser middleware
2015-05-07 18:35:21 +01:00
debca84ebe
Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys
2015-05-07 15:56:01 +00:00
975bd99064
support for french stuff
2015-05-07 15:55:52 +00:00
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
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
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
361807e578
console msg should go to window
2015-05-06 00:36:42 +01:00
c903cb3925
fix alt c and escape
2015-05-06 00:32:36 +01:00
363d5d06b7
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-05-05 20:41:58 +01:00
48c2b7cde1
fixes #2570
2015-05-05 20:41:40 +01:00
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
9b85b8dc98
Fix popup border
2015-05-04 22:18:34 +02:00
8967c3ea49
Localisation updates from https://translatewiki.net .
2015-05-04 10:39:03 +02:00
0a9c631410
better fix for #2625
2015-05-01 20:44:36 +01:00
4938c7be38
plugins always return html so use that endpoint
2015-04-29 20:54:41 +01:00
da06ac6fd7
dont prompt twice on import fool
2015-04-29 16:40:29 +01:00
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
ac41d150c0
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-04-28 23:42:11 +01:00
1f471b0f81
show versions of plugins at startup, fixes #2642
2015-04-28 23:41:55 +01:00
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
dbb2956d2f
allow chrome to use control shift 1 to send ordered list
2015-04-28 15:48:12 +01:00
58ab17bf9e
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 05:31:07 -07:00
254edffa9c
fixes #2547
2015-04-24 14:17:49 +01:00
b349a4f226
probably fixes #2625
2015-04-23 17:49:08 +01:00
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
b8192fd015
first attempt at fixing dead keys, it cant be this easy can it?
2015-04-17 17:01:15 +01:00
2393ea01f0
Release version 1.5.6
2015-04-16 23:06:24 +02:00
6ff7d4e9a6
revert to old path handling, but strip out "..". fixes #2614
2015-04-15 14:31:21 -05:00
64d94cb346
Release version 1.5.5
2015-04-13 17:27:14 +02:00
629f909d57
add some semicoolons to prevent chrome warning
2015-04-13 10:52:15 +01:00
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
6a027d88a9
fix older IEs
2015-04-12 13:00:01 +01:00
5435063a2f
re-fix rtl
2015-04-12 10:35:24 +01:00
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
fc0cac0cad
merge object settings into default settings
2015-04-11 22:01:46 +01:00
8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
Chris Birk