MNT Update development dependencies

Merge branch '5.1' into 5
2023-10-16 16:47:02 +13:00 · 2023-10-16 16:47:02 +13:00 · 2023-10-16 16:24:13 +13:00 · 2023-10-16 16:24:10 +13:00 · 2023-10-02 22:05:48 +13:00 · 2023-09-28 09:54:41 +13:00
3 changed files with 3 additions and 5 deletions
--- a/composer.json
+++ b/composer.json
@ -7,7 +7,7 @@
        "silverstripe/recipe-plugin": "2.x-dev",
        "silverstripe/vendor-plugin": "2.x-dev",
        "silverstripe/recipe-cms": "5.x-dev",
-        "silverstripe-themes/simple": "~3.2.0",
+        "silverstripe-themes/simple": "3.x-dev",
        "silverstripe/login-forms": "5.x-dev"
    },
    "require-dev": {
@ -34,4 +34,4 @@
    },
    "prefer-stable": true,
    "minimum-stability": "dev"
-}
+}
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@ -29,9 +29,7 @@
        <!-- Framework ORM tests are split up to run in parallel -->
        <testsuite name="framework-core">
            <directory>vendor/silverstripe/framework/tests/php</directory>
-            <exclude>
-                <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
-            </exclude>
+            <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
        </testsuite>
        <testsuite name="framework-orm">
            <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
--- a/public/favicon.ico
+++ b/public/favicon.ico
Author	SHA1	Message	Date
Guy Sartorelli	abb17865e4	MNT Update development dependencies	2023-10-16 16:47:02 +13:00
Guy Sartorelli	e86725dc6e	Merge branch '5.1' into 5	2023-10-16 16:47:02 +13:00
Guy Sartorelli	afdcf82e1d	MNT Update development dependencies	2023-10-16 16:24:13 +13:00
Guy Sartorelli	8f560c9d9f	MNT Update release dependencies	2023-10-16 16:24:10 +13:00
Maxime Rainville	a5d3ccb882	Merge pull request #362 from creative-commoners/pulls/5.1/update-favicon FIX Add padding to favicon	2023-10-02 22:05:48 +13:00
Guy Sartorelli	a3f8e7ef3e	FIX Add padding to favicon	2023-09-28 09:54:41 +13:00
Guy Sartorelli	05b53e4f75	MNT Update development dependencies	2023-09-19 11:11:27 +12:00
Guy Sartorelli	a8ea681f3c	MNT Update release dependencies	2023-09-19 11:11:24 +12:00
Guy Sartorelli	b668229973	Merge branch '5.0' into 5.1	2023-09-18 11:38:16 +12:00
Guy Sartorelli	6119d97ebd	Merge branch '4' into 5.0	2023-09-18 11:34:14 +12:00
Guy Sartorelli	603ffc064b	Merge branch '4.13' into 4	2023-09-18 11:32:55 +12:00
Guy Sartorelli	9372698a6b	Merge pull request #361 from creative-commoners/pulls/4.13/exclude MNT Fix exclude node	2023-09-07 17:16:32 +12:00
Steve Boyd	3887540da7	MNT Fix exclude node	2023-09-07 14:14:12 +12:00
Guy Sartorelli	87ad69b735	MNT Update development dependencies	2023-09-01 09:41:48 +12:00
Guy Sartorelli	aa3642d30a	MNT Update release dependencies	2023-09-01 09:41:44 +12:00
Guy Sartorelli	242f1e380e	MNT Update development dependencies	2023-08-31 14:08:07 +12:00
Guy Sartorelli	38ed474e80	MNT Update release dependencies	2023-08-31 14:08:07 +12:00