20466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	b22f33ae84	Merge branch '4.2' into 4	2018-08-15 13:23:27 +12:00
Robbie Averill	48c6dec47d	Merge branch '4.1' into 4.2	2018-08-15 13:23:07 +12:00
Robbie Averill	1ad2d6535e	Merge branch '4.0' into 4.1	2018-08-15 13:22:46 +12:00
Robbie Averill	7daea920f2	Merge pull request #8310 from blueo/patch-1 ... Add detail to negation docs	2018-08-15 13:20:21 +12:00
Bernard Hamlin	25c84709f1	Add detail to negation docs ... I felt the negation docs didn't cover checking if a value was *not* another value and didn't point out that `not` can't be combined with other operators. [ci skip]	2018-08-15 13:19:35 +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
Robbie Averill	3b06385b7d	Merge pull request #8299 from nickbyfleet/patch-1 ... Update index.md	2018-08-01 16:32:37 +12:00
Nicholas Byfleet	6667203d73	Update index.md ... Changed a sentence so that it makes sense.	2018-08-01 16:30:18 +12:00
Daniel Hensby	518f798ff8	Merge pull request #8292 from creative-commoners/pulls/4.2/fix-id-conflict ... FIX Altering ID of authenticator tabs to resolve ID conflict	2018-07-31 00:35:06 +01:00
Ingo Schommer	2d6964c243	Merge pull request #8261 from open-sausages/pulls/4/secure-remember-me-cookie ... NEW Option for secure "remember me" cookie	2018-07-31 09:19:15 +12:00
Daniel Hensby	4d83330981	Merge branch '4.2' into 4	2018-07-30 17:11:42 +01:00
Daniel Hensby	17dbb86257	Merge pull request #8293 from open-sausages/pulls/4.2/restore-default-delete-action-of-record-editor ... FIX Restore default delete action on GridFieldConfig_RecordEditor	2018-07-30 17:00:09 +01:00
Ingo Schommer	114b0a5ea7	NEW Option for secure "remember me" cookie ... Fixes #8234	2018-07-30 16:41:49 +01:00
root	9d7eefce1d	Added 4.2.1 changelog	2018-07-30 14:12:55 +00:00
root	c4b2f758c1	Update translations	2018-07-30 14:12:40 +00: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
Robbie Averill	7d1ce41e49	Merge pull request #8296 from open-sausages/pulls/4/doc-update-minimum-composer-version ... FIX Specify minimum composer version	2018-07-30 13:01:54 +12:00
Maxime Rainville	fde7b9ddc5	FIX Specify minimum composer version ... Specify the minimal version of composer to use in upgrading guide.	2018-07-30 12:35:49 +12:00
Robbie Averill	8d1af25e27	Merge pull request #8294 from kinglozzer/manymanythrough-docs ... Update many-many-through docs (closes #8290)	2018-07-27 20:56:02 +12:00
Loz Calver	ef335a8a30	Update many-many-through docs (closes #8290)	2018-07-27 09:30:13 +01:00
Maxime Rainville	85b4b48fb5	FIX Restore default delete action on GridFieldConfig_RecordEditor	2018-07-27 17:19:09 +12:00
Guy Marriott	0d90cdb05d	FIX Altering ID of authenticator tabs to resolve ID conflict	2018-07-27 16:01:52 +12:00
Ingo Schommer	36834075df	Merge pull request #8288 from open-sausages/pulls/4/recommend-install-upgrader-with-phar ... BUG Recommend install of upgrader with PHAR exec.	2018-07-26 16:19:02 +12:00
Maxime Rainville	900ca9c8d7	BUG Recommend install of upgrader with PHAR exec. ... Update the Upgrading guide to recommend installing of the PHAR executable of the upgrader over using `composer glboal require`.	2018-07-26 14:41:32 +12:00
Robbie Averill	8723336b1c	Merge pull request #8287 from michalkleiner/pulls/4/update-4.2.0-changelog ... Fix backtick in changelog breaking sentence formatting	2018-07-26 10:14:58 +12:00
Michal Kleiner	0035f4a907	Fix backtick in changelog breaking sentence formatting	2018-07-26 10:07:29 +12:00
Maxime Rainville	97c7caf1f1	Merge pull request #8281 from michalkleiner/pulls/4/update-php-parser-dependency ... MINOR Allow version 4 of nikic/php-parser	2018-07-25 09:36:45 +12:00
Robbie Averill	aa5adaf958	Merge pull request #8282 from mspacemedia/patch-1 ... Make removeDuplicates() chainable	2018-07-25 08:37:04 +12:00
root	1bcd449ace	Added 4.2.0 changelog	2018-07-24 19:10:40 +00:00
root	bdf3bc965c	Update translations	2018-07-24 19:07:41 +00:00
Mark Muller	e154aa170c	Make removeDuplicates() chainable ... Added the return to allow removeDuplicates to be chained.	2018-07-24 13:50:37 +01:00
Michal Kleiner	63feab98b9	Allow version 4 of nikic/php-parser dependency	2018-07-24 16:18:44 +12:00
Daniel Hensby	ae00147de1	Merge pull request #8280 from open-sausages/pulls/4/simpler-vary-header ... FIX: Remove X-Requested-With from default Vary header	2018-07-24 01:45:07 +01:00
Daniel Hensby	e1cdc8fba3	Merge pull request #8274 from open-sausages/pulls/4.2/cache-docs-and-deprecation-handling ... Corrected caching docs and deprecation behaviour (fixes #8272)	2018-07-24 01:41:48 +01:00
Ingo Schommer	d12c2fe631	Properly deprecate HTTP.cache_control	2018-07-23 19:09:11 +01:00
Ingo Schommer	0f5420b6a5	Removed unused classes	2018-07-23 19:09:11 +01:00
Ingo Schommer	9300e802f7	Updated caching docs (out of sync with implementation) ... See https://github.com/silverstripe/silverstripe-framework/issues/8272	2018-07-23 19:09:10 +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
Sam Minnee	bde3121a33	FIX: Remove X-Requested-With from default Vary header ... 3.x forward port of https://github.com/silverstripe/silverstripe-framework/pull/8242	2018-07-23 14:18:05 +01:00
Daniel Hensby	24bd0a625c	Merge pull request #7971 from dhensby/pulls/4.0/fix-extension-config ... This is a cherry-picked PR from 4.2 -> 4.2.0	2018-07-23 14:15:37 +01:00
Daniel Hensby	ef97164c0a	DOCS Update docs to reflect true config merge priorities	2018-07-23 14:15:25 +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	d06234fcc7	Merge pull request #8223 from dhensby/pulls/4.0/remove-email-from-pswdrecovery ... This is a cherry-picked PR from 4.2 -> 4.2.0	2018-07-23 14:14:11 +01:00
Daniel Hensby	6e1c7c2781	FIX remove personal information from password reset confirmation screen	2018-07-23 14:13:52 +01:00
Daniel Hensby	b6db400f56	Merge pull request #8184 from open-sausages/pulls/4.1/fix-issue-with-loading-submitted-value-from-session ... This is a cherry-picked PR from 4.2 -> 4.2.0	2018-07-23 14:12:50 +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