Commit Graph

20948 Commits

Author SHA1 Message Date
Aaron Carlino
f766555d61 Merge branch '4.2' into 4.3 2019-06-10 17:27:05 +12:00
Serge Latyntcev
ca56e8d78e [CVE-2019-12246] Denial of Service on flush and development URL tools 2019-06-10 17:23:56 +12:00
Robbie Averill
188698dcee Merge branch '4.2' into 4.3 2019-05-30 09:35:17 +12:00
Robbie Averill
7f69cc8f94 Merge branch '4.1' into 4.2 2019-05-30 09:35:06 +12:00
Robbie Averill
02864aba3f Merge branch '4.0' into 4.1 2019-05-30 09:34:55 +12:00
Robbie Averill
58791e52b6
Merge pull request #9007 from NightJar/pulls/4.0/headerfield
FIX HeaderField requires the optional Title field
2019-05-27 10:50:15 +12:00
Dylan Wagstaff
25aa3af032 FIX HeaderField requires the optional Title field
FormField marks the Title constructor argument as optional, and DatalessField does not override the __construct method. HeaderField on the other hand goes against the grain of FormFields as a whole and requires the Title field, seemingly for no good reason (at least, not that the commit message for a68ba38478 indicates) - this seems like an accidental ommision. This commit looks to reinstate the optionality of this constructor argument for consistency's sake.

