2bd698343a
Protects against a null atext in cloneAText
2015-11-10 16:21:43 +01:00
f2836125dc
Merge pull request #1 from ether/develop
...
Update to most recent etherpad-lite version
2015-11-10 15:50:40 +01:00
f774c2584f
paste hook and class for editorcontainer
2015-11-06 13:21:25 +00:00
ed37f6efe3
Merge pull request #2828 from Komasa/develop
...
Update installDeps.sh to support node v5
2015-11-05 00:24:49 +01:00
5f9d1397e2
Update installDeps.sh
2015-11-04 21:15:13 +01:00
062e6f308f
Merge pull request #2827 from storytouch/exportHtmlAdditionalTagsWithData
...
Create hook exportHtmlAdditionalTagsWithData
2015-11-03 09:18:38 -02: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
ba1f9c24d0
Merge pull request #2823 from storytouch/develop
...
Add callstack to aceSelectionChanged context
2015-10-30 12:18:32 -02: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
6c68396ed5
Merge pull request #2817 from storytouch/fix_tests_2805
...
Fix flaky tests introduced by #2805
2015-10-26 11:08:06 -02:00
ed39788d71
Fix flaky tests introduced by #2805
2015-10-24 11:10:17 -02:00
02f88aafff
Update installOnWindows.bat
2015-10-22 16:22:35 +01: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
fa46f0b613
Merge pull request #2797 from ypid/rebuild-better-error
...
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-22 16:15:27 +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
928df3c6cb
Merge pull request #2808 from lukeroge/patch-1
...
Pedantic Space
2015-10-22 16:10:33 +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
881996ef52
Pedantic Space
...
<3
2015-10-15 14:02:40 +13: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
3b45b4833b
Merge pull request #2787 from Gared/support_node_4
...
Support version 4 of node.js
2015-10-10 13:17:03 +02:00
06c4a066f7
Merge pull request #2801 from webzwo0i/fix-issue-2796
...
Fix pull request 2796
2015-10-09 15:01:54 +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
c9924ee706
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-07 12:42:19 +02:00
a09044a6f3
Merge pull request #2791 from fread/develop
...
Fix off-by-one: The chatHead is in fact a valid message index.
2015-10-04 23:16:42 +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
bf7930fccb
Support version 4 of node.js
2015-09-26 12:15:54 +02:00
9c8c3de1d8
Localisation updates from https://translatewiki.net .
2015-09-25 16:07:09 +02:00
Francois Cassin