115 Commits

Author	SHA1	Message	Date
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
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	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
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
Damian Mooyman	e37e3e1746	BUG Fix test that relies on implicit ID order breaking postgres	2018-06-08 11:23:24 +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
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
Daniel Hensby	1a57c7c1d0	NEW Add getJoinTable to MMTL	2018-05-14 11:19:24 +01: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	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
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
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	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
Andrew Aitken-Fincham	860fa2a05a	API Add excludeAny() and tests for complicated excludes/filters (#7838)	2018-02-08 09:20:17 +13:00
Damian Mooyman	db9aa2c5c7	BUG Fix regression in has_one getters breaking DataDifferencer	2018-02-05 16:16:07 +13:00
Damian Mooyman	aa2c71424d	API Implement cascade_duplications ... API Add DataObject::setComponent() API Support unary components as getter and setter fields API ManyManyList::add() now supports unsaved records ENHANCEMENT Animal farm	2018-02-05 12:04:57 +13:00
Damian Mooyman	76d2db12b0	Merge pull request #7794 from kinglozzer/id-like-to-place-an-ordinal ... NEW: Add support for ordinals in DBDate::Format()	2018-01-26 09:27:46 +13:00
Loz Calver	fcf5022550	NEW: Add support for ordinals in DBDate::Format()	2018-01-25 09:41:06 +00:00
Damian Mooyman	bca47029c4	Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # src/Control/SimpleResourceURLGenerator.php # tests/php/Control/SimpleResourceURLGeneratorTest.php	2018-01-25 12:53:15 +13:00
Roman Schmid	6fafce766e	Fixed Rfc3339 implementation of Date and Datetime	2018-01-24 16:58:12 +01:00
Damian Mooyman	a3c52f901a	Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # src/Core/TempFolder.php # src/ORM/DataObject.php # src/View/ThemeResourceLoader.php # src/includes/constants.php # tests/php/Control/SimpleResourceURLGeneratorTest.php # tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php # tests/php/View/RequirementsTest.php	2018-01-22 14:57:05 +13:00
Daniel Hensby	db610aaf3b	Fixing string concat CS issues	2018-01-16 18:39:30 +00:00
Daniel Hensby	ebeaf3e40d	Merge branch '3' into 4	2018-01-16 11:47:39 +00:00
Daniel Hensby	e4bf9a31ed	Merge branch '4.0' into 4	2017-12-14 21:20:11 +00: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	6b384f4b35	Merge branch '4.0' into 4	2017-12-07 13:52:00 +13:00
Loz Calver	91bd92df31	FIX: Remove some unnecessary ClassInfo calls in DataObjectSchema	2017-12-05 12:23:10 +00:00
Daniel Hensby	6d5cbe0a0e	Merge branch '4.0' into 4	2017-11-25 17:19:31 +00:00
Daniel Hensby	07a0f75426	Merge branch '3.6' into 4.0	2017-11-25 16:56:50 +00:00
Daniel Hensby	333ecc201c	Merge pull request #7583 from open-sausages/pulls/4/relation-object-navigation ... BUG Ensure relObject() safely bails on empty objects	2017-11-23 12:48:57 +00:00
Christopher Joe	2b6b877327	Merge branch '4.0' of https://github.com/silverstripe/silverstripe-framework into 4	2017-11-21 15:08:30 +13:00
Chris Joe	d8ca223e15	Merge pull request #7605 from open-sausages/pulls/4.0/fix-enum-defaults ... BUG Fix DBEnum ignoring empty defaults	2017-11-20 11:32:45 +13:00
Damian Mooyman	cbf9e40115	BUG Fix postgres / PDO support	2017-11-17 12:35:55 +13:00
Damian Mooyman	ef58799103	BUG Fix DBEnum ignoring empty defaults ... FIxes #7582	2017-11-17 12:35:39 +13:00
Christopher Joe	2bc7edbf47	BUG Fix don't treat zero-date as invalid	2017-11-16 13:30:15 +13:00
Damian Mooyman	eae3d0cfaa	Merge remote-tracking branch 'origin/4.0' into 4	2017-11-16 10:16:44 +13:00
Chris Joe	bee3c404fa	Merge pull request #7545 from open-sausages/pulls/4.0/deprecated-each ... BUG Remove usage of deprecated each() and use a helper method instead	2017-11-15 16:30:20 +13:00
Damian Mooyman	f863573d1c	API Add getShortName to DBClassName ... Fixes #7586	2017-11-15 11:27:58 +13:00
Damian Mooyman	ba2c5b48f7	BUG Ensure relObject() safely bails on empty objects ... BUG Remove assignment of IDs to singletons API relation methods can take an optional $id parameter to get relations from specific parents API Added UnsavedRelationList::relation() method	2017-11-10 15:27:02 +13:00
Sam Minnee	d8b4ca91d9	FIX: Fix ContextSummary behaviour with UTF8 chars ... Fixes https://github.com/silverstripe/silverstripe-framework/issues/1396 Ensure that DBTextTest has UTF8 test cases	2017-11-06 12:09:08 +13:00