Commit Graph

19422 Commits

Author SHA1 Message Date
Damian Mooyman
146be6830b
Merge pull request #7644 from michalkleiner/patch-4
MINOR Text fixes in docs
2017-11-27 16:45:34 +13:00
Damian Mooyman
4b90821ef5
Update travis to recipe 1.1 2017-11-27 16:04:06 +13:00
Damian Mooyman
36872c5ea4
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-27 16:02:40 +13:00
Michal Kleiner
878c072f98
Update 02_URL_Variable_Tools.md
Remove value from the name of param (flush), fix pipe symbol (showqueries)
2017-11-27 15:44:34 +13:00
Damian Mooyman
7c3997344a
Merge pull request #7642 from creative-commoners/pulls/4.0/fix-moduleloader-examples
DOCS Update getRelativeResourcePath (deprecated) to getResource()->getRelativePath() in upgrade examples
2017-11-27 15:27:23 +13:00
Damian Mooyman
a7847b573b
ENHANCEMENT Add the ability to redirect a user to a custom page 2017-11-27 15:04:49 +13:00
Simon Erkelens
0987003053 Add the ability to redirect a user to a custom page with custom content after changing their password 2017-11-27 14:18:40 +13:00
Robbie Averill
2e139dc5fd DOCS Update getRelativeResourcePath (deprecated) to getResource()->getRelativePath() in upgrade examples 2017-11-27 10:53:21 +13:00
Daniel Hensby
0ceb4cfa18
Merge branch '3' into 4 2017-11-25 17:34:24 +00:00
Daniel Hensby
6d5cbe0a0e
Merge branch '4.0' into 4 2017-11-25 17:19:31 +00:00
Daniel Hensby
07a0f75426
Merge branch '3.6' into 4.0 2017-11-25 16:56:50 +00:00
Daniel Hensby
fd201bc71b
Merge branch '3.6' into 3 2017-11-25 16:18:46 +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
Chris Joe
e991792179
Merge pull request #7638 from kinglozzer/kinglozzer-patch-1
Update docs for .env files to explicitly mention naming convention
2017-11-25 01:10:54 +13:00
Loz Calver
6797dc950a
Update docs for .env files to explicitly mention naming convention 2017-11-24 10:56:57 +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
Daniel Hensby
333ecc201c
Merge pull request #7583 from open-sausages/pulls/4/relation-object-navigation
BUG Ensure relObject() safely bails on empty objects
2017-11-23 12:48:57 +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
Damian Mooyman
f670afd4b3
Merge pull request #7619 from IsaacInsoll/patch-1
Documentation: 02_Manifests fix Typo
2017-11-21 16:09:53 +13:00
IsaacInsoll
2825c67e92
Documentation: 02_Manifests fix Typo 2017-11-21 12:29:39 +10:00
Christopher Joe
2b6b877327 Merge branch '4.0' of https://github.com/silverstripe/silverstripe-framework into 4 2017-11-21 15:08:30 +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
Damian Mooyman
c49f954c08
Merge pull request #7612 from mr-macedawg/patch-1
Update form template directory
2017-11-20 13:50:48 +13:00
Damian Mooyman
f3611e527e
Merge pull request #7611 from SpiritLevel/patch-2
Update 04_GridField.md
2017-11-20 13:48:44 +13:00
Damian Mooyman
2e07a499c5
Merge pull request #7609 from SpiritLevel/patch-1
Update 04_GridField.md
2017-11-20 13:48:26 +13:00
Damian Mooyman
d338c33f4c
Merge pull request #7615 from zarocknz/patch-1
Update 05_Middlewares.md
2017-11-20 13:48:07 +13:00
Damian Mooyman
6fabf8121c
Merge pull request #7616 from zarocknz/patch-2
Update 05_Template_Inheritance.md
2017-11-20 13:47:49 +13:00
DouG
d2a6b979d2
Update 05_Template_Inheritance.md
Correct use of backticks rather than single quote
2017-11-20 13:30:09 +13:00
DouG
e8c12793b3
Update 05_Middlewares.md
Add missing semicolon.
2017-11-20 13:10:37 +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
9760c95bc0
Merge pull request #7614 from MichaelJJames/patch-5
Update 01_Extensions.md
2017-11-18 16:16:46 +00:00