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
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
9e68744ec9
Merge pull request #2756 from Gared/fix_append_chat_message_handle
...
Fix API call appendChatMessage to send new message to all connected clients
2015-08-30 18:15:35 +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
7170a6a8cb
Merge pull request #2749 from installgen2/develop
...
Fix typo in comment
2015-08-15 23:14:43 +02:00
f27aacc5bf
Fix missing bracket
2015-08-15 22:41:59 +02:00
c8d7e6e0b8
Add appendChatMessage API to docs
2015-08-15 22:41:09 +02:00
94cb743ca8
Fix API call appendChatMessage to send new message to all connected clients
2015-08-15 22:05:31 +02:00
0e59e5a77f
Fix typo in comment
2015-08-08 06:56:14 +01: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
510f17c7cf
Merge pull request #1 from CodeMichael/patch-2
...
allow /admin to run on a sub-directory
2015-08-07 08:34:14 -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
02c022aab1
Merge pull request #2745 from ether/master
...
Master
2015-08-05 20:19:46 +02:00
83597562c1
Merge new release into master branch!
2015-08-05 19:30:10 +02:00
6fae670476
Release version 1.5.7 (changelog)
2015-08-05 19:25:11 +02:00
c3fc850b69
Merge new release into master branch!
2015-08-05 19:16:09 +02:00
93fd05ba02
Release version 1.5.7
2015-08-05 19:15:27 +02:00
a0ca051801
Merge pull request #2744 from Gared/switchtopadBroken
...
Fix broken switchToPad method
2015-08-05 18:39:37 +02:00
856fc5975b
Fix broken switchToPad method
2015-08-05 18:23:54 +02:00
63c836ad55
Merge pull request #2741 from thomasrussellmurphy/issue-2727
...
Fix link to etherpad-lite on GitHub
2015-08-04 22:10:35 +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
Stefan