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 |
|
John McLear
|
6a027d88a9
|
fix older IEs
|
2015-04-12 13:00:01 +01:00 |
|
John McLear
|
5435063a2f
|
re-fix rtl
|
2015-04-12 10:35:24 +01:00 |
|
John McLear
|
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 |
Peter 'Pita' Martischka
|
fc0cac0cad
|
merge object settings into default settings
|
2015-04-11 22:01:46 +01:00 |
|
John McLear
|
8ed12c7776
|
session key is now ignored and also padOptions are available in settings
|
2015-04-11 21:22:00 +01:00 |
|
John McLear
|
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 |
Stefan
|
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 |
Tom Hunkapiller
|
a896d67e8c
|
make setPadRaw async; streamline .etherpad file import handling chain
|
2015-04-11 12:02:19 -05:00 |
Stefan
|
a3ed82ad06
|
Move sessionKey setting from settings.json to SESSIONKEY.txt
|
2015-04-11 18:45:14 +02:00 |
|
John McLear
|
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 |
|
Tom Hunkapiller
|
133188320a
|
fix: only match /javascript/* for caching middleware
|
2015-04-11 09:54:40 -05:00 |
|
John McLear
|
1d44490dc4
|
Merge pull request #2599 from Gared/doc_api_fix
Fix documentation for deleteSession api method
|
2015-04-11 15:07:18 +01:00 |
|
Stefan
|
a842eb4f5c
|
Fix documentation for deleteSession api method
|
2015-04-11 16:05:41 +02:00 |
|
John McLear
|
07efa4246b
|
comment out import tests as they fail in IE
|
2015-04-11 14:57:59 +01:00 |
|
John McLear
|
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
|
5ef22e649b
|
Merge pull request #2302 from Gared/create_pad_special_characters
Add check for special url characters to createPad API function
|
2015-04-11 14:56:26 +01:00 |
|
Stefan
|
83094e0dfd
|
Add test for creating pads with bad characters
|
2015-04-11 15:50:51 +02:00 |
|
John McLear
|
27aa71f3a4
|
IE list fixes
|
2015-04-11 13:16:45 +01:00 |
|
Stefan
|
d26c3d5f7e
|
increase http api version
|
2015-04-11 13:45:59 +02:00 |
|
Stefan
|
601be46993
|
Add docs for new error message for createPad api method
|
2015-04-11 13:16:03 +02:00 |
|
John McLear
|
34c5441392
|
msg to self
|
2015-04-11 11:37:20 +01:00 |
|
John McLear
|
4d009ba445
|
bump underscore and require kernel
|
2015-04-11 11:32:46 +01:00 |
|
Stefan
|
aa0d14c7d7
|
Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters
|
2015-04-11 12:10:37 +02:00 |
|
John McLear
|
14fab9f441
|
FF middle click fix
|
2015-04-11 10:45:51 +01:00 |
|
John McLear
|
2ca0214661
|
bump versions outdated
|
2015-04-11 10:24:50 +01:00 |
|
Stefan
|
a69b2a9cd1
|
Merge pull request #2596 from ether/master
Master
|
2015-04-11 10:55:26 +02:00 |
|
John McLear
|
acc1a0626a
|
use latest ejs
|
2015-04-11 09:53:27 +01:00 |
|
Stefan
|
cc34f4e325
|
Merge pull request #2595 from ether/release/1.5.4
Release 1.5.4
|
2015-04-11 10:24:59 +02:00 |
|
Stefan
|
1b9a51c879
|
Release version 1.5.4
|
2015-04-11 10:19:02 +02:00 |
|
John McLear
|
d3baf24ce1
|
disabling import export tests for now as they are reporting false positives... at some point they will need properly fixing
|
2015-04-11 09:12:53 +01:00 |
|
Tom Hunkapiller
|
0b0a349081
|
clearer comments about the path handling behavior
|
2015-04-11 09:05:51 +01:00 |
|
Tom Hunkapiller
|
5409eb314c
|
fix an issue in the path handling that allowed directory traversal
|
2015-04-11 09:05:32 +01:00 |
|
John McLear
|
f5d1cd1751
|
Merge pull request #2593 from devoidfury/tests-DTA-fix
another traversal fix
|
2015-04-11 09:04:09 +01:00 |
|
Tom Hunkapiller
|
2e4374c08d
|
clearer comments about the path handling behavior
|
2015-04-10 20:19:26 -05:00 |
|
Tom Hunkapiller
|
3ebb19d8a2
|
fix an issue in the path handling that allowed directory traversal
|
2015-04-10 20:03:00 -05:00 |
|
John McLear
|
be0a96af6e
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2015-04-11 00:24:30 +01:00 |
|
John McLear
|
15470c9dc3
|
fix chrome test
|
2015-04-11 00:23:06 +01:00 |
|
John McLear
|
402e53d88e
|
Merge pull request #2584 from devoidfury/express4
Express 4 support
|
2015-04-11 00:13:45 +01:00 |
|
John McLear
|
7cb12ac10c
|
Merge pull request #2592 from ether/master
Master
|
2015-04-11 00:05:46 +01:00 |
|
John McLear
|
b95395a130
|
Merge pull request #2590 from ether/release/1.5.3
Release/1.5.3
|
2015-04-11 00:04:45 +01:00 |
|
Stefan
|
d47e201232
|
Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3
|
2015-04-11 00:49:26 +02:00 |
|
John McLear
|
8f8303415d
|
Merge pull request #2589 from Gared/add_version_number
Add version number to plugins-info page
|
2015-04-10 23:48:52 +01:00 |
|
Stefan
|
d3277deafc
|
Increase etherpad version to 1.5.3
|
2015-04-11 00:32:18 +02:00 |
|
Stefan
|
db5bdc8719
|
Log version number and git-sha on server start
|
2015-04-11 00:13:04 +02:00 |
|
Stefan
|
8e4c961207
|
Add version number to plugins-info page
|
2015-04-10 23:52:17 +02:00 |
|
John McLear
|
fc60ddded1
|
changelog
|
2015-04-10 22:23:07 +01:00 |
|
John McLear
|
9d4e5f6e35
|
dont allow directory traversal
|
2015-04-10 22:02:22 +01:00 |
|
Tom Hunkapiller
|
fd1d285a77
|
fix the rest of the deprecation warnings
|
2015-04-10 14:18:30 -05:00 |