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
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
John McLear
33594a7246
Update README.md
2015-04-15 11:52:03 +01:00
Stefan
89bd155ca2
Merge pull request #2611 from ether/master
...
Master
2015-04-13 18:21:21 +02:00
Stefan
24b0712d77
Merge new release into master branch!
2015-04-13 17:27:37 +02:00
Stefan
64d94cb346
Release version 1.5.5
2015-04-13 17:27:14 +02:00
John McLear
629f909d57
add some semicoolons to prevent chrome warning
2015-04-13 10:52:15 +01:00
John McLear
431c55811f
Merge pull request #2606 from 0x46616c6b/traversal-fix-2
...
dont allow directory traversal #2
2015-04-12 18:27:18 +01:00
louis
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
John McLear
0dfecb3af7
change target for IE 9 test
2015-04-12 14:05:49 +01:00
John McLear
4ef6604ca9
dont test against IE8 any more as we dont care about it
2015-04-12 13:16:32 +01:00
