Commit Graph

19726 Commits

Author SHA1 Message Date
Daniel Hensby
4c51cf67e7
Merge pull request #7742 from nglasl/3.6
FIX, adding a missing return statement.
2018-01-09 23:43:18 +00:00
Nathan
2ef4a2d4ee
FIX, adding a missing return statement.
This causes issues such as an `_function` to incorrectly return null.
2018-01-10 09:50:18 +11:00
Daniel Hensby
a049876418
Merge branch '3.5' into 3.6 2018-01-09 13:34:56 +00:00
Daniel Hensby
2de2a3e1a9
Merge pull request #7738 from open-sausages/pulls/4.0/fix-polymorphic-docs-dataobject
DOCS Correct docs on polymorphic dataobject usage
2018-01-08 21:22:17 +00:00
Damian Mooyman
d615da0e99
Merge pull request #7736 from andrewandante/BUGFIX/filefield_validation
check for UPLOAD_ERR_NO_FILE on FileField::saveinto
2018-01-08 15:04:53 +13:00
Damian Mooyman
164edd7df3
DOCS Correct docs on polymorphic dataobject usage
Fixes #7732
2018-01-08 14:10:11 +13:00
Damian Mooyman
677336fbef
Merge pull request #7726 from dhensby/pulls/3.5/functionaltest-html5-forms
FIX Allow HTML 5 input tags in FunctionalTest form submissions
2018-01-08 13:32:44 +13:00
Andrew Aitken-Fincham
fb5476cb70 check for UPLOAD_ERR_NO_FILE on FileField::saveinto 2018-01-03 12:01:18 +00:00
Daniel Hensby
02761d6ca8
Merge pull request #7712 from creative-commoners/pulls/4.0/fix-last-non-sortable-column
FIX Ensure last GridField column when non sortable has its title displayed
2017-12-28 11:53:14 +00:00
Daniel Hensby
44930f211b
FIX Allow HTML 5 input tags in FunctionalTest form submissions 2017-12-22 11:15:56 +00:00
Chris Joe
a80312ff14
Merge pull request #7723 from open-sausages/pulls/4.0/fix-cgi-basic-auth
BUG Fix basic auth in PHP-CGI
2017-12-21 16:40:11 +13:00
Damian Mooyman
f885101a1b
BUG Fix basic auth in PHP-CGI
Fixes #7717
2017-12-21 14:58:19 +13:00
Chris Joe
7e4ff1fb90
Merge pull request #7704 from open-sausages/pulls/4.0/before-class-migration
BUG Do database migrations before default records
2017-12-19 12:02:09 +13:00
Damian Mooyman
ce07e4781e BUG Do database migrations before default records
Fixes #7703
2017-12-18 16:37:21 +13:00
Damian Mooyman
d9d1e13735
Merge pull request #7707 from gorriecoe/Requirements-javascriptTemplate-ModuleResourceLoader
FIX: Added ModuleResourceLoader to javascriptTemplate
2017-12-18 14:27:32 +13:00
Damian Mooyman
11b15f6c1a
Merge pull request #7713 from creative-commoners/pulls/4.0/block-via-reference
FIX Allow Requirements::block to handle module resource paths
2017-12-18 14:22:37 +13:00
Reece Alexander
9c91e9820e
Returns chainability in setValue from parent 2017-12-17 17:21:42 +10:00
Robbie Averill
aa7ab0c494 Update test assertions to be more readable 2017-12-17 16:22:26 +13:00
Robbie Averill
ea8ed5067d FIX Allow Requirements::block to handle module resource paths 2017-12-17 16:09:22 +13:00
Raissa North
369653b5df FIX Ensure last GridField column when non sortable has its title displayed 2017-12-15 16:45:46 +13:00
Gorrie Coe
ef74911922 Added ModuleResourceLoader to javascriptTemplate 2017-12-15 11:20:20 +13:00
Daniel Hensby
1c72d6946d
Merge branch '3.6' into 4.0 2017-12-14 21:01:35 +00:00
Daniel Hensby
7b0500982e
Merge branch '3.5' into 3.6 2017-12-14 15:25:36 +00:00
Daniel Hensby
81150c5922
FIX Use PHP 5.3 array syntax 2017-12-14 15:24:53 +00:00
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
052f11a427
Remove merge artifact 2017-12-08 11:52:48 +13:00
Damian Mooyman
c22726bfd7
Merge remote-tracking branch 'origin/3.5' into 3 2017-12-07 14:09:02 +13:00
Damian Mooyman
e3c382a4de Added 4.0.1 changelog 2017-12-07 13:46:52 +13:00
Damian Mooyman
bf74e8347a Added 3.6.3 changelog 2017-12-07 13:35:49 +13:00
Damian Mooyman
b6a7e47441 Added 3.5.6 changelog 2017-12-07 13:27:17 +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
Damian Mooyman
8537dd56dd Added 3.6.3-rc2 changelog 2017-12-06 18:11:03 +13:00
Damian Mooyman
55739fa5af
Merge pull request #50 from silverstripe-security/pulls/3.6/ss-2017-007
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.6)
2017-12-06 17:41:49 +13:00