21534 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aaron Carlino	c5930ea3f4	Update translations	2019-06-10 17:36:37 +12:00
Aaron Carlino	d04e54c1be	Merge branch '4.4' into 4	2019-06-10 17:33:30 +12:00
Aaron Carlino	c747b1f8d3	Merge branch '4.3' into 4.4	2019-06-10 17:32:07 +12:00
Aaron Carlino	f766555d61	Merge branch '4.2' into 4.3	2019-06-10 17:27:05 +12:00
Serge Latyntcev	ca56e8d78e	[CVE-2019-12246] Denial of Service on flush and development URL tools	2019-06-10 17:23:56 +12:00
Aaron Carlino	e2da7b0dc4	Merge branch '4.4' into 4	2019-06-10 16:37:16 +12:00
Sam Minnée	654156d46d	FIX: Fix bug when confirmed password is changed but not the password. (#9012) ... In this case the confirmed password field is not reflected. It’s unclear how often this situation would arise outside of test scenarios, but may come up if $form->loadDataFrom() is called more than once. Fixes #2496 (it’s a minor issue but I think this is why Dan flagged it as a regression). Originally introduced as part of Dan’s initial fix at 2a6f1f1949.	2019-06-10 15:48:29 +12:00
Robbie Averill	179a982f45	Merge pull request #9019 from rafaeldsousa/pull/include-cancreate-check-gridfield-rightgroupfield ... Including canCreate in if statement so that button gets removed if us…	2019-06-10 09:59:45 +12:00
Maxime Rainville	65f9951c5e	Merge pull request #9026 from open-sausages/pulls/4.0/file-migration-docs ... Improve file migration information to documentation	2019-06-07 17:11:59 +12:00
Maxime Rainville	addf98a5e0	DOC Improve File migration do	2019-06-07 17:09:52 +12:00
Maxime Rainville	761f7d15ce	Merge pull request #9045 from open-sausages/pulls/4.4/in-memory-cache-opt-out ... Opt-out of in-memory caching factory	2019-06-07 12:40:46 +12:00
Ingo Schommer	8324235eda	API Opt-out of in-memory caching factory ... In-memory caches are typically more resource constrained (number of items and storage space). Give cache consumers an opt-out if they are expecting to create large caches with long lifetimes. Use case: https://github.com/silverstripe/silverstripe-assets/pull/282	2019-06-07 12:21:10 +12:00
Loz Calver	c9583c39fe	Merge pull request #9046 from blueskies79/patch-3 ... DOCS Update Config example namespace	2019-06-06 11:05:44 +01:00
blueskies79	cad84974d2	Update Config example namespace ... I think it's handy to add this namespace to the docs ;-)	2019-06-06 11:43:28 +02:00
Andre Kiste	1da181a3b3	Merge pull request #9022 from open-sausages/pulls/4.4/migrate-task-colours ... NEW Clearer file migration output with colours	2019-06-06 15:46:28 +12:00
Ingo Schommer	f4cdfb06c8	Update environment timeouts ... See https://github.com/silverstripe/silverstripe-framework/issues/9029	2019-06-06 15:18:12 +12:00
Robbie Averill	e8fa3d8750	DOCS Fix incorrect deprecation reference in MonologErrorHandler	2019-06-06 09:30:50 +12:00
Ingo Schommer	b21e5d9e57	Moved time limit increases from individual job ... Should apply to all file migration subtasks, not just the first one (see silverstripe/assets)	2019-06-05 15:10:46 +12:00
Ingo Schommer	30496144b9	DOCS More detail on queuedjobs file migrations	2019-06-05 15:10:09 +12:00
Ingo Schommer	2d4711de01	Fixed logging ... Broke loggers attached by queuedjobs because it wasn't using the global service. Since the stderr handler was set to bubble=false, those messages weren't picked up by queuedjobs. Removed preformatted handler since there's no longer an ability to run this stuff via web	2019-06-05 15:09:58 +12:00
Ingo Schommer	7301b375b8	NEW Clearer file migration output with colours	2019-06-05 11:41:06 +12:00
Robbie Averill	23d6890820	Merge pull request #9036 from Taitava/urlsegment-colon-fix ... URLSegmentFilter: Remove : characters from url segments when multibyt…	2019-06-04 09:26:56 +12:00
Jarkko Linnanvirta	9184056b5e	URLSegmentFilter: Remove : characters from url segments when multibyte characters are allowed.	2019-06-02 11:43:51 +03:00
Guy Marriott	0520d77461	API checkHistoricalPasswords(), characterStrength() and minLength() are now correctly deprecated from 4.5.0 onwards (#9008) ... API checkHistoricalPasswords(), characterStrength() and minLength() are now correctly deprecated from 4.5.0 onwards	2019-05-31 09:56:39 +12:00
Loz Calver	487beb40ce	Merge pull request #9004 from blueskies79/patch-2 ... Update 04_Data_Types_and_Casting	2019-05-30 09:23:06 +01:00
Robbie Averill	6678f92681	Merge pull request #9025 from taoceanz/4 ... Removed unused use BadMethodCallException statement.	2019-05-30 09:38:47 +12:00
Robbie Averill	00fd74a0a1	Merge branch '4.4' into 4 ... # Conflicts: # src/Dev/Tasks/MigrateFileTask.php	2019-05-30 09:36:42 +12:00
Robbie Averill	14673ffd0a	Merge branch '4.3' into 4.4	2019-05-30 09:35:26 +12:00
Robbie Averill	188698dcee	Merge branch '4.2' into 4.3	2019-05-30 09:35:17 +12:00
Robbie Averill	7f69cc8f94	Merge branch '4.1' into 4.2	2019-05-30 09:35:06 +12:00
Robbie Averill	02864aba3f	Merge branch '4.0' into 4.1	2019-05-30 09:34:55 +12:00
Robbie Averill	3e2fc6aa0b	Automated phpcbf linting	2019-05-30 09:34:34 +12:00
Robbie Averill	a1f0d7a3bf	Merge pull request #9016 from sminnee/partial-fix-4622 ... FIX: Better message when form action handler not found.	2019-05-30 09:22:54 +12:00
Thomas Ocean	e30483a7dc	Removed unused use BadMethodCallException statement.	2019-05-30 09:08:33 +12:00
shoosah	80e4886c3f	Add getter and change visibility for whitelist_array property	2019-05-28 14:15:12 +12:00
Rafael Marins de Sousa	f7c1be7ac1	Including canCreate in if statement so that button gets removed if user isn't to be able to create new records	2019-05-28 12:28:00 +12:00
shoosah	d740998463	Improve displayQuery and benchmarkQuery functions and whitelist_array variable	2019-05-28 12:00:05 +12:00
shoosah	d684c69f09	Allow displaying partial/full query message for debugging	2019-05-28 12:00:05 +12:00
Andre Kiste	2c8c643ce3	MigrateFileTask now outputs "Done" when it has finished running (#8995)	2019-05-28 09:45:13 +12:00
Maxime Rainville	4f39e59aff	BUG Enable file hash caching when running the file migration task (#8993)	2019-05-28 09:37:45 +12:00
Maxime Rainville	5b6d0946f4	API Add extension points to MigrateFileTask (#8994) ... * API Add extension points to MigrateFileTask * Apply suggestions from code review Co-Authored-By: Guy Marriott <guy@scopey.co.nz>	2019-05-28 09:24:01 +12:00
Maxime Rainville	7ef604807c	BUG Enable file hash caching when running the file migration task (#8993)	2019-05-28 09:21:11 +12:00
Maxime Rainville	9bfce8c1a4	API Add extension points to MigrateFileTask (#8994) ... * API Add extension points to MigrateFileTask * Apply suggestions from code review Co-Authored-By: Guy Marriott <guy@scopey.co.nz>	2019-05-28 09:19:05 +12:00
Guy Marriott	f97ca26e76	Merge pull request #9014 from sminnee/fix-4142 ... FIX: List default items in the readonly view of ListboxField	2019-05-27 20:13:20 +12:00
Guy Marriott	a01e2496e5	MINOR: Add tests for GroupedDropdownField empty strings (#9015) ... MINOR: Add tests for GroupedDropdownField empty strings	2019-05-27 20:05:12 +12:00
Sam Minnee	7407096e99	FIX: List default items in the readonly view of ListboxField ... Adds tests for non-readonly default items too. Fixes #4142	2019-05-27 17:47:09 +12:00
Sam Minnee	2c71daacfe	MINOR: Add tests for GroupedDropdownField empty strings ... These bugs were never present in SS4 as the relevant code had a substantial rewrite at the same time they were introduced in SS3. In SS3, test C still fails. Fixes #4705 Fixes #4987 Fixes #4793	2019-05-27 17:46:03 +12:00
Sam Minnee	983d36b7ee	FIX: Better message when form action handler not found. ... Fixes #4622 to some extent, although this fix will be most useful when https://github.com/silverstripe/silverstripe-errorpage/issues/30 is addressed also.	2019-05-27 15:00:10 +12:00
Robbie Averill	58791e52b6	Merge pull request #9007 from NightJar/pulls/4.0/headerfield ... FIX HeaderField requires the optional Title field	2019-05-27 10:50:15 +12:00
Robbie Averill	d873779956	API checkHistoricalPasswords(), characterStrength() and minLength() are now correctly deprecated from 4.5.0 onwards	2019-05-27 09:12:32 +12:00