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

4499 Commits (d05fa6d97e2e3ea86e2e4f1925c46455047b6409)

Author SHA1 Message Date
John McLear 04d5e25305 Update settings.json.template 2015-06-23 23:03:56 +01:00
John McLear 95ca936dd7 Merge pull request #2703 from LaKing/patch-1 
run.sh [: too many arguments
 2015-06-22 15:25:35 +01:00
István Király 376fccfe92 bugfix for correct bash syntax 
$rocks has to be enclosed into a "string" so bash can treat is as a string.
We can compare two strings with the == operator then, ...
 2015-06-22 16:11:29 +02:00
John McLear 6b40961fc8 Merge pull request #2699 from xavidotron/develop 
Add author information to the context for padCreate and padUpdate hooks.
 2015-06-22 10:56:56 +01:00
Siebrand Mazeland 13fa863f4b Localisation updates from https://translatewiki.net. 2015-06-22 11:52:20 +02:00
Xavid bc78e0c68d Update documentation for the updatePad and createPad hooks to include 'author' 
in the context.
 2015-06-21 11:34:59 -04:00
Xavid a4fe0d0dc8 Add an 'author' entry to the context for the padCreate and padUpdate hooks. 2015-06-21 11:29:17 -04:00
John McLear 23bcccdf80 Merge pull request #2696 from xavidotron/develop 
Allow a pad to end with only a single newline.
 2015-06-20 13:54:37 +01:00
Xavid 778e1e4641 Allow a return keypress in a list on the last line of a pad to create a new 
line.
 2015-06-19 14:03:22 -04:00
Xavid 0713553906 Allow a pad to only end with a single newline, rather than requiring two. 2015-06-19 14:02:18 -04:00
Siebrand Mazeland ef5e62e3a1 Localisation updates from https://translatewiki.net. 2015-06-18 13:25:28 +02:00
John McLear 8af8c37896 Merge pull request #2695 from goldquest/dev_overallImportBug 
On Import, when successful, loading circle didn't go away
 2015-06-17 18:16:18 +01:00
goldquest 32ba48835a if variable not declared, test if null throws error 2015-06-17 18:54:19 +02:00
John McLear a0aa9470a3 Merge pull request #2690 from lpagliari/develop 
Add new icon to fontawesome subset: comment
 2015-06-11 11:46:31 +01:00
Luiza Pagliari 1353c093db Add new icon to fontawesome subset: comment 2015-06-10 18:05:24 -03:00
John McLear 5a5d245c06 fix issues with redrawing focus back to input element would lose param selected name 2015-06-08 17:13:46 +01:00
Siebrand Mazeland 2fa2dc8a03 Localisation updates from https://translatewiki.net. 2015-06-08 16:09:38 +02:00
John McLear fd20c5ef79 Merge pull request #2689 from luin/develop 
Change "Javascript" to "JavaScript"
 2015-06-03 12:55:02 +01:00
Zihua Li beae99415c Change "Javascript" to "JavaScript" 2015-06-03 19:45:08 +08:00
John McLear d11c92cbf9 Merge pull request #2684 from hinnerk/develop 
Conver.js: Use current mysql client API
 2015-05-30 16:40:22 +01:00
Hinnerk Haardt 7ba5e97a60 Use current mysql client API 2015-05-30 15:14:40 +02:00
John McLear b049f4bfc7 Merge pull request #2681 from lpagliari/develop 
Allowing 'value' to be a localizable attribute on HTML elements.
 2015-05-25 22:07:05 +01:00
Siebrand Mazeland 7e38e2c2b1 Localisation updates from https://translatewiki.net. 2015-05-25 13:00:34 +02:00
Luiza Pagliari 92aabe12dc Allowing 'value' to be a localizable attribute on HTML elements. 2015-05-25 07:08:24 -03:00
John McLear bfb34ff806 Merge pull request #2678 from shimaore/patch-2 
Do not extend Array.prototype
 2015-05-22 11:29:32 +01:00
Stéphane Alnet 0b3216ecb6 Do not extend Array.prototype 2015-05-22 12:27:08 +02:00
John McLear 757ad765d3 use removeItem instead of remove namespace 2015-05-22 11:09:21 +01:00
John McLear 0eb8b800cf hide chat if its already open on readonly mode 2015-05-20 01:50:37 +01:00
John McLear 48da5c1ab1 docs for handle message security 2015-05-20 01:09:35 +01:00
John McLear 3944a0e79b more read only mode fixes andadd support for handleMessageSecurity hook 2015-05-20 01:05:53 +01:00
John McLear fe7ab21c84 dont allow chat input or name input on read only pads 2015-05-19 17:52:43 +01:00
John McLear 818408cf49 other bits required for read only 2015-05-19 16:57:53 +01:00
John McLear 41d24a8c8f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-05-19 16:44:57 +01:00
John McLear b662d5c618 dont show editing buttons in R/O view 2015-05-19 16:43:19 +01:00
John McLear 5615bab0d9 Merge pull request #2668 from simong/tidy 
Tidy HTML before trying to convert it with abiword
 2015-05-18 20:04:15 +01:00
Simon Gaeremynck fd9d0bc291 Added backend tests for TidyHtml 2015-05-18 17:44:11 +01:00
Simon Gaeremynck 7fe99cccad Using log4js in TidyHtml 2015-05-18 17:43:46 +01:00
Simon Gaeremynck 786b43efc8 Tidy HTML before trying to convert it with abiword 2015-05-18 16:24:41 +01:00
Siebrand Mazeland 0c4b3f8124 Localisation updates from https://translatewiki.net. 2015-05-16 18:53:23 +02:00
John McLear a2130b52af Merge pull request #2665 from lpagliari/develop 
Fixing documentation of collectContentPre
 2015-05-15 18:07:08 +01:00
Luiza Pagliari 6bd2013c71 Fixing documentation of collectContentPre 2015-05-15 11:18:58 -03:00
John McLear 9e9207d8b6 Merge pull request #2657 from simong/cookie-parser 
Use the cookie parser middleware
 2015-05-11 15:10:45 +01:00
John McLear 3b91b46baa always hide connected one second after connected 2015-05-10 11:46:49 +01:00
John McLear f5ccd3ce6d Merge pull request #2656 from stefanmintert/20150507-innertext-bugfix 
Bugfix innerText
 2015-05-07 23:09:24 +01:00
Simon Gaeremynck 5a7750781b Use the cookie parser middleware 2015-05-07 18:35:21 +01:00
John McLear 74071dc066 Merge pull request #2621 from ether/fix-dead-keys 
first attempt at fixing dead keys, it cant be this easy can it?
 2015-05-07 16:57:43 +01:00
John McLear debca84ebe Merge branch 'develop' of https://github.com/ether/etherpad-lite into fix-dead-keys 2015-05-07 15:56:01 +00:00
John McLear 975bd99064 support for french stuff 2015-05-07 15:55:52 +00:00
Stefan Mintert 250afd0451 Bugfix. Description of bug at https://github.com/tm-linkwerk/ep_linebreak/blob/WR-72-linebreak-cursorverhalten/static/hooks.js#L94 2015-05-07 16:47:14 +02:00
John McLear ee0368fd0f Merge pull request #2649 from xavidotron/develop 
When using setText(), replace the entire existing text of the pad.
 2015-05-06 16:37:07 +01:00