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

4361 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Xavid
9e86fb279b Fix backend tests with new setText() implementation; tests depended 
on the old setText() behavior leaving the last character.
 2015-05-06 08:45:22 -04:00
John McLear
a1893ec629 Merge pull request #2650 from ether/iframe-issues 
Iframe issues
 2015-05-06 00:58:38 +01:00
John McLear
361807e578 console msg should go to window 2015-05-06 00:36:42 +01:00
John McLear
c903cb3925 fix alt c and escape 2015-05-06 00:32:36 +01:00
John McLear
363d5d06b7 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-05-05 20:41:58 +01:00
John McLear
48c2b7cde1 fixes #2570 2015-05-05 20:41:40 +01:00
Xavid
5e64c292a4 When using setText(), replace the entire existing text of the pad, 
rather than replacing all except the last letter.
 2015-05-05 14:18:27 -04:00
John McLear
a5872f536b Merge pull request #2647 from 0ip/fix/awkward-css 
Fix popup border border
 2015-05-04 21:28:48 +01:00
0ip
9b85b8dc98 Fix popup border 2015-05-04 22:18:34 +02:00
Siebrand Mazeland
8967c3ea49 Localisation updates from https://translatewiki.net. 2015-05-04 10:39:03 +02:00
John McLear
0a9c631410 better fix for #2625 2015-05-01 20:44:36 +01:00
John McLear
4938c7be38 plugins always return html so use that endpoint 2015-04-29 20:54:41 +01:00
John McLear
da06ac6fd7 dont prompt twice on import fool 2015-04-29 16:40:29 +01:00
John McLear
4b4a121f08 Merge pull request #2643 from AlexanderS/fix-timeslider-export 
timeslider: Fix export links
 2015-04-29 15:48:10 +01:00
Alexander Sulfrian
74ad7a8584 timeslider: Fix export links 
Names of the pads can contain more charaters than \w. So while
transforming the export links, we simply can allow all charaters
except the slash as pad names.
 2015-04-29 16:39:40 +02:00
John McLear
ac41d150c0 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-28 23:42:11 +01:00
John McLear
1f471b0f81 show versions of plugins at startup, fixes #2642 2015-04-28 23:41:55 +01:00
John McLear
799b086216 Merge pull request #2641 from lpagliari/develop 
Fix the way Content Collector gets the node class. Fixes #2640
 2015-04-28 23:05:39 +01:00
John McLear
dbb2956d2f allow chrome to use control shift 1 to send ordered list 2015-04-28 15:48:12 +01:00
Luiza Pagliari
58ab17bf9e Fix the way Content Collector gets the node class. Fixes #2640 2015-04-28 05:31:07 -07:00
John McLear
e1406b826b cleaner update logic doesnt error when nothing to do 2015-04-26 14:42:21 +01:00
John McLear
254edffa9c fixes #2547 2015-04-24 14:17:49 +01:00
John McLear
a6a8c4d909 provide a script that cleans up before running to save people doing rm rf src node_modules 2015-04-24 07:07:18 +01:00
John McLear
b349a4f226 probably fixes #2625 2015-04-23 17:49:08 +01:00
John McLear
b4163fc862 fix docs 2015-04-23 17:27:54 +01:00
John McLear
d7c7c96145 Merge pull request #2636 from andreassolberg/develop 
Adding support for providing intermediate CA certificates
 2015-04-22 20:38:42 +01:00
Andreas Åkre Solberg
ec7b3fc787 Adding support for providing intermediate CA certificates when running etherpad-lite with ssl through Node/expressjs 2015-04-22 20:29:19 +02:00
John McLear
b8192fd015 first attempt at fixing dead keys, it cant be this easy can it? 2015-04-17 17:01:15 +01:00
John McLear
d31523aa08 Update hooks_server-side.md 2015-04-17 15:58:23 +01:00
Stefan
29ab7b9026 Merge pull request #2619 from ether/master 
Master
 2015-04-16 23:54:21 +02:00
Stefan
e509824f29 Merge new release into master branch! 2015-04-16 23:06:58 +02:00
Stefan
2393ea01f0 Release version 1.5.6 2015-04-16 23:06:24 +02:00
John McLear
70d338c7d5 Merge pull request #2618 from Gared/win_node_version 
Update node version for windows build to 0.12.2
 2015-04-16 21:58:13 +01:00
Stefan
f81c6b6476 Update node version for windows build to 0.12.2 2015-04-16 22:56:14 +02:00
John McLear
ee10a21d82 Merge pull request #2617 from devoidfury/fix/windows-issue-2614 
revert to old path handling, but strip out "..". fixes #2614
 2015-04-15 20:38:02 +01:00
Tom Hunkapiller
6ff7d4e9a6 revert to old path handling, but strip out "..". fixes #2614 2015-04-15 14:31:21 -05:00
John McLear
1fbf0db650 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-15 15:51:27 +01:00
John McLear
a3ce6b1ca7 remove two pointless dep removes 2015-04-15 15:51:13 +01:00