libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-20 14:39:53 +01:00
Code Issues Projects Releases Wiki Activity
5033 commits 206 branches 105 tags 123 MiB
Commit graph

2598 commits

Author SHA1 Message Date
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
John McLear
3a969f8dd8 pass error messages to pad text if shown during startup 2015-04-06 00:13:38 +01:00
John McLear
e027083136 timeslider settings for fonts 2015-04-05 15:18:36 +01:00
John McLear
56ce8e80ac hacky fix for opendyslexic 2015-04-05 14:50:53 +01:00
John McLear
41bb4ef094 support for open dyslexic font 2015-04-05 14:03:09 +01:00
John McLear
e49bb4017c use ctrl shift 2 instead of alt a 2015-04-05 13:42:26 +01:00
John McLear
db0bcdd696 fix issue where focus on timeslider wouldnt work 2015-04-05 13:39:20 +01:00
John McLear
c65ddad7d6 title for chat 2015-04-03 13:06:03 +01:00
John McLear
9090d76dcf temp solution for alt 9 to show editbar label 2015-04-03 12:33:31 +01:00
John McLear
f79e2c7de2 final accessibility for Timeslider hopefully 2015-04-03 12:29:47 +01:00
John McLear
139edceb66 Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 16:50:43 +01:00
John McLear
85fc012bac change to alt shit and a to show authors 2015-04-02 15:13:16 +01:00
John McLear
900595355f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-02 13:17:01 +01:00
John McLear
644536b27b fix for #2574 2015-04-02 13:16:49 +01:00
John McLear
ee5833b9c6 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 00:05:25 +01:00
John McLear
f6b4b5603d fix timeslider title issues 2015-04-02 00:03:34 +01:00
John McLear
27ae48686d reintroduce removed api points that were removed by mistake 2015-04-01 13:56:52 +01:00
John McLear
32a09ff461 tests and fix up sloppy code by original author 2015-04-01 13:52:56 +01:00
John McLear
c705a058fb Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api 2015-04-01 13:32:07 +01:00
John McLear
fef746e80e fix import issue with txt files and abiword #2572 2015-04-01 00:19:42 +01:00
John McLear
0b90da19d2 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-03-31 23:32:15 +01:00
John McLear
70fdc7dcd7 Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection 
Re-implement ace_getAttributeOnSelection
 2015-03-31 23:21:49 +01:00
John McLear
b6ff1807da Merge pull request #2482 from ether/chrome-list-handling 
chrome list handling fix for #2412
 2015-03-31 23:19:47 +01:00
John McLear
b404af7c17 Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition 
do not crash when encountering mismatched compositions. log the changese...
 2015-03-31 23:17:51 +01:00
John McLear
e47992f5b7 Merge pull request #2538 from webzwo0i/check-author-attribution 
Check author attribution and fix clearAuthorship test
 2015-03-31 23:14:22 +01:00
John McLear
64a89a3ec0 Merge pull request #2541 from cristo-rabani/patch-3 
fixed + support for value
 2015-03-31 22:58:10 +01:00
John McLear
4397191f55 Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position 
feature #2558 get attributes on position
 2015-03-31 22:46:00 +01:00
