20828 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Robbie Averill	4128ae74b4	Merge pull request #8701 from creative-commoners/pulls/4.3/730-stable ... Update Travis to use PHP 7.3 stable	2019-01-08 11:10:51 +01:00
Robbie Averill	4adac7d591	Update Travis to use PHP 7.3 stable	2019-01-08 10:47:41 +01:00
Serge Latyntsev	600918fe39	Merge pull request #8639 from caffeineinc/bugfix/4-duplicate-session-headers-8543 ... Stop duplicate session cookies on every request.	2018-12-19 13:56:24 +13:00
Simon Gow	d01585cc98	#8543 Resolve Duplicate Headers ... - fix linting	2018-12-19 12:39:32 +13:00
Simon Gow	1edfa4d956	#8543 Resolve Duplicate Headers ... - Replace session name lookup with function to also check secure cookies - Added timeout which defaults to 0 (same as PHP) - Removed php7 style of session_start from PR - moved session_start into headers sent block to prevent warnings.	2018-12-19 12:39:32 +13:00
Simon Gow	4eb6669c08	#8543 Resolve Duplicate Headers ... Put cookie_lifetime back into the session parameters.	2018-12-19 12:39:32 +13:00
Simon Gow	2deb8f4176	Resolve Duplicate Headers ... Ensure only a single Set-Cookie header is returned from Session once we have data to save. Include backwards compatibility for PHP56	2018-12-19 12:39:32 +13:00
Maxime Rainville	7d1aa44786	Merge pull request #8654 from creative-commoners/pulls/4.3/password-complexity-test-fixes ... Update tests to pass in CWP kitchen sink context	2018-12-13 16:50:25 +13:00
Guy Marriott	020c6fd479	Merge pull request #8663 from open-sausages/pull/4.3/wait-for-loading-after-step ... FIX behat CmsUiContext waits for cms-loading-container after step	2018-12-12 18:26:31 +13:00
Aaron Carlino	8e8a8cae9f	Update changelog	2018-12-12 14:54:31 +13:00
Robbie Averill	8bd747d12a	[SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection	2018-12-11 20:56:55 +13:00
Serge Latyntcev	f7846fc34c	FIX behat CmsUiContext waits for cms-loading-container after step	2018-12-10 16:49:57 +13:00
Robbie Averill	08866f89d9	Merge branch '4.2' into 4.3	2018-12-06 09:40:05 +00:00
Robbie Averill	96bd17d469	Merge branch '4.1' into 4.2	2018-12-06 09:38:45 +00:00
Robbie Averill	3f532466d1	Merge branch '4.0' into 4.1	2018-12-06 09:37:52 +00:00
Guy Marriott	6edcbe9086	Merge pull request #8592 from open-sausages/pulls/4.0/tree-multiselect-null ... FIX TreeMultiselectField passes value 'unchanged' as null to ORM	2018-12-06 14:23:48 +13:00
Robbie Averill	1ac36611a6	Update tests to pass in CWP kitchen sink context	2018-12-02 23:04:34 +00:00
Maxime Rainville	731ef00f7a	Merge pull request #8627 from creative-commoners/pulls/4.3/abstr-action-state ... FIX Provide alternatives to session for storing GridField_FormAction state	2018-12-03 11:58:05 +13:00
Guy Marriott	c7b5b1efd2	FIX Switching to use Controller::curr as it was using previously	2018-11-30 15:40:45 +13:00
Guy Marriott	32d096d9e5	DOCS Moving interface subscription to the abstract and adding a changelog entry	2018-11-30 15:40:45 +13:00
Guy Marriott	aace1da1f0	DOCS Adding notes on configuring the storage method for GridField_FormActions	2018-11-30 15:40:45 +13:00
Guy Marriott	ddaa22986f	Updating StateStore interface not to define a constructor & fixing GridFieldFilterHeader to add required attributes	2018-11-30 15:40:45 +13:00
Guy Marriott	b4c8f699eb	FIX Provide alternatives to session for storing GridField_FormAction state	2018-11-30 15:40:45 +13:00
Serge Latyntcev	4ee63eb4e7	TreeMultiselectFieldTest / make scrutinizer happy	2018-11-29 12:13:56 +13:00
Serge Latyntcev	38f8217f01	TreeMultiselectFieldTest / setUp is protected in PHPUnit5	2018-11-29 09:55:28 +13:00
Robbie Averill	41dc9229bf	FIX Reverting ExtensionTestState and Extensible extra methods modifications to prevent PHP 5.6 segfault (#8581) ... * API Revert addition of Extensible::flush_extra_methods_cache() and change to ExtensionTestState This reverts the changes from #8465 and #8505 that relate to ExtensionTestState and the tracking of extra methods between unit tests. The existing test from #8465 testing overloaded Extensions after extra_methods are populated has been updated to show that you must re-add the extension to flush the extra_methods cache if you need this behaviour. * Revert change to InjectorTest::testExtendedExtensions * Revert "Add failing test to show that overloaded extensions are broken in Extensible" This reverts commit 55e79ffdfd. * DOCS Add docs for extending extensions, and upgrade guide note to 4.3 to avoid using PHP config to do so	2018-11-26 12:00:02 +13:00
Guy Marriott	84c8dace7d	Merge pull request #8621 from open-sausages/pulls/4.3/tweak-site-tree-search ... FIX Explicity mark nodes when searching	2018-11-23 16:14:46 +13:00
Serge Latyntcev	f526c794fc	Minor / Refactor php tests for TreeMultiselectField	2018-11-23 16:03:44 +13:00
Serge Latyntcev	9ce6d91b76	FIX / TreeMultiselectField::objectForKey handles list of IDs correctly	2018-11-22 12:11:18 +13:00
Maxime Rainville	d74af1c17e	FIX Explicity mark nodes when searching nodes in TreeDropdownField #8621	2018-11-21 11:43:21 +13:00
Serge Latyntcev	80885fc231	ADD php test TreeMultiselectField::testEmptyChoiceReadonly	2018-11-20 16:45:23 +13:00
Robbie Averill	6d6ce61b8f	Merge pull request #8616 from creative-commoners/pulls/4.3/rolling-out-rollback-docs ... DOCS Updating HistoryViewer documentation to specify the rollback mutation instead of copyToStage	2018-11-19 12:01:51 +01:00
Guy Marriott	d19c7f2a2d	DOCS Updating HistoryViewer documentation to specify the rollback mutation instead of copyToStage	2018-11-19 14:08:02 +13:00
Guy Marriott	2a0e868260	Merge pull request #8606 from creative-commoners/pulls/4.3/history-viewer-docs ... DOCS Add documentation for configuring a HistoryViewerField for custom DataObjects	2018-11-19 09:30:21 +13:00
Robbie Averill	3b1e91eb59	Merge branch '4.2' into 4.3	2018-11-15 13:41:23 +02:00
Robbie Averill	ef0f9dff8a	Merge branch '4.1' into 4.2	2018-11-15 13:41:00 +02:00
Robbie Averill	c6e3a398c7	Merge branch '4.0' into 4.1	2018-11-15 13:40:08 +02:00
Robbie Averill	c181a17790	Merge pull request #8610 from kinglozzer/urltoken-redirect-loop ... FIX: Redirect loop with multiple confirmation tokens present (fixes #8607)	2018-11-15 13:38:21 +02:00
Loz Calver	b5bae137bd	FIX: Redirect loop with multiple confirmation tokens present (fixes #8607)	2018-11-15 10:59:42 +00:00
Andre Kiste	34103f5e8a	Merge pull request #8604 from creative-commoners/pulls/4.3/password-validator-test-fixes ... FIX Ensure that tests setting passwords have stubbed configuration	2018-11-15 15:34:21 +13:00
Robbie Averill	71eeaa090e	DOCS Add documentation for configuring a HistoryViewerField for custom DataObjects ... [ci skip]	2018-11-14 14:08:06 +02:00
Robbie Averill	7d1d6d0f7b	FIX Ensure that tests setting passwords have stubbed configuration	2018-11-14 11:54:17 +02:00
Andre Kiste	d1823665e7	Merge pull request #8600 from creative-commoners/pulls/4.3/password-validator-docs ... DOCS Update documentation for password validation rule configuration	2018-11-14 12:22:45 +13:00
Andre Kiste	04d1a767e6	Merge pull request #8601 from creative-commoners/pulls/4.3/fix-password-validator-tests ... FIX Remove default password validation rules before running unit tests	2018-11-14 11:48:35 +13:00
Robbie Averill	0bb94b018b	FIX Remove default password validation rules before running unit tests	2018-11-13 14:09:08 +02:00
Robbie Averill	af8d268cc7	DOCS Update documentation for password validation rule configuration	2018-11-13 10:55:26 +02:00
Andre Kiste	d2cc773720	Merge pull request #8587 from creative-commoners/pulls/4.3/password-requirements ... FIX Move password complexity requirements into framework	2018-11-13 18:15:31 +13:00
Serge Latyntcev	15aaf9db9f	Fix a code style typo	2018-11-13 10:20:49 +13:00
Robbie Averill	10f502f0c7	Merge branch '4.2' into 4.3	2018-11-09 11:39:05 +02:00
Robbie Averill	5b7723df7f	Merge branch '4.1' into 4.2 ... # Conflicts: # lang/fi.yml # lang/nl.yml	2018-11-09 11:38:04 +02:00