libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4475 commits 2 branches 0 tags 24 MiB
Commit graph

4475 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
928df3c6cb Merge pull request #2808 from lukeroge/patch-1 
Pedantic Space
 2015-10-22 16:10:33 +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
Luke Rogers
881996ef52 Pedantic Space 
<3
 2015-10-15 14:02:40 +13: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
Stefan
3b45b4833b Merge pull request #2787 from Gared/support_node_4 
Support version 4 of node.js
 2015-10-10 13:17:03 +02:00
webzwo0i
06c4a066f7 Merge pull request #2801 from webzwo0i/fix-issue-2796 
Fix pull request 2796
 2015-10-09 15:01:54 +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
Stefan
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
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
Stefan
bf7930fccb Support version 4 of node.js 2015-09-26 12:15:54 +02: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
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
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