John McLear
e9d8c3b53a expose method for getting a full user list on the client including historical data 2015-03-31 20:26:55 +01:00
John McLear
64034ee1c6 doh caps 2015-03-31 18:50:50 +01:00
John McLear
48862dac6f better handling for inputs and left and right arrows 2015-03-31 18:50:20 +01:00
John McLear
37c7c7eabe i18n for timeslider steppers 2015-03-31 17:06:04 +01:00
John McLear
662216b6cf slightly different alt stuff 2015-03-31 16:36:44 +01:00
John McLear
498e7f4961 MVP of alt A behavior to show author of line 2015-03-31 16:12:05 +01:00
John McLear
24e6e1728a I came to bring the rain.. Let me get my coat... Fix focus on timeslider import export 2015-03-31 15:00:43 +01:00
John McLear
73073dcbc1 Timeslider accessibility and Bugfixes 2015-03-31 14:47:00 +01:00
John McLear
0f0a6c73ac make user list a document so it's easy to navigate by screen readers 2015-03-31 14:11:49 +01:00
John McLear
3126d7196e fix alt and focus issues 2015-03-31 14:06:02 +01:00
John McLear
ef38bcad9f make buttons i18n friendly and a better experience 2015-03-31 13:57:18 +01:00
John McLear
35948989b3 make Alt C and Alt F9 and Escape work from anywhere 2015-03-31 13:45:11 +01:00
John McLear
a82e692bdd dont use nasty settimeouts use a callback instead for focus 2015-03-31 13:21:41 +01:00
Thomas Muehlichen
a930161cb9 feature #2558 added documentation 2015-03-31 10:58:47 +02:00
John McLear
f9071aebe6 fix issue with showControls false not working 2015-03-30 14:56:35 +01:00
Thomas Muehlichen
1c05933dc9 Feature #2567 Added workaround to enable contentcollector to write key-value attributes 2015-03-26 18:49:35 +01:00
John McLear
19e83d5405 much better chat focus toggle behavior 2015-03-26 16:58:13 +00:00
John McLear
428b547d24 alt c to focus on chat and gritter and chat both now work with aria 2015-03-26 16:44:22 +00:00
John McLear
548cef7018 more keyboard support while in editbar 2015-03-26 14:26:21 +00:00
John McLear
6b88c037b8 fix firefox button styling 2015-03-26 14:11:37 +00:00
John McLear
7b726cbc02 more working logic and also pretty nice screen reader experience 2015-03-26 13:58:57 +00:00
John McLear
959aa92656 stop listing URL each time focus is placed back on inner iframe 2015-03-26 13:32:45 +00:00
John McLear
1a5ea8707f make the pad contents act like an application and not contents, this can probably be togglable but default state should be editable 2015-03-26 13:16:54 +00:00
John McLear
ec1956b4b6 read for button activity 2015-03-26 12:42:07 +00:00
John McLear
4362a42f7f make index page accessible for screen readers 2015-03-26 11:38:55 +00:00
John McLear
69f0392e75 escape to exit editbar 2015-03-26 11:24:06 +00:00
John McLear
e67ae522e2 support drop down show events 2015-03-25 23:30:17 +00:00
John McLear
aff802a0b3 whoops 2015-03-25 21:15:44 +00:00
John McLear
e9360b6ed2 working f9 logic 2015-03-25 15:49:41 +00:00
John McLear
bc760e9494 logic to send focus back to pad on Alt F9 when focus on editbar 2015-03-25 15:38:19 +00:00
John McLear
0c902ced73 better logic for handling lr arrows 2015-03-25 15:19:52 +00:00
Thomas Muehlichen
fbcbc3c8a2 feature #2558 more precise documentation 2015-03-25 13:29:03 +01:00
John McLear
c6cac53dda remove console log 2015-03-25 12:25:49 +00:00
John McLear
be73e729d4 remove console log 2015-03-25 12:25:33 +00:00
John McLear
b72127c327 different font families for people with dyslexia 2015-03-25 12:24:20 +00:00
Thomas Muehlichen
e8d85c1173 feature #2558 added functions to get all attributes at the current or an abritrary position 2015-03-25 12:04:10 +01:00
John McLear
5761e998de first semi working alt f9 functionality 2015-03-25 11:03:45 +00:00
cristo-rabani
ed3ec96838 own list 2015-03-24 20:04:28 +01:00
John McLear
a67664055d disable cut renumbering of OLs so cut paste works 2015-03-24 09:58:02 +00:00
John McLear
83e6591f1a temp fix for cut paste but might break some OL functionality 2015-03-24 09:52:17 +00:00
cristo-rabani
382804e44c fix 2015-03-22 23:14:17 +01:00
Simon Gaeremynck
9bde17b91c Bumped ueberDB to 0.2.14 so Cassandra suport is included 2015-03-22 12:27:54 +00:00
Thomas Muehlichen
a3f07c1048 fixes #2556 (error toggling line attribute) and clarified method documentation (AttributeManager.toggleAttributeOnLine) 2015-03-20 11:58:56 +01:00
webzwo0i
a0fb65205c oops, fix export with wildcards 2015-03-14 00:02:23 +01:00
lid2000
7894545556 Return true from handleCut function 2015-03-13 16:01:18 +11:00
Cristo
da1bf00a78 fixed + support for value 2015-03-06 23:02:31 +01:00
John McLear
56dbad41ad a should always have white space pre-wrap stops caret walking in chrome on them 2015-03-04 17:46:49 +00:00
webzwo0i
f249b42ab4 empty author should be allowed to support clearAuthorship functionality 2015-03-03 16:39:14 +01:00
webzwo0i
0693c0ae97 - operator do not show up in the attribs of a pad, but authors could still leak to the pool 2015-03-03 15:37:56 +01:00
webzwo0i
01cd82427a check author in = operator 2015-03-03 15:20:33 +01:00
webzwo0i
0f82cd8711 print revision numbers - not changesets - in warn-log 2015-03-02 11:14:24 +01:00
webzwo0i
683c9dfb7c callback with argument error in async.series instead 2015-03-02 11:05:33 +01:00
John McLear
4e0353b3ef bump ueber 2015-03-02 08:59:53 +00:00
Chris Ball
063219bbce Trigger renumbering when deleting (via cut) the first item of a list 
Fixes #2514.
 2015-02-27 12:54:29 -05:00
