16549 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Hensby	0baa996cc0	Merge branch '3.6' into 3	2017-11-14 12:13:08 +00:00
Daniel Hensby	4731d3c671	Merge branch '3.5' into 3.6	2017-11-14 12:00:53 +00:00
Damian Mooyman	ef86b16854	Merge pull request #7514 from dhensby/pulls/3.5/composer-autoload ... Add composer autloading to v3	2017-11-02 11:41:35 +13:00
Loz Calver	1d71110fa9	Merge pull request #7537 from 3Dgoo/patch-1 ... CSVParser API doc fix	2017-10-31 11:15:35 +00:00
3Dgoo	ed1a16b6e2	CSVParser API doc fix ... CSVParser API doc fix	2017-10-31 10:17:25 +10:30
Damian Mooyman	fde8eab537	Merge pull request #7523 from dhensby/pull/3514 ... caching.md, false examples: updated	2017-10-27 10:54:07 +13:00
Gabrijel Gavranović	6fd737d252	caching.md, false examples: updated ... The previous exmaple for adding a Mamcached backend was not working properly. Using this example results in Zend_Cache_Backend_Memcached using the default (fallback) settings (which are exactly the same as in the exmaple though). + Added an extra example for Memcached instances which are listening on a Unix socket.	2017-10-26 12:57:45 +01:00
Chris Joe	a3351589e6	Merge pull request #7118 from phptek/issue/7116 ... FIX: Fixes #7116 Improves server requirements docs viz: OpCaches.	2017-10-26 11:05:47 +13:00
Russell Michell	00f1ad5d69	FIX: Fixes #7116 Improves server requirements docs viz: OpCaches.	2017-10-26 09:22:07 +13:00
Daniel Hensby	cbac375590	FIX Helpful warning when phpunit bootstrap appears misconfigured	2017-10-25 17:48:35 +01:00
Daniel Hensby	32cef975ef	FIX Use self::inst() for Injector/Config nest methods	2017-10-25 17:48:35 +01:00
Daniel Hensby	8aad080516	Add composer autoloading support to 3.x	2017-10-25 17:48:34 +01:00
Damian Mooyman	59cc45565b	Merge pull request #7503 from andrewandante/patch-4 ... Spelling in DataQueryTest	2017-10-24 12:04:41 +13:00
Andrew Aitken-Fincham	c4a50a3d10	Spelling in DataQueryTest	2017-10-20 12:00:35 +01:00
Damian Mooyman	2b09216b0c	Merge pull request #7270 from robbieaverill/pulls/3.6/fix-trailing-period-on-duplicate-folder-name ... FIX Files without extensions (folders) do not have a trailing period added	2017-10-18 10:26:05 +13:00
Robbie Averill	2f579b64cb	FIX Files without extensions (folders) do not have a trailing period added	2017-10-18 09:25:27 +13:00
Daniel Hensby	8ce6d89e78	Merge pull request #7410 from creative-commoners/pulls/3.7/mark-image-title-as-alt-text ... NEW Add (alt text) to title field for clarity	2017-10-13 11:16:37 +01:00
Damian Mooyman	7f5ca56e36	Merge pull request #7455 from dhensby/pulls/fix-circular-ref-issue ... FIX Dont use var_export for cache key generation	2017-10-10 10:16:16 +13:00
Daniel Hensby	264cec1239	FIX Dont use var_export for cache key generation as it fails on circular references	2017-10-09 10:13:39 +01:00
Sam Minnée	f69f35eead	DOCS: Fixed incorrect statement on ID generation	2017-10-09 11:36:23 +13:00
Matthew Hailwood	b044fefc91	Difference between a single array call vs multiple calls to exclude ... This table should best summarise the difference - 1 = row is visible, 0 = row is excluded | Name | SELECT * FROM Player WHERE (FirstName != 'A' OR LastName != 'B') | SELECT * FROM Player WHERE FirstName != 'A' AND LastName != 'B' | | A B | 0 | 0 | | A C | 1 | 0 |	2017-10-03 16:28:08 +13:00
Robbie Averill	2f0a0cb63f	NEW Add (alt text) to title field for clarity	2017-09-29 09:33:55 +13:00
Daniel Hensby	b49d1d7fbd	Merge branch '3.6' into 3	2017-09-28 17:17:19 +01:00
Daniel Hensby	e81b503441	Merge branch '3.5' into 3.6	2017-09-28 17:17:04 +01:00
Daniel Hensby	f95c818f3c	Merge tag '3.6.2' into 3.6 ... Release 3.6.2	2017-09-28 17:17:00 +01:00
Daniel Hensby	f745442a55	Merge tag '3.5.5' into 3.5 ... Release 3.5.5	2017-09-28 17:16:31 +01:00
Daniel Hensby	3f5ddc7d00	Added 3.6.2 changelog	2017-09-28 16:05:53 +00:00
Daniel Hensby	393d1a9be6	Added 3.5.5 changelog	2017-09-28 15:37:07 +00:00
Daniel Hensby	29300c2c2d	Merge remote-tracking branch 'security/3.5.5' into HEAD	2017-09-28 15:48:29 +01:00
Daniel Hensby	6e78b9f8d2	Merge pull request #7406 from NightJar/patch-2 ... Fix ArrayList sort error with old (supported) PHP PHP 5.3 at least (the reported and tested against version) requires arguments to `call_user_func_array` to be passed by reference. There exists a note as a comment in the code, but was unfortunately overlooked in a previous commit to fix case sensitive sorting 4998b80#diff-6ba746c3d31fd6b4c4a99d7efe35eb21L442 To solve this issue we simply first assign the constant to a variable, so we can then pass that by reference. This has no functional impact, however fixes an issue for users locked in to old PHP versions which we still list as supported (https://docs.silverstripe.org/en/3/getting_started/server_requirements/#web-server-software-requirements).	2017-09-28 15:46:38 +01:00
Dylan Wagstaff	ebe1de8d8b	Fix ArrayList sort error with old (supported) PHP ... PHP 5.3 at least (the reported and tested against version) requires arguments to `call_user_func_array` to be passed by reference. There exists a note as a comment in the code, but was unfortunately overlooked in a previous commit to fix case sensitive sorting 4998b80445 (diff-6ba746c3d31fd6b4c4a99d7efe35eb21L442) To solve this issue we simply first assign the constant to a variable, so we can then pass that by reference. This has no functional impact, however fixes an issue for users locked in to old PHP versions which we still list as supported (https://docs.silverstripe.org/en/3/getting_started/server_requirements/#web-server-software-requirements).	2017-09-28 15:29:54 +01:00
Daniel Hensby	4ed0857127	Merge pull request #7396 from danielmcclure/patch-1 ... Updated Minimum Default PHP Version	2017-09-22 09:36:44 +01:00
Daniel McClure	d1cd3b7d49	Updated Minimum Default PHP Version	2017-09-22 17:33:35 +12:00
Daniel Hensby	b4412cedf6	Added 3.6.2-beta2 changelog	2017-09-21 09:11:36 +00:00
Daniel Hensby	bd7abc73de	Merge branch '3.5.5' into 3.6.2	2017-09-20 16:26:30 +01:00
Daniel Hensby	1209b2ae13	Added 3.5.5-beta2 changelog	2017-09-20 13:41:04 +00:00
Daniel Hensby	72702dbd50	Merge pull request #43 from silverstripe-security/pulls/3.5/member-enumeration-timing-attack ... [SS-2017-005] User enumeration via timing attack mitigated	2017-09-20 11:39:39 +01:00
Daniel Hensby	6b198336a8	Merge pull request #44 from silverstripe-security/patch/3.5/authenticator-fix ... FIX Authenticators are more resilient to incomplete configuration	2017-09-20 11:38:38 +01:00
Daniel Hensby	f0262a8fd9	[SS-2017-005] User enumeration via timing attack mitigated	2017-09-20 11:33:22 +01:00
Daniel Hensby	fc79a76718	Added 3.6.2-beta1 changelog	2017-09-19 16:51:57 +00:00
Daniel Hensby	1f256cf2d2	Added 3.5.5-beta1 changelog	2017-09-19 15:25:41 +00:00
Daniel Hensby	091d99f599	FIX Authenticators are more resilient to incomplete configuration	2017-09-12 15:57:03 +01:00
Daniel Hensby	f8c5ff2f15	Merge branch '3.6' into 3	2017-08-29 16:54:09 +01:00
Daniel Hensby	7d90df38e5	Merge branch '3.5' into 3.6	2017-08-29 16:46:58 +01:00
Daniel Hensby	792925a3b9	Merge pull request #7320 from robbieaverill/pulls/3.7/data-query-docblocks ... NEW Fix incorrect scalar types in doc blocks, add chainable returns in setters	2017-08-29 16:32:53 +01:00
Damian Mooyman	c0003bca3d	Merge pull request #7319 from open-sausages/pulls/3.5/no-combining-requirements ... Fix add combinedFiles to clear logic - ss3	2017-08-29 13:47:52 +12:00
Christopher Joe	7b200a2a64	Fix add combinedFiles to clear logic	2017-08-29 12:57:41 +12:00
Robbie Averill	0b34066f0c	NEW Fix incorrect scalar types in doc blocks, add chainable returns in setters	2017-08-29 11:40:20 +12:00
Daniel Hensby	9d2503c3da	Merge pull request #7274 from PapaBearNZ/patch-1 ... Fix Truncate Error Issue when using views in a Unittest.	2017-08-25 11:51:36 +01:00
Damian Mooyman	52eb0bf214	Merge pull request #7306 from patricknelson/issue-7305-template-manifest-injector ... NEW: Ability to override SS_TemplateManifest via Injector (fixes #7305)	2017-08-24 13:41:08 +12:00