Plus it broke a module I was investigating.
2019-05-24 13:44:01 +12:00
Robbie Averill
32c04ce765
Merge pull request #8979 from silverstripe-terraformers/feature/add-extension-for-schema-validation
Add extend function in getSchemaValidation function
2019-05-16 11:22:45 +12:00
Aaron Carlino
3f1479edbb
BUGFIX: DataQuery overwriting _SortColumn selects (#8974)
* BUGFIX: DataQuery overwriting _SortColumn selects

* FIX DataQuery _SortColumn handling
2019-05-15 11:42:10 +12:00
shoosah
4da8be3bf5 Add extend function in getSchemaValidation function
This allows to create extensions which add validation list
2019-05-14 09:47:14 +12:00
Guy Marriott
53cb804929
Merge branch '4.2' into 4.3 2019-05-13 15:56:23 +12:00
Guy Marriott
3a5c14f7c2
FIX password validation min length message (#8976)
FIX password validation min length message
2019-05-13 15:55:31 +12:00
matt-in-a-hat
db0e6f7104 Fix password validation min length message
When relying on static config instead of an explicitly set minLength then this message would show without the value, like "it must be  or more characters long".
2019-05-13 13:43:29 +12:00
Guy Marriott
e7bb508391
Merge pull request #8956 from open-sausages/pulls/4.3/custom-aliases-to-be
Backward compatible behaviour for SQLConditionalExpression::getJoins
2019-05-03 09:40:25 +12:00
Serge Latyntcev
3d777cfb8a Backward compatible behaviour for SQLConditionalExpression::getJoins 2019-05-02 15:39:36 +12:00
Robbie Averill
523456ae09
Merge pull request #8921 from creative-commoners/pulls/4.3/threshold-count-in-sql
FIX Calculate threshold condition with SQL rather than PHP
2019-04-21 01:25:24 +12:00
Guy Marriott
9d6b5048a6 FIX Table aliases are retained on base tables in queries built using SQLConditionalExpression (#8918)
* Adding failing test for base table aliases using SQLSelect

* FIX Retain table aliases applied to the base table on queries

* FIX Move the trimmed alias outside of the condition so we can use it within the condition
2019-04-16 15:40:09 +12:00
Guy Marriott
7fd6e14423
Adding comment about the === 't' condition for supporting postgres 2019-04-16 12:10:13 +12:00
Robbie Averill
be9f0120ad
Merge pull request #8922 from lhalaa/pulls/dbtext-multibyte
FIX Replace substr with mb_substr to get the correct position
2019-04-15 23:14:06 +12:00
Guy Marriott
a48beac845
FIX Calculate threshold condition with SQL rather than PHP
This is a performance fix. Modern SQL engines can avoid counting a whole result set (potentially thousands of records) when you are only interested if the count exceeds a threshold.
2019-04-15 16:48:44 +12:00
Sheila Bañez
63360f8048 BUG Replace substr with mb_substr to get the correct position 2019-04-15 16:38:52 +12:00
Robbie Averill
f2f28586d9 Merge branch '4.2' into 4.3 2019-04-11 11:37:34 +12:00
Robbie Averill
116ea12783 Merge branch '4.1' into 4.2 2019-04-11 11:37:22 +12:00
Robbie Averill
f4a6115ee6 Merge branch '4.0' into 4.1 2019-04-11 11:36:40 +12:00
Robbie Averill
55cbacca86 Merge branch '4.2' into 4.3
# Conflicts:
 #	src/Forms/GridField/GridFieldLevelup.php
 #	src/includes/constants.php
2019-04-11 11:21:42 +12:00
Robbie Averill
b90061fdd3 Update translations 2019-04-11 11:16:00 +12:00
Guy Marriott
0f4bd1606a
Merge pull request #8903 from kinglozzer/enum-empty-defaults
FIX: prevent unnecessary field alterations for enums with empty defaults
2019-04-06 09:48:57 +13:00
Loz Calver
594af77134 FIX: prevent unnecessary field alterations for enums with empty defaults 2019-04-05 16:17:41 +01:00
Robbie Averill
8b4b54f264
PHPCS linting error on indentation 2019-04-05 16:29:24 +13:00
Robbie Averill
3771841dd5
Merge pull request #8901 from ian-patel/4.2
Fix Undefined variable: result when catch Exception
2019-04-05 11:53:25 +13:00
Guy Marriott
e9fe68c06c
Merge pull request #8900 from creative-commoners/pulls/4.3/test-state-isolation
MemberTest and SecurityTest now set the default authenticator to use
2019-04-05 11:49:14 +13:00
Ian Patel
759968bbe2 Fix Undefined variable: result when catch Exception 2019-04-05 11:33:01 +13:00
Robbie Averill
123d483213 MemberTest and SecurityTest now set the default authenticator to use 2019-04-05 11:26:29 +13:00
Robbie Averill
67d88c824b
Merge pull request #8880 from tractorcow/pulls/4.2/enum-schema-shifting
BUG Resolve issue where schema changes between enum / non-enum types
2019-04-05 11:09:02 +13:00
Robbie Averill
acf449011b
Merge pull request #8895 from thats4shaw/patch-1
DOCS HistoryViewerField updates
2019-04-02 18:05:37 +13:00
Hayden Shaw
30775aa428
DOCS HistoryViewerField updates
* Add missing rollback operation in scaffolding example
* Update block_id references to id  to allow query to read query to run successfully in conjunction with HistoryViewerField
2019-04-02 16:59:52 +13:00
Loz Calver
2073ac85c2
Merge pull request #8879 from jonom/fix-has-one-file-scaffold
FIX Allow only one file when scaffolding has_one File relationship
2019-03-27 09:16:50 +00:00
Guy Marriott
0f00154563
Merge pull request #8840 from open-sausages/pulls/4.3/has-extension-injectable
ENHANCEMENT: has_extension() should allow injector overrides
2019-03-27 13:23:30 +13:00
Aaron Carlino
9eac374b13 Use strcasecmp 2019-03-27 12:40:56 +13:00
Jonathon Menz
fae19c16b5 FIX has_one File form scaffolding
Only allow selection of a single file when scaffolding has_one File relationship (fixes #8862)
2019-03-26 09:50:59 -07:00
Damian Mooyman
6dc41e50a0
MINOR Linting fixes 2019-03-26 17:35:58 +13:00
Damian Mooyman
83ec0b69fa
BUG Resolve issue where schema changes between enum / non-enum types 2019-03-26 14:16:05 +13:00
Aaron Carlino
f6a7bddd8d Linting 2019-03-20 15:50:54 +13:00
Aaron Carlino
388baa01b4 Fix linting 2019-03-20 13:19:10 +13:00
Aaron Carlino
aa491d9294 Fix tests 2019-03-20 12:33:00 +13:00
Aaron Carlino
39a29fa2f6 ENHANCEMENT: has_extension() should allow injector overrides 2019-03-20 12:33:00 +13:00
Aaron Carlino
075716f80d Update translations 2019-03-19 14:34:33 +13:00
Aaron Carlino
07b32fd7eb Added 4.3.3 changelog 2019-03-19 11:48:59 +13:00
Dan Hensby
a8605b04e0
Merge branch '4.2' into 4.3 2019-03-06 11:04:14 +00:00
Dan Hensby
7e34167ddf
Merge branch '4.1' into 4.2 2019-03-06 11:01:17 +00:00