Thomas Portelange
|
e729cd2c37
|
TinyMCE lang is fr_FR for all French languages
"fr" is not a valid tiny mce lang
https://www.tinymce.com/docs/configure/localization/
having "fr" as it is currently prevents loading the language file
|
2017-11-29 12:54:27 +01:00 |
|
Daniel Hensby
|
9f55fd6800
|
Merge pull request #7655 from open-sausages/pulls/4.0/fix-scrutinizer
BUG Fix broken scrutinizer
|
2017-11-29 11:46:21 +00:00 |
|
Damian Mooyman
|
b3a51aa8d3
|
BUG Fix broken scrutinizer
|
2017-11-29 14:14:38 +13:00 |
|
Chris Joe
|
1b145541c4
|
Merge pull request #7622 from open-sausages/pulls/4.0/fix-database-config
BUG Fix _configure_database.php being ignored
|
2017-11-29 13:08:04 +13:00 |
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
Daniel Hensby
|
0f2049d4d4
|
[SS-2017-008] Fix SQL injection in search engine
|
2017-11-21 14:45:36 +00: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 |
|
Damian Mooyman
|
099a5a3c2d
|
[SS-2017-008] Fix SQL injection in full text search
|
2017-11-20 16:53:44 +13:00 |
|