Commit Graph

4707 Commits

Author SHA1 Message Date
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
Stefan 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
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 7170a6a8cb Merge pull request #2749 from installgen2/develop
Fix typo in comment
2015-08-15 23:14:43 +02:00
Stefan f27aacc5bf Fix missing bracket 2015-08-15 22:41:59 +02:00
Stefan c8d7e6e0b8 Add appendChatMessage API to docs 2015-08-15 22:41:09 +02:00
Stefan 94cb743ca8 Fix API call appendChatMessage to send new message to all connected clients 2015-08-15 22:05:31 +02:00
gen2 0e59e5a77f Fix typo in comment 2015-08-08 06:56:14 +01: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 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
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 02c022aab1 Merge pull request #2745 from ether/master
Master
2015-08-05 20:19:46 +02:00
Stefan 83597562c1 Merge new release into master branch! 2015-08-05 19:30:10 +02:00
Stefan 6fae670476 Release version 1.5.7 (changelog) 2015-08-05 19:25:11 +02:00
Stefan c3fc850b69 Merge new release into master branch! 2015-08-05 19:16:09 +02:00
Stefan 93fd05ba02 Release version 1.5.7 2015-08-05 19:15:27 +02:00
Stefan a0ca051801 Merge pull request #2744 from Gared/switchtopadBroken
Fix broken switchToPad method
2015-08-05 18:39:37 +02:00
Stefan 856fc5975b Fix broken switchToPad method 2015-08-05 18:23:54 +02:00
Stefan 63c836ad55 Merge pull request #2741 from thomasrussellmurphy/issue-2727
Fix link to etherpad-lite on GitHub
2015-08-04 22:10:35 +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
John McLear 25db7d995f Merge pull request #2718 from lpagliari/develop
Fix toolbar and chat positioning on mobile devices
2015-07-03 23:12:02 +01: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
John McLear 193b5a07ef Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-07-01 20:23:43 +01:00
John McLear b5686adf92 fix font test 2015-07-01 20:23:31 +01:00
Peter 'Pita' Martischka 7520c614ae Merge pull request #2714 from charakterziffer/patch-1
Added CSS fallback fonts
2015-07-01 20:16:38 +01: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
John McLear 2bf16fe09f Merge pull request #2712 from xavidotron/xavid
Restore newline-adding to setText() if passed string does not end in '\n'.
2015-06-30 10:03:57 +01: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 d803ac128e use settings for backend tests 2015-06-29 11:00:00 +01:00