John McLear
152f51aeab Merge pull request #2527 from ldidry/issue-1870-get-saved-revisions-count 
Fixes #1870
 2015-02-27 12:03:03 +00:00
webzwo0i
7719117e1e do not crash when encountering mismatched compositions. log the changesets and padid 2015-02-26 14:57:49 +01:00
John McLear
38a4f1be5f bump ueberdb 2015-02-26 12:14:01 +00:00
John McLear
178309e10d Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-02-26 12:13:41 +00:00
Luc Didry
92022e493e Add backend tests for new API functions 
These new functions are:
* getSavedRevisionsCount
* listSavedRevisions
* saveRevision

+ typo fixing in backend tests
 2015-02-25 01:05:58 +01:00
Luc Didry
845788c39d Add a saveRevision API function 
Calling saveRevision create an author which name is "API"
 2015-02-25 01:04:27 +01:00
Luc Didry
a08c50a77d Fixes #1870 
Add two functions to API :
 * getSavedRevisionsCount
 * listSavedRevisions
 2015-02-24 23:42:35 +01:00
John McLear
1c044588e6 mobile stylings for chat always on screen 2015-02-22 17:56:44 +00:00
John McLear
470b0ba2a6 Merge pull request #2520 from ether/load-testing-settings 
allow for load testing connections to hit by a setting
 2015-02-22 14:41:09 +00:00
John McLear
d5bec1701e fix export of bad pads and also limit import to files 2015-02-21 12:33:30 +00:00
Siebrand Mazeland
abb9b6d833 Localisation updates from https://translatewiki.net. 2015-02-19 13:02:42 +01:00
John McLear
ec6a2b5ba9 allow for load testing connections to hit by a setting 2015-02-16 23:02:19 +00:00
webzwo0i
37924e441a add try-catch clause around calls to applyToAText 2015-02-16 09:01:30 +01:00
webzwo0i
c9a5167b41 throw in applyToText and not in applyToAText 2015-02-16 06:27:18 +01:00
webzwo0i
59328aa33a Revert "51c14d994756e60333b0b60eccb7255cf0c86461 changed the return value of" 
This reverts commit 66582b19e7.
 2015-02-16 06:22:49 +01:00
webzwo0i
83e1bf0dc4 add semicolons 2015-02-16 03:33:57 +01:00
webzwo0i
66582b19e7 51c14d9947 changed the return value of 
applyToText to an array that includes if there was an error in the
newline part of an changeset op.
easysync_tests need to know this too
 2015-02-15 16:21:07 +01:00
webzwo0i
440f74b2c1 we do not have the text/padid, but at least we can print the changeset 2015-02-15 15:47:45 +01:00
webzwo0i
b9dd983f81 print the actual text... 2015-02-15 15:27:27 +01:00
webzwo0i
c6ef7f4867 string concat, not multiple arguments... 2015-02-15 15:26:07 +01:00
webzwo0i
1f6a9afae4 better error message 2015-02-15 15:23:43 +01:00
webzwo0i
e7f01fa498 remove unnecessary code; because we have checks in every op now we don't 
need this anymore
 2015-02-15 15:12:24 +01:00
webzwo0i
ac2c7e9679 add newline counting for - and + op 2015-02-15 15:09:38 +01:00
webzwo0i
b4d4b16b1f off by 1 2015-02-15 14:56:20 +01:00
webzwo0i
4313bd27f8 add a comment to make clear that the string in stringIterator 
does not change; only curIndex is increased. Newlines are counted
between curIndex and the end of string.
 2015-02-15 13:25:57 +01:00
webzwo0i
c191a8716e totally wrong, introduced by myself in 
3354b9406b
the first part is always false so the second part which is always true
in case a cs deleted some lines was never triggered...sigh
 2015-02-14 16:41:50 +01:00
John McLear
e39b442840 bump v for #2505 fix 2015-02-13 01:25:29 +00:00
John McLear
d0caebc21f may aswell make the git sha a link to the commit 2015-02-11 18:05:01 +00:00
John McLear
ddc69831b2 working, need to test though 2015-02-11 17:59:05 +00:00