Maxime Rainville
651d537196
Merge branch '4.2' into 4.3
2019-02-27 12:13:24 +13:00
Maxime Rainville
ed013fcfbb
Merge branch '4.1' into 4.2
2019-02-27 12:12:39 +13:00
Maxime Rainville
ac53f77115
Merge branch '4.0' into 4.1
2019-02-27 12:11:47 +13:00
Maxime Rainville
6ff319a0e1
BUG Implement peer review feedback,
2019-02-27 11:14:47 +13:00
Maxime Rainville
9a59f2f57d
BUG Renable the ability to do dynamic assignment with DBField
2019-02-22 11:08:43 +13:00
Robbie Averill
3e90fdf42f
Merge branch '4.3' into 4
2019-02-19 08:41:05 +07:00
Robbie Averill
ed74549c4f
Merge branch '4.2' into 4.3
2019-02-19 08:39:59 +07:00
Robbie Averill
79e44b42fa
Merge branch '4.1' into 4.2
2019-02-19 08:37:07 +07:00
Robbie Averill
cb7f15a681
Merge branch '4.0' into 4.1
2019-02-19 08:36:41 +07:00
Aaron Carlino
09c539e1c3
Merge branch '4.3' into 4
2019-02-19 12:21:24 +13:00
Maxime Rainville
25bba49923
[SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation
2019-02-19 12:20:24 +13:00
Maxime Rainville
95505db7d6
[SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation
2019-02-12 21:08:09 +13:00
Maxime Rainville
fd90cf6ceb
[SS-2018-021] Fix potential SQL vulnerability in non-scalar value hyrdation
2019-02-12 20:44:17 +13:00
Loz Calver
7c5b73881b
FIX: Prevent null->null being flagged as a value change ( fixes #8774 )
2019-02-06 13:24:18 +13:00
Robbie Averill
d116b9a8d2
Add test for shortcode parsing with querystring and anchor
2019-01-29 13:15:17 +02:00
Maxime Rainville
a589bcb092
Merge pull request #8729 from emteknetnz/bugfix/htmlvalue-getcontent
...
Ensure document is not falsey before attempting to clone it
2019-01-29 09:11:04 +13:00
Robbie Averill
d00c59c383
Fix tests not loading fixtures and loading themes in CWP recipe kitchen sink
2019-01-28 13:34:52 +02:00
Steve Boyd
d28552915d
Add unit test for an invalid HTMLValue
2019-01-25 15:55:03 +13:00
Robbie Averill
d8cd085190
Merge branch '4.3' into 4
2019-01-24 17:14:09 +02:00
Robbie Averill
e087e564e1
Fix tests not loading fixtures and loading themes in CWP recipe kitchen sink
2019-01-24 16:45:38 +02:00
Maxime Rainville
13486ca80e
MINOR Add unit test for Requirements::add_i18n_javascript()
2019-01-16 10:36:53 +13:00
Damian Mooyman
34ac228029
BUG Fix issue with assertListEquals() ignoring field getters
2019-01-11 11:35:11 +13:00
Maxime Rainville
1e01deea39
NEW Make resources dir configurable ( #8519 )
...
* NEW Make resources dir configurable.
* Removing reference to old `resources` and updating doc #8519
* Rrtarget to 4.4 release.
* DOC Reference SS_RESOURCES_DIR in Environment doc.
* API Add a Resources method to SilverStripe\Core\Manifest\Module to read the resources-dir from composer.json
* Clean up reference to SS_RESOURCES_DIR env var
* Set default resources-dir
* Update test to use RESOURCES_DIR const in expected resource url method
* Correcting typos
Co-Authored-By: maxime-rainville <maxime@rainville.me>
* MINOR Correctubg minor typos
* DOCS Document the intricacies of exposing static assets.
2019-01-09 15:35:45 +13:00
Robbie Averill
7c96feef37
Merge branch '4.3' into 4
2019-01-08 12:27:48 +01:00
Robbie Averill
394dd4765c
NEW Scaffolded field labels now only have an uppercased first word
2019-01-07 17:52:28 +01:00
Maxime Rainville
7d1aa44786
Merge pull request #8654 from creative-commoners/pulls/4.3/password-complexity-test-fixes
...
Update tests to pass in CWP kitchen sink context
2018-12-13 16:50:25 +13:00
Robbie Averill
470093de2f
Merge pull request #8650 from sminnee/nested-vendor
...
FIX: Manifest should ignore vendor folders within packages contained in vendor
2018-12-12 19:52:03 +00:00
Robbie Averill
5d7c5ffb07
Merge branch '4.3' into 4
2018-12-06 09:40:40 +00:00
Robbie Averill
08866f89d9
Merge branch '4.2' into 4.3
2018-12-06 09:40:05 +00:00
Robbie Averill
96bd17d469
Merge branch '4.1' into 4.2
2018-12-06 09:38:45 +00:00
Robbie Averill
3f532466d1
Merge branch '4.0' into 4.1
2018-12-06 09:37:52 +00:00
Guy Marriott
6edcbe9086
Merge pull request #8592 from open-sausages/pulls/4.0/tree-multiselect-null
...
FIX TreeMultiselectField passes value 'unchanged' as null to ORM
2018-12-06 14:23:48 +13:00
Robbie Averill
1ac36611a6
Update tests to pass in CWP kitchen sink context
2018-12-02 23:04:34 +00:00
Sam Minnee
0c17ffc944
FIX: Manifest should ignore vendor folders within packages contained in vendor
...
Without this change vendor/silverstripe/framework/vendor/silverstripe/config
will be pick up by the manifest, which is inappropriate.
Although this doesn’t happen often, it can occur if you have run
“composer install” within vendor/silverstripe/framework, which can be
done either accidentally or (in my case) as part of running the
framework tests isolated from the rest of your project (which is closer
to the execution model on Travis)
Note that the presence of the ‘nestedvendor.txt’ file tests that this
works without any explicit changes to the PHP of the tests, since it’s
merely confirming that such a file is *not* picked up.
2018-11-30 13:52:25 +13:00
Serge Latyntcev
4ee63eb4e7
TreeMultiselectFieldTest / make scrutinizer happy
2018-11-29 12:13:56 +13:00
Serge Latyntcev
38f8217f01
TreeMultiselectFieldTest / setUp is protected in PHPUnit5
2018-11-29 09:55:28 +13:00
Loz Calver
3f8551df41
Merge pull request #8462 from sminnee/nondestructive-enum
...
FIX: Make all enums non-destructive, not just ClassName
2018-11-28 16:42:12 +01:00
Robbie Averill
1f1c344272
Merge branch '4.3' into 4
...
# Conflicts:
# tests/php/Forms/ConfirmedPasswordFieldTest.php
2018-11-26 12:15:17 +01:00
Robbie Averill
41dc9229bf
FIX Reverting ExtensionTestState and Extensible extra methods modifications to prevent PHP 5.6 segfault ( #8581 )
...
* API Revert addition of Extensible::flush_extra_methods_cache() and change to ExtensionTestState
This reverts the changes from #8465 and #8505 that relate to ExtensionTestState and the
tracking of extra methods between unit tests. The existing test from #8465 testing
overloaded Extensions after extra_methods are populated has been updated to show that you
must re-add the extension to flush the extra_methods cache if you need this behaviour.
* Revert change to InjectorTest::testExtendedExtensions
* Revert "Add failing test to show that overloaded extensions are broken in Extensible"
This reverts commit 55e79ffdfd
2018-11-26 12:00:02 +13:00
Serge Latyntcev
f526c794fc
Minor / Refactor php tests for TreeMultiselectField
2018-11-23 16:03:44 +13:00
Serge Latyntcev
9ce6d91b76
FIX / TreeMultiselectField::objectForKey handles list of IDs correctly
2018-11-22 12:11:18 +13:00
Maxime Rainville
d74af1c17e
FIX Explicity mark nodes when searching nodes in TreeDropdownField #8621
2018-11-21 11:43:21 +13:00
Serge Latyntcev
80885fc231
ADD php test TreeMultiselectField::testEmptyChoiceReadonly
2018-11-20 16:45:23 +13:00
Robbie Averill
3b1e91eb59
Merge branch '4.2' into 4.3
2018-11-15 13:41:23 +02:00
Robbie Averill
ef0f9dff8a
Merge branch '4.1' into 4.2
2018-11-15 13:41:00 +02:00
Robbie Averill
c6e3a398c7
Merge branch '4.0' into 4.1
2018-11-15 13:40:08 +02:00
Loz Calver
b5bae137bd
FIX: Redirect loop with multiple confirmation tokens present ( fixes #8607 )
2018-11-15 10:59:42 +00:00
Robbie Averill
7d1d6d0f7b
FIX Ensure that tests setting passwords have stubbed configuration
2018-11-14 11:54:17 +02:00
Robbie Averill
0bb94b018b
FIX Remove default password validation rules before running unit tests
2018-11-13 14:09:08 +02:00
Robbie Averill
8854f053c8
Fix rebase conflicts
2018-11-13 11:09:33 +02:00
Robbie Averill
a8853504b4
API API MonologErrorHandler::setLogger is deprecated, use MonologErrorHandler::pushLogger instead
2018-11-13 11:08:27 +02:00
Guy Marriott
b2dd22fb50
Merge pull request #8506 from creative-commoners/pulls/4.3/all-the-unit-tests
...
NEW Adding a stack more unit tests for logging and some form fields
2018-11-11 10:31:24 +13:00
Robbie Averill
bab84f31dc
Remove underscores from variable test class names
2018-11-10 14:55:11 +02:00
Robbie Averill
eba92d77df
Rename CheckboxFieldReadonlyTest for future PSR-2 compatibility
2018-11-10 10:04:17 +02:00
Sam Minnee
a8d3b95175
FIX: Make test work with utf8mb4
2018-11-10 12:10:25 +13:00
Sam Minnee
bd5a815909
FIX: Make all enums non-destructive, not just ClassName
...
This change also renders a portion of DBSchemaManager irrelevant, that
destructively “fixes” old values. This is in keeping with the
non-destructive principle of dev/build, and some suggestions to move
away from enum fields altogether.
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1387
2018-11-10 12:10:25 +13:00
Robbie Averill
0f2eebe5d4
NEW Change to variadic calls in ListDecorator and add unit tests
2018-11-09 13:59:14 +02:00
Loz Calver
bbb208e1dd
Merge pull request #8499 from sminnee/fix-1489
...
FIX: CheckboxSetField can now save into DBMultiEnum
2018-11-09 10:40:55 +01:00
Robbie Averill
24d6527845
Merge branch '4.3' into 4
2018-11-09 11:39:27 +02:00
Robbie Averill
10f502f0c7
Merge branch '4.2' into 4.3
2018-11-09 11:39:05 +02:00
Robbie Averill
5b7723df7f
Merge branch '4.1' into 4.2
...
# Conflicts:
# lang/fi.yml
# lang/nl.yml
2018-11-09 11:38:04 +02:00
Robbie Averill
df4d2bd838
Merge branch '4.0' into 4.1
...
# Conflicts:
# lang/da.yml
# lang/eo.yml
# lang/fi.yml
# lang/it.yml
# lang/nl.yml
# lang/sv.yml
2018-11-09 11:36:34 +02:00
Sam Minnee
5531baa87f
FIX: Introduce readonly transaction test to all database.
...
This should work on MySQL and PDO; let’s test this.
2018-11-09 10:57:26 +13:00
Sam Minnee
2615399535
FIX: Use PDO’s built-in transaction support in MySQLDatabase.
2018-11-09 10:31:19 +13:00
Sam Minnee
0111b98b18
FIX: Ensure that types are preserved fetching from database
...
This ensures that numeric fields appear in PHP as int/float values
rather than strings, which allows the development of more type-safe PHP
code.
This doesn’t work on the legacy mysql driver and this will now throw
a notice-level error. It requires mysqlnd.
2018-11-09 10:31:19 +13:00
Werner M. Krauß
bc0f17fb09
Cleanup Convert
...
* remove unneeded parenthesis and double quotes
* simplify flow / remove unneeded else
2018-11-07 17:45:01 +01:00
Werner M. Krauß
3f321f935a
Convert::memstring2bytes should return integer value
...
bytes are by nature an integer
fixes #8572
2018-11-07 17:01:36 +01:00
Aaron Carlino
76936d863d
Merge branch '4.3' into 4
2018-11-07 23:20:44 +13:00
Loz Calver
11fe5b3adf
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:33:24 +13:00
Loz Calver
8d7c2dafab
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:33:24 +13:00
Loz Calver
02ad0f44aa
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:32:55 +13:00
Loz Calver
af000bea9b
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:32:55 +13:00
Loz Calver
5563537cc8
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:31:33 +13:00
Loz Calver
0610f76da0
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:31:33 +13:00
Loz Calver
0877442c64
Implement ConfirmationTokenChain to handle multiple tokens at once
2018-11-07 11:24:51 +13:00
Loz Calver
3dbb10625c
[SS-2018-019] Add confirmation token to dev/build
2018-11-07 11:24:51 +13:00
Robbie Averill
64c2938c96
Merge branch '4.3' into 4
2018-11-06 11:05:22 +01:00
Robbie Averill
3c58ae009e
Merge branch '4.2' into 4.3
2018-11-06 11:05:08 +01:00
Robbie Averill
22c7fa2bc9
Merge branch '4.1' into 4.2
2018-11-06 11:04:43 +01:00
Robbie Averill
6d2665d687
Merge branch '4.0' into 4.1
2018-11-06 11:04:28 +01:00
Werner M. Krauß
adafd73943
Convert::memstring2bytes should preserve -1
...
fixes #8570
2018-11-06 10:22:13 +01:00
Aaron Carlino
0ba275cb40
Merge branch '4.2' into 4.3
2018-11-06 15:09:01 +13:00
Aaron Carlino
e60cea8561
Merge branch '4.1' into 4.2
2018-11-06 15:08:42 +13:00
Sam Minnee
67fe41d00b
FIX: Ensure that repeated setting/unsetting doesn’t corrode forceChange()
2018-11-05 23:09:24 +13:00
Sam Minnee
5bb2d9484a
FIX: Update “original” DataObject data to be the content of the last write
...
FIX: Compare to original when determining fields changes
This fixes a number of edge-case issues relating to change detection.
Fixes #8443
Fixes #3821
Fixes #4561
2018-11-05 23:09:24 +13:00
Sam Minnee
76255c9fb5
FIX: CheckboxSetField can now save into DBMultiEnum
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1489
2018-11-05 17:40:28 +13:00
Sam Minnee
78ceca6934
MINOR: Add test for defaults on subclasses
...
This was raised in https://github.com/silverstripe/silverstripe-framework/issues/8567
and wasn’t covered by a test.
2018-11-05 16:09:49 +13:00
Luke Edwards
8866e7674a
BUG: Fix duplicate plugins on HTML editor fields ( #8559 )
...
* BUG: Fix duplicate plugins on HTML editor fields
* Add new test
2018-11-02 12:26:53 +13:00
Michael Strong
55f95b7bc8
BUGFIX many many through not sorting by join table ( #8534 )
...
* BUGFIX many many through not sorting by join table
* #8534 added docs to support many many sorting fix
* #8534 added test cases for many_many default sorting
2018-11-01 14:17:15 +13:00
Michael Strong
7086f2ea3a
BUGFIX many many through not sorting by join table ( #8534 )
...
* BUGFIX many many through not sorting by join table
* #8534 added docs to support many many sorting fix
* #8534 added test cases for many_many default sorting
2018-11-01 13:42:27 +13:00
Robbie Averill
b02a6fa02d
FIX Replace usage of Convert JSON methods with json_encode
2018-10-28 21:15:29 +00:00
Sam Minnée
e72fc9e3d0
FIX DataObject singleton creation ( #8516 )
...
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878 )
Correctly applies https://github.com/silverstripe/silverstripe-framework/pull/7850 to the 4.x line
This has already been fixed in 3.x
2018-10-25 11:42:45 +13:00
Robbie Averill
bea4101e21
Add tests for DisabledTransformation, PrintableTransformation and PrintableTransformation_TabSet
2018-10-20 20:06:02 +02:00
Robbie Averill
449b2cf291
Add tests for DefaultFormFactory
2018-10-20 19:47:11 +02:00
Robbie Averill
fd50ce6295
Add more edge case tests for disabled DateFields and DatetimeField
2018-10-20 18:29:07 +02:00
Robbie Averill
97209bc919
Add edge case unit tests for DateField
2018-10-20 18:15:42 +02:00
Robbie Averill
0e2847e289
Add tests for DatalessField
2018-10-20 17:59:55 +02:00
Robbie Averill
c06cf4820e
BUG Readonly and disabled CurrencyFields no longer always returns dollar currency sign, now respect config
2018-10-20 17:47:16 +02:00
Robbie Averill
d56bad7568
Add tests for edge cases in CurrencyField
2018-10-20 17:33:59 +02:00
Robbie Averill
8929b8204f
More validation tests for ConfirmedPasswordField
2018-10-20 17:21:25 +02:00
Robbie Averill
c418ee2915
NEW Add getters and setters for public properties in ConfirmPasswordField, add tests
...
Some of the validation parts of ConfirmPasswordField are previously untested, this adds tests
2018-10-20 16:43:49 +02:00
Robbie Averill
60b375d995
Add more tests for CheckboxField_Readonly and CompositeField, improve PHPDocs
2018-10-20 15:44:23 +02:00
Robbie Averill
3cdb73bd44
NEW Add getLogger() to MonologErrorHandler and add test for exception without one
2018-10-20 15:00:08 +02:00
Robbie Averill
5bd05a2deb
Reduce setUp visibility and remove check for CLI - tests always run on CLI now
2018-10-20 14:51:53 +02:00
Robbie Averill
2694a47c45
Add more tests for DetailedErrorFormatter
2018-10-20 14:41:45 +02:00
Robbie Averill
e211e27470
Add more unit tests for DebugViewFriendlyErrorFormatter, tidy up Director::is_ajax() return
2018-10-20 14:27:57 +02:00
Robbie Averill
c18e9b1298
Merge pull request #8439 from sminnee/consistent-limit
...
FIX: Make ArrayList::limit() consistent with DataList::limit()
2018-10-16 12:05:11 +02:00
Aaron Carlino
7d201309ad
Merge branch '4.2' into 4
2018-10-15 13:42:55 +13:00
Robbie Averill
7215637673
Merge pull request #8460 from open-sausages/pulls/4/lazy-loadable-gidfield
...
API Add a new GridFieldLazyLoader component
2018-10-11 13:43:10 +02:00
Robbie Averill
46c50577a4
Expect BEM class names in tests, fix PSR-2 line lengths, add ArrayList import
2018-10-11 12:04:23 +02:00
Sam Minnee
4740346ed8
FIX: Make ArrayList::limit() consistent with DataList::limit()
...
This makes it easier to swap one fo the other without code breaking.
Since it’s strictly a removed API, I’ve opted to throw a deprecation
note in SS4 rather than throwing an InvalidArgumentException.
Fixes #2949
2018-10-11 21:05:20 +13:00
Maxime Rainville
250d925810
MINOR Update CompositeField::__construct to call setChildren #8460
2018-10-11 15:25:34 +13:00
Maxime Rainville
2e2ca5a4a7
Make sure LazyLoader still woks after a readonly transofrmation ( #8460 )
2018-10-11 11:56:39 +13:00
Robbie Averill
56d5621934
FIX Flush extra_methods statics between test runs
2018-10-09 13:22:54 +02:00
Robbie Averill
55e79ffdfd
Add failing test to show that overloaded extensions are broken in Extensible
2018-10-09 12:35:32 +02:00
Maxime Rainville
fdb53311ba
Fix linting issue.
2018-10-09 17:32:42 +13:00
Maxime Rainville
a13a2cdd40
Add unit test for FieldList::getContainerField()
2018-10-09 17:32:42 +13:00
Maxime Rainville
51ba787ffb
Finish writting unit test for GridFieldLazyLoader.
2018-10-09 17:32:42 +13:00
Loz Calver
e829ad78b1
Merge pull request #8429 from sminnee/fix-2950
...
FIX: Throw deprecation on limit=0
2018-10-08 15:11:52 +02:00
Maxime Rainville
36b1066413
Merge pull request #8451 from creative-commoners/pulls/4.3/memory-cache-findtemplate
...
NEW Add memory cache to ThemeResourceLoader::findTemplate()
2018-10-08 10:38:07 +13:00
Sam Minnee
8c7459a708
FIX: Fix CompositeField test that relied on a DropdownField bug
...
A DropdownField without a source no longer returns a validation
error.
2018-10-06 19:14:34 +13:00
Sam Minnee
e5d3b28a4d
FIX: Don’t break validation on selects without a source.
...
Fixes cases where there are no valid values or an empty-string
value is manually added rather than using setEmptyString()
Fixes #4849
Fixes #7159
2018-10-06 11:53:17 +13:00
Sam Minnée
7915fe0c0f
Merge pull request #8303 from hchokshi/pulls/4.2/viewable-data-customised-isset
...
Implement __isset for ViewableData_Customised
2018-10-06 09:37:19 +13:00
Robbie Averill
98568262f2
Fixed phpcs violations
2018-10-05 16:07:33 +02:00
Robbie Averill
da9301f241
Use SilverStripe cache API instead of memory cache, add tests and fix cache config indentation
2018-10-05 14:58:48 +02:00
Robbie Averill
172d8915b7
Clear cache between ThemeResourceLoader tests
2018-10-05 14:12:26 +02:00
Sam Minnee
0fc06e51e5
FIX: Drop seconds from DBDatetime::Nice() to restore SS3 behaviour.
...
Note that the medium date format depends on locale, with en_NZ being
resolutely numeric. I’ve updated the test to verify a couple of locales
to make this more obvious.
Fixes #8121
2018-10-04 14:51:24 +13:00
Sam Minnee
638e6ec281
FIX: Throw deprecation notice on limit=0
...
The SS4 behaviour of limit=0 is unlikely to be the SS5 behaviour.
To clear the limit limit=null is recommended.
In addition, there’s a bit tighter type maintenance in the internal
limit data (ensure things are int).
Fixes #2950 .
2018-10-04 10:38:15 +13:00
Robbie Averill
ee24413c30
Merge branch '4.2' into 4
2018-10-03 15:28:05 +02:00
Robbie Averill
b0871ebd75
Merge pull request #8417 from creative-commoners/pulls/4.3/many-many-through-sorting-tests
...
Add more list sorting tests and fix many many through sorting
2018-10-03 13:30:20 +02:00
Robbie Averill
d1f30a20c2
Merge pull request #8408 from dhensby/pulls/4/test-cleanup
...
Test cleanup
2018-10-03 13:28:59 +02:00
Robbie Averill
d74fed554a
Merge pull request #8427 from sminnee/fix-1397
...
FIX: Append any fields that don’t match name in insertBefore/insertAfter
2018-10-03 13:22:23 +02:00
Guy Marriott
5970fc2417
FIX Moving test to correct director
2018-10-03 10:47:17 +13:00
Robbie Averill
c8e7672ede
Merge pull request #8414 from creative-commoners/pulls/4/searching-for-a-name-conflict
...
FIX Avoid having search fields with the same names as form elements
2018-10-02 13:43:59 +02:00
Sam Minnee
71dad5f685
FIX: Append any fields that don’t match name in insertBefore/insertAfter
...
Previous behaviour was to return false, which has been described as
a confusing bug on https://github.com/silverstripe/silverstripe-framework/issues/1397
where the issue was identified.
2018-10-02 10:39:48 +13:00
Robbie Averill
bfe2a7b7e6
Update testSearchFieldSchema to expect namespaced search fields
2018-10-01 12:44:19 +02:00
Harsh Chokshi
60dd5f288b
Implement __isset for ViewableData_Customised
...
Resolves #8302 .
2018-10-01 09:40:12 +13:00
Dan Hensby
3584598d7a
Minor improvements
2018-09-29 22:51:26 +01:00
Dan Hensby
b0e0566c93
Formatting
2018-09-29 22:51:26 +01:00
Dan Hensby
5a3cc9503b
Formatting
2018-09-29 22:51:26 +01:00
Dan Hensby
2ef63ddbc1
Remove unused function args
2018-09-29 22:51:26 +01:00
Dan Hensby
7a18cd98e0
Improve assertion type
2018-09-29 22:51:26 +01:00
Dan Hensby
90e74a608e
Throwing and catcing an error in tests is mad
2018-09-29 22:51:26 +01:00
Dan Hensby
3c532cea0c
Minor cleanup of DirectorTest
2018-09-29 22:51:26 +01:00
Dan Hensby
3a007d52e6
Code formatting
2018-09-29 22:51:18 +01:00
Robbie Averill
231d6d9a9f
FIX New members now receive the configured default locale, not the current locale
2018-09-28 16:25:10 +02:00
Robbie Averill
d18b8eb9fb
Add more tests for descending sort orders
2018-09-28 15:42:45 +02:00
Robbie Averill
4aa7fb70ee
Add tests that show that joinClass default_sort is not used and order is honoured
2018-09-28 15:38:37 +02:00
Robbie Averill
f842ee2eec
Update deprecation PHPDocs to be PSR-5 compliant
...
See: https://github.com/php-fig/fig-standards/blob/master/proposed/phpdoc-tags.md#55-deprecated
2018-09-28 10:49:14 +02:00
Robbie Averill
0c7ced1513
Refactor sorting tests to use a dataprovider
2018-09-27 17:18:19 +02:00
Robbie Averill
c7d522ff6d
Add tests for sorting HasManyList
2018-09-27 17:09:24 +02:00
Robbie Averill
3321c6b39d
Add tests for sorting many many through list without a table alias
2018-09-27 14:34:37 +02:00
Dan Hensby
b3d2d4c1b1
Remove redundant code
2018-09-26 10:11:28 +01:00
Dan Hensby
db43d57618
Remove commented out test
2018-09-26 10:11:28 +01:00
Dan Hensby
fe5b431200
Use Member::actAs rather than setting and unsetting member
2018-09-26 10:11:20 +01:00
Dan Hensby
6b618b44c9
Remove regex in favour of simple assertContains
2018-09-26 00:36:58 +01:00
Dan Hensby
cb361e8caf
Remove unused code from ControllerTest
2018-09-26 00:30:20 +01:00
Dan Hensby
15bf13daa9
Dont use willReturn assertions to assert argument types
2018-09-26 00:21:37 +01:00
Dan Hensby
7d15d0af70
Refactor email validation into provider based test
2018-09-25 23:15:18 +01:00
Sam Minnée
5b7a84141b
NEW: Add Hierarchy::prepopulate_numchildren_cache() ( #8380 )
...
* NEW: Add Hierarchy::prepopulate_numchildren_cache()
API: Hierarchy::stageChildren() customisations must be applied to the base class and not include record-specific behaviour.
Adds the ability to prepopulate the cache for Hierarchy::numChildren()
in a batch.
Note that this optimisation means that stageChildren() is not called on
each record in order to calculate numChildren(). This means that the
structure of the stageChildren() query must be the same for all records
and the behaviour cannot be customised only for a subclass of the base
data class. For example, apply your customisations to SiteTree and not
a subclass.
This is an useful part of optimising the query count on tree generation.
See https://github.com/silverstripe/silverstripe-framework/issues/8379
* NEW: Add Hierarchy::prepopulateTreeDataCache()
This provides a more extensible way of preopulating caches for optimised
tree generation.
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8391
2018-09-25 12:25:23 +12:00
Robbie Averill
d11911d4dd
Merge pull request #8394 from littlegiant/pulls/4.2/http-status-codes
...
BUG Prevent error on valid response status codes
2018-09-21 13:19:29 +02:00
Damian Mooyman
1d5ecd342e
BUG Prevent error on valid response status codes
2018-09-21 14:54:26 +12:00
Luke Edwards
3fc49dd4ce
Lint fixes and allow a few other components by default
2018-09-20 13:32:52 +12:00
Maxime Rainville
cc22024e9a
ADD New search component for GridFields ( #1777 )
2018-09-04 11:35:17 +12:00
Simon Gow
4c3a068859
Issue 3357 - Add GridField Readonly Transformation
...
GridField doesn't have a valid readonly state if it's value is set to an Object
without `forTemplate()`. The default behaviour is to render a ReadonlyField,
but given GridField is a complex type this isn't suitable.
This bugfix provides a transformation method to render only components that are
whitelisted to provide a readonly state.
@see #3357 - https://github.com/silverstripe/silverstripe-framework/issues/3357
2018-08-29 14:47:06 +12:00
Robbie Averill
83e461abbf
Merge branch '4.2' into 4
2018-08-27 16:15:57 +12:00
Luke Edwards
6164d01d65
FIX GridField delete button to offer archive action if possible ( #8325 )
...
* FIX GridField delete button to offer archive action if possible
* Refactor archive action to versioned module
* Fix GridFieldDeleteAction test
2018-08-24 13:13:32 +12:00
Robbie Averill
dbab696690
FIX Message when changing password with invalid token now contains correct links to login
...
The Security controller should be used to return these links rather than the
ChangePasswordHandler
2018-08-20 22:30:12 +12:00
Daniel Hensby
d9154bffbf
FIX text/json is not a valid mimetype
2018-08-15 12:10:39 +01:00
Daniel Hensby
d0598c02c5
Merge branch '4.2' into 4
2018-07-30 11:07:15 +01:00
Daniel Hensby
ec5640cbd9
Merge tag '4.2.0' into 4.2
...
Release 4.2.0
2018-07-30 11:04:57 +01:00
Ingo Schommer
d12c2fe631
Properly deprecate HTTP.cache_control
2018-07-23 19:09:11 +01:00
Ingo Schommer
d426ecbb89
Add $maxAge arg for caching API
...
See https://github.com/silverstripe/silverstripe-framework/issues/8272
2018-07-23 19:09:10 +01:00
Daniel Hensby
cc0320b2a7
Merge branch '4.2' into 4
2018-07-23 17:42:43 +01:00
Daniel Hensby
ccbbcd45a2
FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important
2018-07-23 14:15:24 +01:00
Daniel Hensby
6e1c7c2781
FIX remove personal information from password reset confirmation screen
2018-07-23 14:13:52 +01:00
Maxime Rainville
c77042aa8b
Fix linting.
2018-07-23 14:12:44 +01:00
Maxime Rainville
7fda52b2cd
Add a MERGE_AS_SUBMITTED_VALUE flag for Form::loadDataFrom
2018-07-23 14:12:43 +01:00
Maxime Rainville
3fa2c056d7
FIX Don't reload form session data using FormField::setSubmittedValue ( #8056 )
2018-07-23 14:12:43 +01:00
Ingo Schommer
73026292bf
Test coverage for session data change
2018-07-23 14:09:43 +01:00
Daniel Hensby
e37b3b95f4
FIX updateValidatePassword calls need to be masked from backtraces
2018-07-23 14:08:26 +01:00
Daniel Hensby
540c9aba69
TEST Add tests for (im)mutablity of states
2018-07-23 14:07:11 +01:00
Damian Mooyman
8ea3bb36a0
Maybe fix it?
2018-07-23 14:01:21 +01:00
Daniel Hensby
b984959170
Merge branch '4.1' into 4.2
2018-07-23 13:30:49 +01:00
Ingo Schommer
c541283093
Test coverage for session data change
2018-07-20 15:13:26 +12:00
Daniel Hensby
921b98112e
Merge pull request #8262 from open-sausages/pulls/4/falsifying-tab-evidence
...
MINOR removeField(s)FromTab no longer creates a tab if it doesn't exist
2018-07-16 17:26:41 +01:00
Loz Calver
b317bf163c
Merge pull request #8213 from creative-commoners/pulls/4.2/falsy-forms
...
FIX FormField::Link works when no form is currently set
2018-07-16 13:53:58 +01:00
Robbie Averill
b93e94c0c3
FIX FormField::Link now throws a LogicException if no form is set yet
2018-07-16 13:02:58 +01:00
Daniel Hensby
1a634f5ba6
Merge pull request #8244 from altwohill/column-not-distinct
...
Make column query not distinct
2018-07-16 13:01:32 +01:00
Al Twohill
3292a8b773
NEW Add columnUnique API SS_List classes.
2018-07-16 12:16:17 +01:00
Al Twohill
91068c23b5
FIX Make column query not distinct
...
When selecting a column, it doesn't make sense to have it distinct.
As an alternative, the API could be changed to give the end user the option
(eg `->column($field, $distinct = false)`)
However if we did that, we would need to make sure we do something
similar with `SilverStripe\ORM\UnsavedRelationList` to ensure consistency.
2018-07-16 11:38:41 +01:00
Damian Mooyman
c6952b46c4
Merge pull request #8245 from dhensby/pulls/4.2/http-cache-fixes
...
HTTPCacheControlMiddleware fixes
2018-07-16 13:13:12 +12:00
Luke Edwards
c8b338b0a3
Add findTab test
2018-07-16 11:59:08 +12:00
Daniel Hensby
8703839eb1
FIX updateValidatePassword calls need to be masked from backtraces
2018-07-15 01:06:45 +01:00
Daniel Hensby
ac5c3416a4
Merge branch '4.2' into 4
2018-07-13 17:06:51 +01:00
Daniel Hensby
bd2abc7a12
Merge branch '4.1' into 4.2
2018-07-13 16:44:23 +01:00
Daniel Hensby
ec9281ee02
Merge branch '4.0' into 4.1
2018-07-13 16:42:00 +01:00
Daniel Hensby
4acec33562
FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important
2018-07-12 00:55:39 +01:00
Daniel Hensby
28f2ceac6f
TEST Add tests for (im)mutablity of states
2018-07-10 16:58:08 +01:00
Harsh Chokshi
6af736a9e1
Change DBCurrency scaffolded form field to CurrencyField ( fixes #8246 )
...
Add test ensuring DBCurrency scaffolds CurrencyField
2018-07-09 10:57:01 +12:00
Daniel Hensby
560fe9820a
FIX remove personal information from password reset confirmation screen
2018-07-05 14:19:15 +12:00
Robbie Averill
a39a221c4c
Merge branch '4.2' into 4
2018-06-25 13:45:03 +12:00
Damian Mooyman
6da72d686f
Maybe fix it?
2018-06-20 14:46:50 +12:00
Robbie Averill
7d90a14f37
NEW Shift Embeddable and EmbedResource from asset-admin, lazy load Embed to allow injected dependencies ( #8194 )
2018-06-20 11:40:28 +12:00
Robbie Averill
12cc2c68a5
Merge pull request #8023 from silverstripe-terraformers/feature/lookup_field_set_value_fix
...
LookupField value handling corrected
2018-06-19 21:37:36 +12:00
Damian Mooyman
cfc3b851e7
Merge remote-tracking branch 'origin/4.1' into 4.2
...
# Conflicts:
# lang/sv.yml
2018-06-19 17:20:25 +12:00
Maxime Rainville
3f80e2dc67
FIX Don't reload form session data using FormField::setSubmittedValue… ( #8184 )
2018-06-19 11:27:09 +12:00
Robbie Averill
5fa5abf295
Merge branch '4.1' into 4
...
# Conflicts:
# src/Forms/DateField.php
2018-06-15 11:52:07 +12:00
Damian Mooyman
b636587945
Respect semver and add tests
2018-06-15 11:04:12 +12:00
Damian Mooyman
c414388220
FIX DatetimeFieldTest
2018-06-14 18:14:12 +12:00
Ingo Schommer
1c5876acf0
Merge pull request #8179 from open-sausages/pulls/4/safer-test-clear
...
BUG Make regression in #7839 safer
2018-06-14 17:28:13 +12:00
Damian Mooyman
d52c4dd602
BUG Make regression in #7839 safer
2018-06-14 16:45:09 +12:00
Damian Mooyman
c271a43904
Linting fixes
2018-06-14 12:19:55 +12:00
Damian Mooyman
163f1523e9
Add upgrade rule for HTTPCacheControl
2018-06-14 11:55:05 +12:00
Damian Mooyman
59ba208df0
Fix HTTPTest
2018-06-14 11:46:28 +12:00
Damian Mooyman
687d0a6af1
Refactor everything out of HTTP and into separate middlewares
2018-06-13 17:56:47 +12:00
Damian Mooyman
6f32762268
Fix unit tests
2018-06-13 14:09:31 +12:00
Damian Mooyman
aa1ba0ef90
Fix inverted condition
...
Remove unnecessary yml block
Deprecate HTTP::set_cache_age()
2018-06-13 13:56:47 +12:00
Daniel Hensby
e76cf93514
Migrate tests
2018-06-13 11:33:46 +12:00
Damian Mooyman
6c985c4e5f
Merge remote-tracking branch 'origin/4.1' into 4
2018-06-13 11:25:20 +12:00
Daniel Hensby
ce58890baf
Merge branch '4.0' into 4.1
2018-06-11 09:27:42 +01:00
Robbie Averill
27e24a4728
Merge pull request #8142 from open-sausages/pulls/4.0/fix-injector-empty
...
BUG Safely handle empty injector factory responses
2018-06-11 15:20:24 +12:00
Damian Mooyman
77a45c0dbc
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# src/Forms/HTMLEditor/HTMLEditorSanitiser.php
# src/ORM/DataObjectSchema.php
# src/ORM/Queries/SQLSelect.php
# src/View/Parsers/ShortcodeParser.php
2018-06-11 10:19:04 +12:00
Damian Mooyman
546c6c3e22
Merge pull request #8125 from open-sausages/pulls/4/date-field-tweaks
...
Remove legacy logic from DateField_Disabled
2018-06-11 09:23:33 +12:00
Daniel Hensby
e260319823
Merge branch '4.0' into 4.1
2018-06-08 23:05:24 +01:00
Daniel Hensby
cfe93b7f23
Merge branch '3.6' into 4.0
2018-06-08 14:41:04 +01:00
Daniel Hensby
1d6d601050
Use chaining syntax for setting up middleware
2018-06-08 14:00:59 +01:00
Maxime Rainville
582c69d32f
BUG Fix issue with Disabled DateField always display (not set).
2018-06-08 13:51:22 +01:00
Ingo Schommer
48304fd6f0
Merge pull request #8102 from creative-commoners/pulls/4.1/response-assertion
...
Add test assertion for response instance
2018-06-08 14:08:25 +12:00
Damian Mooyman
e37e3e1746
BUG Fix test that relies on implicit ID order breaking postgres
2018-06-08 11:23:24 +12:00
Aaron Carlino
31ad3cdaab
BUGFIX: Allow buttons to opt out of display ( #8113 )
...
* Allow buttons to opt out of display
* Linting
* Remove redundant function call
* Add test for group delete action
* Add menu group check and test for delete action
* Fix linting
2018-06-06 21:14:29 +12:00
Damian Mooyman
c070e989c4
BUG Safely handle empty injector factory responses
...
Fixes issue with ImageBackendFactory returning null and breaking injector
2018-06-06 16:45:16 +12:00
Damian Mooyman
0aa13da0d9
BUG Backport bugfix for belongs_many_many with many_many through.
...
Partial backport of #7928
Fixes #8131
2018-06-06 09:43:04 +12:00
Daniel Hensby
0bec6e07dc
Merge pull request #8111 from open-sausages/pulls/4/7.2-is-just-out-of-each
...
BUGFIX: Refactor difflib to not use each()
2018-06-04 12:47:59 +01:00
Robbie Averill
8064ed8220
FIX Minor updates to unit tests to pass with HTML5 parser and various themes
2018-06-01 17:47:03 +12:00
Maxime Rainville
adb64c074a
✅ Making our diff unit test a bit more forgiving of spaces.
...
#8053
2018-06-01 13:02:49 +12:00
Maxime Rainville
33b14e7ec2
✅ Test updated no-each logic
...
Added a test that trigger the DiffEngine::diag. This test when run against the
old `each` loop under PHP 7.2 triggers a deprecated warning.
#8053
2018-06-01 11:16:03 +12:00
Damian Mooyman
2510935b53
Merge pull request #8065 from dhensby/pulls/4/mmtl-jointable
...
NEW Add getJoinTable to MMTL
2018-06-01 10:33:46 +12:00
Robbie Averill
e0993043f8
Merge branch '4.1' into 4
2018-05-30 15:08:39 +12:00
Robbie Averill
c8b0bc0ad7
Merge branch '4.0' into 4.1
...
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
7a8a24d175
Reset force SSL domain/patterns in setup to prevent global state pollution
2018-05-29 17:34:22 +12:00
Robbie Averill
063d765e94
Add test assertion for response instance
...
This prevents middlewares that return null (like the example delegate in this test) from killing a testsuite
2018-05-29 17:26:29 +12:00
Luke Edwards
385e9e105c
Create GridField Actions Menu component ( #8083 )
...
* WIP GridField action menu work, the gist of the idea is using a new gridfield component
* Add delete action to actions menu
* Actions are added automatically to action menu (allows for extension)
* Add test and minor changes
* Add docs and minor changes
* Refactor ActionMenuItem into distinct types, general ActionMenu cleanup
* Add icons and fix title
* Pass columnName, so it can be used by components
* Update test to open and find action menu buttons
* Add section in changelog upgrade section for GridField_ActionMenu
2018-05-29 16:10:52 +12:00
Robbie Averill
c3e5ab2258
Merge pull request #65 from silverstripe-security/pulls/4.2/ss-2018-009
...
[SS-2018-009] Allow forced redirects to HTTPS for responses with basic authentication
2018-05-28 18:57:38 +12:00
Robbie Averill
ea16e28aa7
Merge branch '4.1' into 4
2018-05-28 18:33:56 +12:00
Robbie Averill
6d98a912c9
Merge branch 'heads/4.1.1' into 4.1
2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Robbie Averill
e7e32d13a3
FIX Add namespace and encryptor to tests that expect blowfish to be available
2018-05-24 11:24:56 +12:00
Daniel Hensby
1a57c7c1d0
NEW Add getJoinTable to MMTL
2018-05-14 11:19:24 +01:00
Aaron Carlino
f847f186b1
[ss-2018-013] Remove password text from session data on failed submission
2018-05-14 17:14:38 +12:00
Robbie Averill
5887201dd5
Merge pull request #64 from silverstripe-security/pulls/4.0/ss-2018-010
...
[SS-2018-010] Fix regression of SS-2017-002
2018-05-14 17:12:45 +12:00
Robbie Averill
beec0c0d47
[SS-2018-010] Fix regression of SS-2017-002
2018-05-14 17:12:07 +12:00
Robbie Averill
1e6790bfb6
Merge pull request #62 from silverstripe-security/pulls/4.0/ss-2018-001
...
[ss-2018-001] Restrict non-admins from being assigned to admin groups
2018-05-14 17:11:03 +12:00
Damian Mooyman
e409d6f673
[ss-2018-001] Restrict non-admins from being assigned to admin groups
2018-05-14 17:10:22 +12:00
Robbie Averill
39b62e5fbb
Merge pull request #61 from silverstripe-security/pulls/4.0/ss-2018-008
...
[ss-2018-008] Validate against malformed urls
2018-05-14 17:07:09 +12:00
Damian Mooyman
9053014a7e
[ss-2018-008] Validate against malformed urls
2018-05-14 17:06:47 +12:00
Robbie Averill
6f50728b18
Merge pull request #59 from silverstripe-security/pulls/4.0/ss-2018-006
...
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:06:04 +12:00
Damian Mooyman
2e13ae746f
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:05:31 +12:00
Damian Mooyman
d935140a95
[ss-2018-005] Prevent unauthenticated isDev / isTest being allowed
2018-05-14 17:03:39 +12:00
Daniel Hensby
80bf0fc487
FIX bad syntax
2018-05-02 11:43:12 +01:00
Daniel Hensby
d5e2d3fa67
Merge branch '3.6' into 4.0
2018-05-01 21:47:17 +01:00
Robbie Averill
30e2d9c4df
[SS-2018-009] Allow forced redirects to HTTPS for responses with basic authentication
2018-04-24 14:44:29 +12:00
Mojmir Fendek
07372d388e
LookupField value handling corrected (atomic values are no longer thrown away).
2018-04-23 15:15:40 +12:00
UndefinedOffset
fe4b90edc0
FIX: Duplicating many_many relationships looses the extra fields in 4.0
2018-04-18 11:49:20 -03:00
Damian Mooyman
9a12fac218
BUG Prevent password validator min score producing false negatives
...
Replaces #7995
2018-04-18 10:35:31 +12:00
Robbie Averill
af2c3886b9
Merge branch '4.1' into 4
2018-04-10 16:27:00 +12:00
Will Rossiter
09cc75a656
MINOR Add visiblity to SelectionGroup test functions
2018-04-05 10:33:27 +12:00
Will Rossiter
2512761587
Fix invalid markup in SelectionGroup selected values
2018-04-05 10:16:25 +12:00
Ingo Schommer
983a724ea5
Merge pull request #7399 from dhensby/pulls/4/reduce-dependence-on-session-for-reading-mode
...
Reduce dependence on session state for accessing draft stages
2018-03-23 16:19:26 +13:00
Damian Mooyman
df9e0e40d3
Deprecate useDraftStage
2018-03-22 17:23:50 +13:00
Damian Mooyman
257ff69e32
API Implement many_many through polymorphic (from only) ( #7928 )
...
* API Support many_many through polymorphic relations (from side only)
Fixes #7911
Fixes #3136
* Add extra docs and allow optional arguments
* ENHANCEMENT Enable quiet to be turned off
* BUG Fix issue with manymanythroughlist duplication
2018-03-22 10:26:25 +13:00
Damian Mooyman
8b9c292509
Merge remote-tracking branch 'origin/4.1' into 4
2018-03-13 14:26:39 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Damian Mooyman
3a1c813b28
API Add getContentCSS() / setContentCSS() to allow per-config customisation of content_css
...
Fixes #7873
2018-03-05 16:10:44 +13:00
Roman Schmid
40c2e299a0
Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for DBText::ContextSummary.
...
Add unit-test to cover that case.
2018-03-01 11:39:30 +01:00
Daniel Hensby
9006daf20b
Cleaning up PR and adding tests
2018-02-28 13:31:56 +00:00
Aaron Carlino
0863bac29a
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-27 09:52:36 +13:00
Daniel Hensby
722f2d178a
Merge branch '4.1' into 4
2018-02-26 10:57:52 +00:00
Aaron Carlino
d91648dd6e
Update getVariables to return a copy of globals rather than including the reference in an array merge
2018-02-23 16:25:41 +13:00
Daniel Hensby
ced2ba1f64
API Move CSV writing/reading to league/csv library
2018-02-22 09:22:37 +13:00
Daniel Hensby
dace2f179d
Merge branch '4.1' into 4
2018-02-21 13:58:45 +00:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1
2018-02-21 13:40:30 +00:00
Damian Mooyman
0e26c06644
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 12:20:18 +13:00
Damian Mooyman
12e701c8ed
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-15 09:28:14 +13:00
Damian Mooyman
34233c0470
Update reference to TestAssetStore
2018-02-14 16:24:12 +13:00
Damian Mooyman
0b7cf80331
BUG Fix incorrect convert slashes argument
2018-02-13 16:33:35 +13:00
Daniel Hensby
16d3498a56
Merge branch '4.1' into 4
2018-02-12 10:26:07 +00:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1
2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0
2018-02-09 14:32:58 +00:00
Chris Joe
95308e1af6
Merge pull request #7849 from open-sausages/pulls/4.0/fix-debug-string-class-cli
...
BUG Fix issue with CLIDebugView failing on class name of existing class
2018-02-09 15:41:18 +13:00
Daniel Hensby
d3278d5470
FIX Add Nested DB transaction support ( #7848 )
...
* TEST Prove nested transactions break
* Add nested transaction support
2018-02-09 10:28:32 +13:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class
...
Fixes #7827
2018-02-09 09:52:32 +13:00
Robbie Averill
dd82820242
NEW Allow GridFieldConfig::addComponents to accept an array ( #7844 )
2018-02-08 11:06:27 +13:00
Andrew Aitken-Fincham
860fa2a05a
API Add excludeAny() and tests for complicated excludes/filters ( #7838 )
2018-02-08 09:20:17 +13:00
Damian Mooyman
2f1f5c0caa
Merge remote-tracking branch 'origin/4.0' into 4
2018-02-07 11:48:46 +13:00
Daniel Hensby
660dfd34a8
FIX Issue where default admin has no password encryption
2018-02-06 20:18:32 +00:00
Daniel Hensby
62057befdb
Merge branch '4.0' into 4
2018-02-06 10:08:17 +00:00
Daniel Hensby
28ca11dd7e
FIX Regex range identifier correctly escaped
2018-02-05 15:17:20 +00:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/CoreKernel.php
2018-02-05 17:52:38 +13:00
