Aaron Carlino
b56720c6f5
Updates per PK review
2017-11-28 14:11:52 +13:00
Aaron Carlino
ff02fa4ff7
Add crosslinks to lessons
2017-11-27 16:50:38 +13:00
Daniel Hensby
07a0f75426
Merge branch '3.6' into 4.0
2017-11-25 16:56:50 +00:00
Daniel Hensby
badeb0cc8c
Merge branch '3.5' into 3.6
2017-11-25 16:17:36 +00:00
Daniel Hensby
f31caaa429
Merge pull request #7640 from kinglozzer/travis-firefox
...
Specify Firefox 31 for Travis Behat builds
2017-11-24 21:53:35 +00:00
Loz Calver
7b719d7b9d
Specify Firefox 31 for Travis Behat builds
2017-11-24 21:16:36 +00:00
Loz Calver
6ab9dba9c8
Merge pull request #7639 from dhensby/pulls/3.5/phpunit-warnings
...
Fix deprecated usage of getMock in unit tests
2017-11-24 15:16:26 +00:00
Daniel Hensby
09a003bc13
Fix deprecated usage of getMock in unit tests
2017-11-24 14:48:30 +00:00
Daniel Hensby
79bba8bfd1
Merge pull request #7632 from open-sausages/pulls/3.5/fix-director-cli-redirect
...
BUG Don't redirect in force_redirect() in CLI
2017-11-23 12:49:32 +00:00
Loz Calver
66e26268f7
Merge pull request #7633 from open-sausages/pulls/4.0/upgrade-docs-appname
...
DOCS Add note on removed deprecated setApplicationLink / setApplicationName
2017-11-23 09:32:31 +00:00
Damian Mooyman
4439d051cf
DOCS Add note on removed deprecated setApplicationLink / setApplicationName
...
Fixes #7631
2017-11-23 15:20:00 +13:00
Damian Mooyman
1053de7ec3
BUG Don't redirect in force_redirect() in CLI
...
Replaces #4025
2017-11-23 14:26:55 +13:00
Loz Calver
a7dfda2a85
Merge pull request #7628 from dhensby/pulls/3.5/travis-retry
...
Travis retry on imagick install
2017-11-22 17:04:01 +00:00
Loz Calver
7c98346c68
Merge pull request #7629 from dhensby/pulls/3.6/int-lowercase-fix
...
FIX Allow lowercase and uppercase delcaration of legacy Int class
2017-11-22 16:58:17 +00:00
Daniel Hensby
ef6d86f2c6
FIX Allow lowercase and uppercase delcaration of legacy Int class
2017-11-22 16:34:42 +00:00
Daniel Hensby
a63bb12d92
Travis retry on imagick install
2017-11-22 13:25:26 +00:00
Daniel Hensby
2e76936878
Merge pull request #7345 from schellmax/patch-2
...
TreeDropdownField: replace onadd by onmatch
2017-11-22 12:37:11 +00:00
Daniel Hensby
9f0917ff5c
Merge pull request #7623 from andrewandante/bugfix/apcu_cli
...
check for apc.enable_cli when running from CLI
2017-11-22 11:33:33 +00:00
Daniel Hensby
2eeff57b14
Merge pull request #7627 from open-sausages/pulls/4.0/fix-html-image-variants
...
BUG Fix regressions in asset resize behaviour change
2017-11-22 10:33:46 +00:00
Andrew Aitken-Fincham
3620e57b5b
check for apc.enable_cli when running from CLI
2017-11-22 08:50:20 +00:00
Damian Mooyman
d9e7a92b3c
BUG Fix regressions in asset resize behaviour change
2017-11-22 14:36:24 +13:00
Chris Joe
b1da49ff89
Merge pull request #7618 from open-sausages/pulls/4.0/no-resample-prz
...
DOCS Update docs for force_resample
2017-11-21 10:28:41 +13:00
Damian Mooyman
2a3abcec0d
DOCS Update docs for force_resample
2017-11-20 17:14:23 +13:00
Damian Mooyman
d047c921ed
Merge pull request #7617 from open-sausages/pulls/3.6/inject-datadifferencer
...
Make DataDifferencer injectable
2017-11-20 16:59:52 +13:00
Ingo Schommer
d39e9b0bb0
Make DataDifferencer injectable
...
Requested by Steve Boyd
2017-11-20 15:47:35 +13:00
Damian Mooyman
a73f75ccc5
Merge pull request #7613 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:58:20 +13:00
Chris Joe
d8ca223e15
Merge pull request #7605 from open-sausages/pulls/4.0/fix-enum-defaults
...
BUG Fix DBEnum ignoring empty defaults
2017-11-20 11:32:45 +13:00
Daniel Hensby
36bb28a41d
Loosen PHPUnit constraints
2017-11-17 11:48:24 +00:00
Damian Mooyman
cbf9e40115
BUG Fix postgres / PDO support
2017-11-17 12:35:55 +13:00
Damian Mooyman
ef58799103
BUG Fix DBEnum ignoring empty defaults
...
FIxes #7582
2017-11-17 12:35:39 +13:00
Loz Calver
13b02feed7
Merge pull request #7602 from dhensby/pulls/3.5/fix-filter-any-inner-join
...
FIX ManyMany link table joined with LEFT JOIN
2017-11-16 13:48:07 +00:00
Daniel Hensby
d020ec3958
Merge pull request #7599 from open-sausages/pulls/4.0/time-and-relative-date-in-silverstripe
...
WIP - BUG Fix don't treat zero-date as invalid
2017-11-16 12:48:51 +00:00
Daniel Hensby
c96ed89cbe
Merge pull request #7607 from patricknelson/issue-7606-svg-image-tags
...
FIX: Prevent crash when saving page with <img> that has an SVG source.
2017-11-16 12:12:49 +00:00
Daniel Hensby
ce3fd370fb
FIX ManyMany link table joined with LEFT JOIN
2017-11-16 12:11:16 +00:00
Daniel Hensby
29e57d8015
Merge pull request #7608 from bummzack/patch-1
...
Fix HTTP::get_mime_type with uppercase filenames.
2017-11-16 11:48:11 +00:00
Daniel Hensby
4f3deb13e0
TEST filterAny on many_many relations return correct items
2017-11-16 11:10:12 +00:00
Patrick Nelson
52f0eadd3b
FIX for #7606 : Ensure the object we're handling is actually an Image instance before calling methods specific to that class (e.g. in case of using SVG's in <img> tag which may be File instances).
2017-11-16 11:08:06 +00:00
Daniel Hensby
3d3096485b
TEST Uppercase file extensions return correct mime type
2017-11-16 11:01:25 +00:00
Roman Schmid
dda14e8959
Fix HTTP::get_mime_type with uppercase filenames.
...
The fallback of `HTTP::get_mime_type` (that uses a lookup instead of `finfo`) doesn't ensure the extension is converted to lowercase before the lookup. A file named `Image.JPG` will return `'application/unknown'`.
This change fixes this issue.
2017-11-16 10:56:34 +00:00
Daniel Hensby
4d1e659fed
Merge branch pull request #7604 from open-sausages/pulls/4.0/owns-example-upgrading
...
DOCS Adjust owns upgrading example
Fixes #7598
2017-11-16 10:53:38 +00:00
Christopher Joe
2bc7edbf47
BUG Fix don't treat zero-date as invalid
2017-11-16 13:30:15 +13:00
Damian Mooyman
6a6cf2f9eb
ENHANCEMENT Raise warning if DBField::create_field() would behave unpredictably and improve PHPDoc
2017-11-16 12:55:31 +13:00
Damian Mooyman
58b43f29a9
DOCS Adjust owns upgrading example
...
Fixes #7598
2017-11-16 11:38:26 +13:00
Chris Joe
e78fe401e6
Merge pull request #7601 from open-sausages/pulls/4.0/ensure-assets-writable
...
ENHANCEMENT Ensure that non-writable assets files are notified during install
2017-11-15 16:37:03 +13:00
Chris Joe
bee3c404fa
Merge pull request #7545 from open-sausages/pulls/4.0/deprecated-each
...
BUG Remove usage of deprecated each() and use a helper method instead
2017-11-15 16:30:20 +13:00
Damian Mooyman
c9921447b3
Merge pull request #7539 from colintucker/fix-broken-paginated-list
...
Fixed array/object mismatch bug in PaginatedList
2017-11-15 15:17:15 +13:00
Damian Mooyman
8b063026f0
ENHANCEMENT Ensure that non-writable assets files are notified during install
...
Fixes #7580
2017-11-15 13:30:19 +13:00
Chris Joe
5077eb8125
Merge pull request #7593 from open-sausages/pulls/4.0/better-perms-docs
...
DOC Improve file permission docs
2017-11-15 11:44:51 +13:00
Daniel Hensby
4731d3c671
Merge branch '3.5' into 3.6
2017-11-14 12:00:53 +00:00
Damian Mooyman
3d4c50d76c
DOC Improve file permission docs
...
See #7584
2017-11-14 16:07:23 +13:00
