19920 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	4e5a664183	Merge pull request #7865 from open-sausages/pulls/4.0/i-configured-this-out ... Fix docs for configuring before/after a specific config file	2018-02-14 16:35:00 +13:00
Damian Mooyman	34233c0470	Update reference to TestAssetStore	2018-02-14 16:24:12 +13:00
Simon Winter	341bb7ede1	Update 09_Validation.md ... I believe that ValidationResult's error method is called, addError - and not error as stated in this file.	2018-02-14 11:48:07 +13:00
Ingo Schommer	d4fc08b206	Closing bracket	2018-02-14 10:14:44 +13:00
Ingo Schommer	6fab007138	Link to UX issues	2018-02-14 10:14:22 +13:00
Daniel Hensby	e357d1e903	Merge branch '3.6' into 4.0	2018-02-13 16:32:32 +00:00
Daniel Hensby	09726333b7	Merge branch '3.6' into 3	2018-02-13 14:30:59 +00:00
Daniel Hensby	9c50b03b86	Merge branch '3.5' into 3.6	2018-02-13 14:30:29 +00:00
Daniel Hensby	690eec52c6	Merge pull request #7864 from open-sausages/pulls/4.1/fix-slashes ... BUG Fix incorrect convert slashes argument	2018-02-13 10:52:22 +00:00
Daniel Hensby	1bec8a5d0c	Merge pull request #7850 from jonom/singleton-fix-3x ... FIX Singleton creation	2018-02-13 08:29:47 +00:00
Jonathon Menz	c767e472dc	FIX DataObject singleton creation ... Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)	2018-02-12 20:30:35 -08:00
Robbie Averill	8e25a98f27	DOCS Remove extra square bracket from markdown link	2018-02-13 16:59:26 +13:00
Damian Mooyman	0b7cf80331	BUG Fix incorrect convert slashes argument	2018-02-13 16:33:35 +13:00
Christopher Joe	f2b82b1f77	Fix docs for configuring before/after a specific config file	2018-02-13 16:31:51 +13:00
Chris Joe	03b3ea139d	Merge pull request #7860 from open-sausages/pulls/4/fix-password-display ... BUG Fix incorrect display logic on password field	2018-02-13 16:20:08 +13:00
Chris Joe	d13ab11940	Merge pull request #7861 from zanderwar/pulls/enhancements/composerjson-check ... ENHANCEMENT composer.json missing notice	2018-02-13 13:48:12 +13:00
Damian Mooyman	6570599aa9	BUG Fix incorrect display logic on password field	2018-02-13 13:36:21 +13:00
zanderwar	9ce21338a3	ENHANCEMENT composer.json missing notice	2018-02-13 09:03:01 +10:00
Damian Mooyman	6b38031a1e	BUG Fix Director::test() not persisting removed session keys on teardown	2018-02-13 11:35:16 +13:00
Andrew Aitken-Fincham	00ff3ba4b2	ENHANCEMENT Make dropdownFieldThreshold configurable on DBForeignKey (#7789)	2018-02-13 10:32:55 +13:00
Reece Alexander	833b600018	Update 4.1.0-rc1.md (#7859)	2018-02-13 10:07:23 +13:00
Robbie Averill	1a91806bcc	Merge pull request #7857 from dhensby/pulls/3.5/add-license ... Create licence file so that GitHub (and humans) can more easily find it	2018-02-13 09:32:24 +13:00
Daniel Hensby	ec6784246f	Merge branch '3' into 4	2018-02-12 14:44:50 +00:00
Daniel Hensby	24ea2638fe	Create licence file so that GitHub (and humans) can more easily find it	2018-02-12 11:21:03 +00:00
Daniel Hensby	16d3498a56	Merge branch '4.1' into 4	2018-02-12 10:26:07 +00:00
Daniel Hensby	2fb2caba06	Merge branch '4.0' into 4.1	2018-02-12 10:24:30 +00:00
Robbie Averill	175b41683e	Merge pull request #7853 from DrMartinGonzo/patch-1 ... Removed bad quote in i18n doc	2018-02-11 10:30:30 +13:00
Martin Portevin	90f77a7134	Removed bad quote	2018-02-10 03:05:59 +01:00
Daniel Hensby	4ca385e033	Partial revert of #7665 - overzealous string renames	2018-02-09 19:27:45 +00:00
Daniel Hensby	85e97d204b	Partial revert of #7665 - bad docblock changes	2018-02-09 19:27:11 +00:00
Daniel Hensby	5d00d28b2f	Partial revert #7665 - undo changes to thirdparty dir	2018-02-09 18:43:02 +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
Daniel Hensby	747a98a07f	Merge branch '3.6' into 3	2018-02-09 13:21:15 +00:00
Daniel Hensby	48a8a82326	Merge branch '3.5' into 3.6	2018-02-09 13:20:38 +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
Daniel Hensby	2a8d365aac	Merge pull request #6973 from steadlane/fix/csv-unescaped-values ... Fix for badly escaped values in CSV export	2018-02-08 13:45:52 +00:00
JorisDebonnet	5df1ec7eee	Use fputcsv in GridFieldExportButton	2018-02-08 12:26:29 +00:00
Daniel Hensby	09f88c76cf	Merge pull request #7812 from oddnoc/configure-nginx-ss4 ... DOCS: Update nginx configuration for SilverStripe 4	2018-02-08 11:45:32 +00:00
Loz Calver	adc9f02390	Merge pull request #7846 from dhensby/pulls/4.0/test-cms ... Actually run CMS tests	2018-02-08 11:14:19 +00:00
Fred Condo	6976d09bba	Correct location block for SS4 ... SS4 uses /index.php so the location block and documentation need to also use that.	2018-02-08 10:40:25 +00:00
Daniel Hensby	03c91f232d	Actually run CMS tests	2018-02-08 10:32:56 +00:00
Robbie Averill	dd82820242	NEW Allow GridFieldConfig::addComponents to accept an array (#7844)	2018-02-08 11:06:27 +13:00
Damian Mooyman	dd3fbf2c73	BUG Fix installer checking wrong location for files	2018-02-08 10:50:27 +13:00
Chris Joe	e0e8ca0ee6	Merge pull request #7842 from open-sausages/pulls/4/fix-installer-public-search ... BUG Fix installer checking wrong location for files	2018-02-08 10:26:54 +13:00
Andrew Aitken-Fincham	860fa2a05a	API Add excludeAny() and tests for complicated excludes/filters (#7838)	2018-02-08 09:20:17 +13:00
Robbie Averill	ef6b03a35a	Merge pull request #7843 from open-sausages/pulls/4/docs-blog-release ... DOCS Blog on release process	2018-02-07 18:29:32 +13:00
Damian Mooyman	9bfa195e72	Update travis.yml	2018-02-07 17:48:31 +13:00