public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,697 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

4697 Commits (352cec1811252a730199253a89cba71cb71aa390)

Author SHA1 Message Date
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 ba1f9c24d0 Merge pull request #2823 from storytouch/develop 
Add callstack to aceSelectionChanged context
 2015-10-30 12:18:32 -02: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
Luiza Pagliari 6c68396ed5 Merge pull request #2817 from storytouch/fix_tests_2805 
Fix flaky tests introduced by #2805
 2015-10-26 11:08:06 -02:00
Luiza Pagliari ed39788d71 Fix flaky tests introduced by #2805 2015-10-24 11:10:17 -02:00
John McLear 02f88aafff Update installOnWindows.bat 2015-10-22 16:22:35 +01: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 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
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 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
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
Robin Schneider c9924ee706
Give better error message when rebuildPad.js hits a non-existing rev. 2015-10-07 12:42:19 +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