Commit Graph

19411 Commits

Author SHA1 Message Date
Daniel Hensby
7733e9caed
Merge pull request #7701 from open-sausages/pulls/4.0/better-summary-merging
BUG Fix incorrect merge of associative / non-associative summary fields
2017-12-14 13:25:51 +00:00
Damian Mooyman
1c8576cee7
Linting cleanup 2017-12-14 14:18:41 +13:00
Damian Mooyman
ed6561d9f5
BUG Fix incorrect merge of associative / non-associative summary fields
Fixes #7696
2017-12-14 14:17:19 +13:00
Damian Mooyman
a2fa9f0943
Merge pull request #7694 from creative-commoners/pulls/4.0/injection-session
FIX Use Injector to retrieve the current session
2017-12-12 16:47:36 +13:00
Robbie Averill
eb6c1fc6de FIX Allow the current controller as well as injectable HTTPRequest objects 2017-12-12 16:35:53 +13:00
Robbie Averill
097d0697c5 FIX Use Injector to retrieve the current session 2017-12-12 16:03:16 +13:00
Damian Mooyman
6be554a29e
Merge pull request #7691 from kinglozzer/warn-table-name
FIX: Only show table_name warning on dev/build
2017-12-12 10:02:11 +13:00
Damian Mooyman
2391af5ba7
Fix literal linting 2017-12-12 09:22:18 +13:00
Loz Calver
0e1753f33d FIX: Only show table_name warning on dev/build 2017-12-11 17:33:39 +00:00
Simon Erkelens
9aadd8db38 Add PR template
Update as per discussion
2017-12-11 14:08:41 +13:00
Robbie Averill
7643c90410
Merge pull request #7688 from open-sausages/pulls/4.0/less-breaking-warnings
BUG Don't warn on table name for classes without tables
2017-12-11 10:39:54 +13:00
Damian Mooyman
69decdf3a4
BUG Don't warn on table name for classes without tables
Fixes #7686
2017-12-11 09:55:57 +13:00
Damian Mooyman
e3c382a4de Added 4.0.1 changelog 2017-12-07 13:46:52 +13:00
Damian Mooyman
4ff1fb32dd Added 4.0.1-rc1 changelog 2017-12-07 12:16:58 +13:00
Damian Mooyman
16be39aa06 Added 4.0.1-rc1 changelog 2017-12-07 11:21:44 +13:00
Damian Mooyman
b939224615 Update translations 2017-12-07 11:08:25 +13:00
Damian Mooyman
286271a1e1
Merge pull request #56 from silverstripe-security/pulls/4.0/ss-2017-009
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (4.0 branch)
2017-12-06 18:22:47 +13:00
Damian Mooyman
b46b858847
Merge pull request #48 from silverstripe-security/pulls/4.0/fix-install-redacting
[SS-2017-010] Prevent install.php from disclosing system passwords
2017-12-06 18:22:36 +13:00
Damian Mooyman
e45921b293
Merge pull request #46 from silverstripe-security/pulls/4.0/escape-limit-args
[SS-2017-008] Fix SQL injection in full text search (4.0 branch)
2017-12-06 18:22:24 +13:00
Damian Mooyman
99e772b361
Merge pull request #51 from silverstripe-security/pulls/4.0/ss-2017-007
[ss-2017-007] Ensure xls formulae are safely sanitised on output (4.0)
2017-12-06 18:22:11 +13:00
Chris Joe
0e8d288240
Merge pull request #7667 from open-sausages/pulls/4.0/better-tinymce-locales
BUG Ensure that all tinymce_lang mappings are valid
2017-12-06 11:24:02 +13:00
Damian Mooyman
d290eee217
Merge pull request #7668 from kinglozzer/getviewertemplates
NEW: Add ViewableData::getViewerTemplates()
2017-12-06 11:22:53 +13:00
Damian Mooyman
01b48e2dd7
Merge pull request #7670 from kinglozzer/dataobject-schema-ancestry
FIX: Remove some unnecessary ClassInfo calls in DataObjectSchema
2017-12-06 11:02:49 +13:00
Loz Calver
91bd92df31 FIX: Remove some unnecessary ClassInfo calls in DataObjectSchema 2017-12-05 12:23:10 +00:00
Loz Calver
259ae3f78b NEW: Add ViewableData::getViewerTemplates()
Forms part of the fix for silverstripe/silverstripe-cms#2039
2017-12-05 09:13:28 +00:00
Robbie Averill
429c1e0e3b
Merge pull request #7664 from dhensby/pulls/4.0/nightly-builds
Add PHP nightly builds to travis
2017-12-05 17:42:11 +13:00
Robbie Averill
011a96f79e
Merge pull request #7672 from russmac/fix_db_autodiscover_comment
Fix db autodiscover comment on loading behavior.
2017-12-03 10:25:19 +13:00
Russell Maclean
3a4c6705c1 Fix db autodiscover comment on loading behavior. 2017-12-02 10:52:49 +10:30
Damian Mooyman
69295a6e22
BUG Ensure that all tinymce_lang mappings are valid 2017-12-01 15:00:39 +13:00
Damian Mooyman
cfe1d4f481
[ss-2017-007] Ensure xls formulae are safely sanitised on output
CSVParser now strips leading tabs on cells
2017-12-01 10:24:49 +13:00
Daniel Hensby
5ee2264bcb
Add PHP nightly builds to travis 2017-11-30 17:40:17 +00:00
Damian Mooyman
f1dd3d6f03
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt 2017-11-30 17:00:49 +13:00
Damian Mooyman
d57dea0318
Merge pull request #7658 from lekoala/patch-7
TinyMCE lang is fr_FR for all French languages
2017-11-30 12:44:30 +13:00
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
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