19785 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maxime Rainville	46e4c19070	MINOR Add a reference to SS_Object in .upgrade.yml to allow upgrade from SS3.7	2018-11-01 22:38:26 +13:00
Loz Calver	536a1c08b3	Merge pull request #8358 from creative-commoners/pulls/4.0/check-scheme ... FIX Check scheme is truthy before setting it to the request	2018-09-03 09:31:03 +01:00
Robbie Averill	b922c0d732	FIX Check scheme is truthy before setting it to the request	2018-09-03 08:59:37 +02:00
Maxime Rainville	dd3379e68f	Merge pull request #8075 from creative-commoners/pulls/4.0/remap-polymorphics ... FIX Polymorphic relationship class columns have obsolete class names remapped	2018-08-28 17:03:39 +12:00
Robbie Averill	d651d0fbfc	FIX Use base class (not remapping target class) when looking up whether object is versioned	2018-08-28 14:15:02 +12:00
Robbie Averill	3178fbf3bb	Merge pull request #8028 from andrewandante/pulls/4.0/unset_http_scheme_on_cli ... unset http scheme on CLIRequestBuilder	2018-08-27 16:11:42 +12:00
Robbie Averill	953153500d	FIX Polymorphic relationship class columns have obsolete class names remapped	2018-08-15 10:40:51 +12:00
Robbie Averill	88d3794828	Merge pull request #8321 from scott1702/patch-4 ... Fix indentation on pagination guide	2018-08-14 15:39:07 +12:00
Scott Hutchinson	3bd2cbf199	DOCS indentation on pagination guide [ci skip] ... For all those copy + paste fiends	2018-08-14 15:36:52 +12:00
Loz Calver	f0e545ada8	Merge pull request #7971 from dhensby/pulls/4.0/fix-extension-config ... FIX Config from extension should not override	2018-07-13 16:15:18 +01:00
Daniel Hensby	d80ef3d9e6	DOCS Update docs to reflect true config merge priorities	2018-07-13 15:43:56 +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	87159ea820	Merge pull request #7949 from martinduparc/patch-7 ... Use LimitWordCount instead of LimitWordCountXML	2018-06-19 21:36:36 +12:00
Robbie Averill	18fba211b0	Merge pull request #8165 from open-sausages/pulls/4.0/fix-duplicate-upgrade-keys ... BUG Remove duplicate key	2018-06-13 09:29:28 +12:00
Damian Mooyman	7b04949caa	BUG Remove duplicate key	2018-06-12 15:00:22 +12:00
Robbie Averill	f256045020	Merge pull request #8158 from open-sausages/pulls/4.0/fix-cli-canonical-middleware ... BUG Prevent canonical URL causing a redirect on CLI unless explicitly enabled	2018-06-12 10:53:37 +12: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	2a51f34c3e	BUG Prevent canonical URL causing a redirect on CLI unless explicitly enabled ... Replaces #8157	2018-06-11 13:54:27 +12:00
Nicolaas	8f03c7df05	PATCH: removing duplicate key (SS_TRUSTED_PROXY_HOST_HEADER)	2018-06-11 13:35:27 +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	cfe93b7f23	Merge branch '3.6' into 4.0	2018-06-08 14:41:04 +01:00
Maxime Rainville	582c69d32f	BUG Fix issue with Disabled DateField always display (not set).	2018-06-08 13:51:22 +01:00
Daniel Hensby	e1450b5e82	Merge pull request #8147 from kinglozzer/mysql-pdo-attr ... FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)	2018-06-08 13:06:03 +01:00
Ingo Schommer	510b0f7759	Merge pull request #8150 from open-sausages/pulls/4.0/fix-postgres-duplication-issue ... BUG Fix test that relies on implicit ID order breaking postgres	2018-06-08 12:58:43 +12:00
Damian Mooyman	29f9b1c18f	Fix linting issues	2018-06-08 11:38:36 +12:00
Damian Mooyman	e37e3e1746	BUG Fix test that relies on implicit ID order breaking postgres	2018-06-08 11:23:24 +12:00
Loz Calver	66f57bd4da	FIX: Only set MYSQL_ATTR_INIT_COMMAND when using mysql driver (fixes #8103)	2018-06-07 10:26:00 +01: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
Daniel Hensby	801a51d0f7	Merge branch '3.5' into 3.6	2018-06-05 16:30:20 +01:00
Robbie Averill	13ea2f9b80	Merge pull request #8132 from dhensby/pulls/3.5/postgres-test-fix ... FIX Regression from #8009	2018-06-05 13:43:19 +12:00
Daniel Hensby	41e601a036	FIX Regression from #8009	2018-06-04 17:03:05 +01:00
Loz Calver	050018dba6	Merge pull request #8134 from dhensby/pulls/3.5/memory-limit ... Increase memory limit to 2G in Travis builds	2018-06-04 16:50:52 +01:00
Loz Calver	0a4e3fc716	Merge pull request #8133 from dhensby/pulls/3.5/php53-compat ... FIX PHP 5.3 compat for referencing $this in closures	2018-06-04 16:30:21 +01:00
Robbie Averill	c1b0c56788	Increase memory limit to 2G in Travis builds	2018-06-04 16:24:18 +01:00
Robbie Averill	1cbf27e0f4	FIX PHP 5.3 compat for referencing $this in closure, and make method public for same reason ... sdf	2018-06-04 16:05:49 +01:00
Daniel Hensby	1658fe7617	Merge pull request #8127 from jonom/4.0-read-only-currency ... Fix: negative values in read only currency field	2018-06-04 11:52:01 +01:00
Jonathon Menz	5a5ba1e5c0	Fix: negative values in read only currency field ... Don’t strip out ‘-‘ character as this makes negative values appear to be positive (Fixes #8126)	2018-06-01 12:59:02 -07:00
Robbie Averill	624a5326a7	Typo in PHPDoc type	2018-05-30 14:51:09 +12:00
Robbie Averill	3244603458	Merge remote-tracking branch 'origin/3.6' into 4.0	2018-05-28 17:50:54 +12:00
Robbie Averill	3a537bc745	Merge branch 'heads/4.0.4' into 4.0	2018-05-28 17:50:07 +12:00
Robbie Averill	d21660971f	Merge branch 'heads/3.6.6' into 3.6	2018-05-28 17:44:28 +12:00
Robbie Averill	dae8fefb1e	Merge remote-tracking branch 'origin/3.5' into 3.6	2018-05-28 17:43:55 +12:00
Robbie Averill	df4648a308	Merge branch 'heads/3.5.8' into 3.5	2018-05-28 17:42:31 +12:00
Robbie Averill	912dc60cf3	Added 3.5.8 changelog	2018-05-28 15:50:54 +12:00
Robbie Averill	fe4f6f42d3	Updated 4.0.4 changelog	2018-05-24 13:51:21 +12:00
Damian Mooyman	5bff64b47b	BUG Fix Director::test() not persisting removed session keys on teardown	2018-05-24 13:10:03 +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
Robbie Averill	bb1f0cce58	Added 4.0.4 changelog	2018-05-24 11:15:14 +12:00
Robbie Averill	5b7eca2b63	Merge pull request #70 from silverstripe-security/pulls/4.0/ss-2018-012 ... [ss-2018-012] File security documentation	2018-05-14 17:16:53 +12:00
Damian Mooyman	299131ed22	[ss-2018-012] File security documentation	2018-05-14 17:16:36 +12:00