da06ac6fd7
dont prompt twice on import fool
2015-04-29 16:40:29 +01:00
4b4a121f08
Merge pull request #2643 from AlexanderS/fix-timeslider-export
...
timeslider: Fix export links
2015-04-29 15:48:10 +01:00
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
ac41d150c0
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-04-28 23:42:11 +01:00
1f471b0f81
show versions of plugins at startup, fixes #2642
2015-04-28 23:41:55 +01:00
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
dbb2956d2f
allow chrome to use control shift 1 to send ordered list
2015-04-28 15:48:12 +01:00
58ab17bf9e
Fix the way Content Collector gets the node class. Fixes #2640
2015-04-28 05:31:07 -07:00
e1406b826b
cleaner update logic doesnt error when nothing to do
2015-04-26 14:42:21 +01:00
254edffa9c
fixes #2547
2015-04-24 14:17:49 +01:00
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
b349a4f226
probably fixes #2625
2015-04-23 17:49:08 +01:00
b4163fc862
fix docs
2015-04-23 17:27:54 +01:00
d7c7c96145
Merge pull request #2636 from andreassolberg/develop
...
Adding support for providing intermediate CA certificates
2015-04-22 20:38:42 +01:00
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
b8192fd015
first attempt at fixing dead keys, it cant be this easy can it?
2015-04-17 17:01:15 +01:00
d31523aa08
Update hooks_server-side.md
2015-04-17 15:58:23 +01:00
29ab7b9026
Merge pull request #2619 from ether/master
...
Master
2015-04-16 23:54:21 +02:00
e509824f29
Merge new release into master branch!
2015-04-16 23:06:58 +02:00
2393ea01f0
Release version 1.5.6
2015-04-16 23:06:24 +02:00
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
f81c6b6476
Update node version for windows build to 0.12.2
2015-04-16 22:56:14 +02:00
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
6ff7d4e9a6
revert to old path handling, but strip out "..". fixes #2614
2015-04-15 14:31:21 -05:00
1fbf0db650
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-04-15 15:51:27 +01:00
a3ce6b1ca7
remove two pointless dep removes
2015-04-15 15:51:13 +01:00
33594a7246
Update README.md
2015-04-15 11:52:03 +01:00
89bd155ca2
Merge pull request #2611 from ether/master
...
Master
2015-04-13 18:21:21 +02:00
24b0712d77
Merge new release into master branch!
2015-04-13 17:27:37 +02:00
64d94cb346
Release version 1.5.5
2015-04-13 17:27:14 +02:00
629f909d57
add some semicoolons to prevent chrome warning
2015-04-13 10:52:15 +01:00
431c55811f
Merge pull request #2606 from 0x46616c6b/traversal-fix-2
...
dont allow directory traversal #2
2015-04-12 18:27:18 +01:00
0fa7650df8
dont allow directory traversal #2
2015-04-12 17:12:35 +02:00
0dfecb3af7
change target for IE 9 test
2015-04-12 14:05:49 +01:00
4ef6604ca9
dont test against IE8 any more as we dont care about it
2015-04-12 13:16:32 +01:00
6a027d88a9
fix older IEs
2015-04-12 13:00:01 +01:00
5435063a2f
re-fix rtl
2015-04-12 10:35:24 +01:00
e3f95d0c9c
Merge pull request #2604 from ether/pad-options
...
session key is now ignored and also padOptions are available in settings
2015-04-11 22:33:46 +01:00
fc0cac0cad
merge object settings into default settings
2015-04-11 22:01:46 +01:00
8ed12c7776
session key is now ignored and also padOptions are available in settings
2015-04-11 21:22:00 +01:00
4a70837de9
Merge pull request #2602 from devoidfury/fix/import-large-etherpad
...
fix large etherpad import, fixes #2524
2015-04-11 20:09:01 +01:00
43687f6e8b
Merge pull request #2601 from Gared/session_key_file
...
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 19:10:18 +02:00
a896d67e8c
make setPadRaw async; streamline .etherpad file import handling chain
2015-04-11 12:02:19 -05:00
a3ed82ad06
Move sessionKey setting from settings.json to SESSIONKEY.txt
2015-04-11 18:45:14 +02:00
25092fcb90
Merge pull request #2600 from devoidfury/fix/junk-binary-files
...
fix: only match /javascript/* for caching middleware
2015-04-11 16:00:02 +01:00
133188320a
fix: only match /javascript/* for caching middleware
2015-04-11 09:54:40 -05:00
1d44490dc4
Merge pull request #2599 from Gared/doc_api_fix
...
Fix documentation for deleteSession api method
2015-04-11 15:07:18 +01:00
a842eb4f5c
Fix documentation for deleteSession api method
2015-04-11 16:05:41 +02:00
07efa4246b
comment out import tests as they fail in IE
2015-04-11 14:57:59 +01:00
84b3f1728f
Merge pull request #2597 from Gared/increase_api_version
...
increase http api version to latest version
2015-04-11 14:56:47 +01:00
John McLear