Auto commit for release 'develop' on 2024-06-13

Merge pull request #8957 from JeroenED/unlimited-nesting-level
Remove nesting level for markdown
2025-12-25 12:41:20 +00:00 · 2024-06-13 05:08:55 +02:00 · 2024-06-11 15:17:43 +02:00 · 2024-06-11 15:04:15 +02:00 · 2024-06-11 15:03:09 +02:00 · 2024-06-10 05:09:13 +02:00
6 changed files with 875 additions and 790 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -1103,16 +1103,16 @@
        },
        {
            "name": "react/stream",
-            "version": "v1.3.0",
+            "version": "v1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/stream.git",
-                "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66"
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66",
-                "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
                "shasum": ""
            },
            "require": {
@@ -1122,7 +1122,7 @@
            },
            "require-dev": {
                "clue/stream-filter": "~1.2",
-                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
            },
            "type": "library",
            "autoload": {
@@ -1169,7 +1169,7 @@
            ],
            "support": {
                "issues": "https://github.com/reactphp/stream/issues",
-                "source": "https://github.com/reactphp/stream/tree/v1.3.0"
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
            },
            "funding": [
                {
@@ -1177,7 +1177,7 @@
                    "type": "open_collective"
                }
            ],
-            "time": "2023-06-16T10:52:11+00:00"
+            "time": "2024-06-11T12:45:25+00:00"
        },
        {
            "name": "sebastian/diff",
@@ -1248,16 +1248,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "5bcde9e0b2ea9bd9772bca17618365ea921c5707"
+                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5bcde9e0b2ea9bd9772bca17618365ea921c5707",
-                "reference": "5bcde9e0b2ea9bd9772bca17618365ea921c5707",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
+                "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3",
                "shasum": ""
            },
            "require": {
@@ -1321,7 +1321,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.0"
+                "source": "https://github.com/symfony/console/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1337,7 +1337,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1408,16 +1408,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "522d2772d6c7bab843b0c52466dc7844622bacc2"
+                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/522d2772d6c7bab843b0c52466dc7844622bacc2",
-                "reference": "522d2772d6c7bab843b0c52466dc7844622bacc2",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
+                "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7",
                "shasum": ""
            },
            "require": {
@@ -1468,7 +1468,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1484,7 +1484,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -1564,16 +1564,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "8ecdde25881598f86cdd7cfe8b25302b66a402e9"
+                "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/8ecdde25881598f86cdd7cfe8b25302b66a402e9",
-                "reference": "8ecdde25881598f86cdd7cfe8b25302b66a402e9",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2",
+                "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2",
                "shasum": ""
            },
            "require": {
@@ -1610,7 +1610,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.0"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1626,20 +1626,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/finder",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "fb6c2d65c3dbf7ad83201a4168d4510c8dddaac7"
+                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/fb6c2d65c3dbf7ad83201a4168d4510c8dddaac7",
-                "reference": "fb6c2d65c3dbf7ad83201a4168d4510c8dddaac7",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
+                "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6",
                "shasum": ""
            },
            "require": {
@@ -1674,7 +1674,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.0"
+                "source": "https://github.com/symfony/finder/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1690,20 +1690,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-28T18:29:00+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "9564f64c16f99e29f252eafc642965e8fcb755ce"
+                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9564f64c16f99e29f252eafc642965e8fcb755ce",
-                "reference": "9564f64c16f99e29f252eafc642965e8fcb755ce",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55",
+                "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55",
                "shasum": ""
            },
            "require": {
@@ -1741,7 +1741,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.1.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.1.1"
            },
            "funding": [
                {
@@ -1757,7 +1757,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -2235,16 +2235,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "56c8a1ea51eb70003fee94a78c7d6d0f44832ce7"
+                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/56c8a1ea51eb70003fee94a78c7d6d0f44832ce7",
-                "reference": "56c8a1ea51eb70003fee94a78c7d6d0f44832ce7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028",
+                "reference": "febf90124323a093c7ee06fdb30e765ca3c20028",
                "shasum": ""
            },
            "require": {
@@ -2276,7 +2276,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.0"
+                "source": "https://github.com/symfony/process/tree/v7.1.1"
            },
            "funding": [
                {
@@ -2292,7 +2292,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2379,16 +2379,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "13c750a45ac43c45f45d944d22499768aa1b72d8"
+                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/13c750a45ac43c45f45d944d22499768aa1b72d8",
-                "reference": "13c750a45ac43c45f45d944d22499768aa1b72d8",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
+                "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d",
                "shasum": ""
            },
            "require": {
@@ -2421,7 +2421,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.1.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.1.1"
            },
            "funding": [
                {
@@ -2437,20 +2437,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-05-31T14:57:53+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v7.1.0",
+            "version": "v7.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "6f41b185e742737917e6f2e3eca37767fba5f17a"
+                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/6f41b185e742737917e6f2e3eca37767fba5f17a",
-                "reference": "6f41b185e742737917e6f2e3eca37767fba5f17a",
+                "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2",
+                "reference": "60bc311c74e0af215101235aa6f471bcbc032df2",
                "shasum": ""
            },
            "require": {
@@ -2508,7 +2508,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.0"
+                "source": "https://github.com/symfony/string/tree/v7.1.1"
            },
            "funding": [
                {
@@ -2524,7 +2524,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-17T10:55:18+00:00"
+            "time": "2024-06-04T06:40:14+00:00"
        }
    ],
    "packages-dev": [],
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -186,7 +186,7 @@ class General extends AbstractExtension
                $converter = new GithubFlavoredMarkdownConverter(
                    [
                        'allow_unsafe_links' => false,
-                        'max_nesting_level'  => 3,
+                        'max_nesting_level'  => 5,
                        'html_input'         => 'escape',
                    ]
                );
--- a/composer.lock
+++ b/composer.lock
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -117,7 +117,7 @@ return [
        'expression_engine' => false,
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-06-03',
+    'version'                      => 'develop/2024-06-13',
    'api_version'                  => '2.1.0',
    'db_version'                   => 24,

--- a/package-lock.json
+++ b/package-lock.json
--- a/resources/views/accounts/reconcile/transactions.twig
+++ b/resources/views/accounts/reconcile/transactions.twig
@@ -63,6 +63,8 @@
                <div class="btn-group btn-group-xs">
                    <a href="{{ route('transactions.edit', [journal.transaction_group_id]) }}" class="btn btn-xs btn-default"><span
                                class="fa fa-fw fa-pencil"></span></a>
+                    <a href="{{ route('transactions.delete', [journal.transaction_group_id]) }}" class="btn btn-danger"><span
+                                class="fa fa-trash"></span></a>
                </div>

            </td>
Author	SHA1	Message	Date
github-actions	4c6fe0c8de	Auto commit for release 'develop' on 2024-06-13	2024-06-13 05:08:55 +02:00
James Cole	78f457950e	Merge pull request #8957 from JeroenED/unlimited-nesting-level Remove nesting level for markdown	2024-06-11 15:17:43 +02:00
Jeroen De Meerleer	d831cc8df2	Update max nesting level for Markdown converter Increased the max nesting level to 5 for better parsing.	2024-06-11 15:04:15 +02:00
James Cole	7056406afc	Merge pull request #8951 from stevewasiura/patch-3 add icon for delete action	2024-06-11 15:03:09 +02:00
github-actions	c85cfcf3e6	Auto commit for release 'develop' on 2024-06-10	2024-06-10 05:09:13 +02:00
Jeroen De Meerleer	db06d06789	Remove unnecessary option from Markdown converter The 'max_nesting_level' option was removed from the Markdown converter configuration in order to simplify and optimize the code.	2024-06-07 09:05:38 +02:00
github-actions	a28b990cd1	Auto commit for release 'develop' on 2024-06-06	2024-06-06 05:09:02 +02:00
Steve Wasiura	dab4bfa7a6	add icon for delete action in workflow of reconciling account, sometimes a record needs to be deleted (i.e. in event of a duplicated transaction from an import or error) and this change adds an icon to the delete route Signed-off-by: Steve Wasiura <steve@waztech.com>	2024-06-03 22:09:22 -04:00