Commit Graph

19799 Commits

Author SHA1 Message Date
Damian Mooyman
9666222637
BUG Fix _configure_database.php being ignored
Fixes #7590
2017-11-29 12:01:24 +13:00
Damian Mooyman
5bfc0c43eb
Merge pull request #7648 from creative-commoners/pulls/4.0/support-some-class-collection
FIX Support self::class text collection
2017-11-29 11:37:06 +13:00
Damian Mooyman
c23d1f3f99
Merge pull request #7649 from kinglozzer/logout-backurl
FIX: Restore BackURL preservation on log out (closes #7636)
2017-11-29 11:31:57 +13:00
Chris Joe
54689a340f
Merge pull request #7645 from open-sausages/pulls/4.0/hot-crosslinked-puns
Add crosslinks to lessons
2017-11-29 10:40:02 +13:00
Damian Mooyman
62eb531164
Merge pull request #7641 from Sil3ntStorm/patch/display_errors
Reintroduce checking against original php.ini values.
2017-11-28 17:36:50 +13:00
Aaron Carlino
b56720c6f5 Updates per PK review 2017-11-28 14:11:52 +13:00
Damian Mooyman
2fe59680e3
Merge pull request #7620 from open-sausages/pulls/4.0/its-too-big-to-fit
BUG Added warning for auto-generated table_name
2017-11-28 09:42:12 +13:00
Loz Calver
c4b366828e FIX: Restore BackURL preservation on log out (closes #7636) 2017-11-27 16:15:28 +00:00
Daniel Hensby
8c4822edd3
Merge pull request #7643 from open-sausages/pulls/4.0/portugal
ENHANCEMENT Promote portugese (portugal) as primary locale
2017-11-27 13:29:38 +00:00
Robbie Averill
b7ea05900e FIX Support self::class text collection 2017-11-27 23:20:29 +13:00
Loz Calver
b31b22ac8e
Merge pull request #7635 from dhensby/pulls/3.5/update-pwd-encryption-on-change
FIX Update meber passwordencryption to default on password change
2017-11-27 09:05:43 +00:00
Christopher Joe
cc72b5c852 BUG Added warning for auto-generated table_name for non-test classes 2017-11-27 20:22:37 +13:00
Chris Joe
f02adb7768
Merge pull request #7626 from open-sausages/pulls/4.0/theme-dir
Restore legacy $ThemeDir support
2017-11-27 20:19:27 +13:00
Damian Mooyman
7a79cd039a
[SS-2017-010] Prevent install.php from disclosing system passwords 2017-11-27 18:15:53 +13:00
Aaron Carlino
ff02fa4ff7 Add crosslinks to lessons 2017-11-27 16:50:38 +13:00
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
6e7fb4747e
Restore legacy $ThemeDir support 2017-11-27 15:24:40 +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
Damian Mooyman
33a39666ba
ENHANCEMENT Promote portugese (portugal) as primary locale
Fixes #6561
2017-11-27 14:52:51 +13:00
Damian Mooyman
bac5f4c8aa
Merge branch '3.5' into pulls/3.5/update-pwd-encryption-on-change 2017-11-27 14:42:32 +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
Sil3ntStorm
0b879d690a
Reintroduce checking against original php.ini values.
Seems to have been accidentally removed in 806ffb934e

Fixes https://github.com/silverstripe/silverstripe-installer/issues/211
2017-11-26 01:36:40 +01: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
2ad3cc07d5
FIX Update meber passwordencryption to default on password change 2017-11-23 21:17:31 +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