From 61d03cc75f9226e0f1a701d5b41d0a750f6f4ada Mon Sep 17 00:00:00 2001 From: Dean Blackborough Date: Wed, 14 Jun 2023 15:04:39 +0100 Subject: [PATCH 1/3] Yarn - Use yarn via Node --- .gitignore | 2 + public/yarn.lock | 148 ++++++++++++++++++++++++++++++----------------- 2 files changed, 96 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index a885250..1d4e572 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ yarn-error.log public/node_modules .phpunit.cache/test-results .sass-cache/ +.yarn/ +public/.yarnrc.yml diff --git a/public/yarn.lock b/public/yarn.lock index 5ae0c48..b8e6e13 100644 --- a/public/yarn.lock +++ b/public/yarn.lock @@ -1,70 +1,110 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! +__metadata: + version: 6 + cacheKey: 8 -"@popperjs/core@^2.11.6": - version "2.11.6" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" - integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== +"@popperjs/core@npm:^2.11.6": + version: 2.11.6 + resolution: "@popperjs/core@npm:2.11.6" + checksum: 47fb328cec1924559d759b48235c78574f2d71a8a6c4c03edb6de5d7074078371633b91e39bbf3f901b32aa8af9b9d8f82834856d2f5737a23475036b16817f0 + languageName: node + linkType: hard -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 7b78c451df768adba04e2d02e63e2d0bf3b07adcd6e42b4cf665cb7ce899bedd344c69a1dcbce355b5f972d597b25aaa1c1742b52cffd9caccb22f348114f6be + languageName: node + linkType: hard -axios@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== +"axios@npm:^1.1.3": + version: 1.1.3 + resolution: "axios@npm:1.1.3" dependencies: - follow-redirects "^1.15.0" - form-data "^4.0.0" - proxy-from-env "^1.1.0" + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: cab3b17bf6092c9387f7023d699db093cfa23650b56c4422cd474d124b78b2e3b5a520f932c330664a58ab85b867b1c25a95cace475ef72d236888c852b84e6d + languageName: node + linkType: hard -bootstrap@^5.2.3: - version "5.2.3" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b" - integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ== +"bootstrap@npm:^5.2.3": + version: 5.2.3 + resolution: "bootstrap@npm:5.2.3" + peerDependencies: + "@popperjs/core": ^2.11.6 + checksum: 0211805dec6a190c0911d142966df30fdb4b4139a04cc6c23dd83c6045ea3cb0a966b360ab2e701e7b3ad96ff01e05fdc0914be97b41bd876b11e457a8bdc6a3 + languageName: node + linkType: hard -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== +"combined-stream@npm:^1.0.8": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" dependencies: - delayed-stream "~1.0.0" + delayed-stream: ~1.0.0 + checksum: 49fa4aeb4916567e33ea81d088f6584749fc90c7abec76fd516bf1c5aa5c79f3584b5ba3de6b86d26ddd64bae5329c4c7479343250cfe71c75bb366eae53bb7c + languageName: node + linkType: hard -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: 46fe6e83e2cb1d85ba50bd52803c68be9bd953282fa7096f51fc29edd5d67ff84ff753c51966061e5ba7cb5e47ef6d36a91924eddb7f3f3483b1c560f77a0020 + languageName: node + linkType: hard -follow-redirects@^1.15.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +"follow-redirects@npm:^1.15.0": + version: 1.15.2 + resolution: "follow-redirects@npm:1.15.2" + peerDependenciesMeta: + debug: + optional: true + checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 + languageName: node + linkType: hard -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== +"form-data@npm:^4.0.0": + version: 4.0.0 + resolution: "form-data@npm:4.0.0" dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" + asynckit: ^0.4.0 + combined-stream: ^1.0.8 + mime-types: ^2.1.12 + checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c + languageName: node + linkType: hard -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 0d99a03585f8b39d68182803b12ac601d9c01abfa28ec56204fa330bc9f3d1c5e14beb049bafadb3dbdf646dfb94b87e24d4ec7b31b7279ef906a8ea9b6a513f + languageName: node + linkType: hard -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== +"mime-types@npm:^2.1.12": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" dependencies: - mime-db "1.52.0" + mime-db: 1.52.0 + checksum: 89a5b7f1def9f3af5dad6496c5ed50191ae4331cc5389d7c521c8ad28d5fdad2d06fd81baf38fed813dc4e46bb55c8145bb0ff406330818c9cf712fb2e9b3836 + languageName: node + linkType: hard -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + +"root-workspace-0b6124@workspace:.": + version: 0.0.0-use.local + resolution: "root-workspace-0b6124@workspace:." + dependencies: + "@popperjs/core": ^2.11.6 + axios: ^1.1.3 + bootstrap: ^5.2.3 + languageName: unknown + linkType: soft From bc36845459903d9d75ed078312c2811f6539a83a Mon Sep 17 00:00:00 2001 From: Dean Blackborough Date: Wed, 14 Jun 2023 15:18:18 +0100 Subject: [PATCH 2/3] Content changes - Content corrections and changes --- resources/views/faqs.blade.php | 3 +- resources/views/landing.blade.php | 7 ++-- resources/views/version-compare.blade.php | 45 +++++++++++++++++------ 3 files changed, 40 insertions(+), 15 deletions(-) diff --git a/resources/views/faqs.blade.php b/resources/views/faqs.blade.php index 7599e2c..e36e89c 100644 --- a/resources/views/faqs.blade.php +++ b/resources/views/faqs.blade.php @@ -97,7 +97,8 @@ the downgrade but no data will be lost.

When will Budget Pro release?

-

We don't have a fixed release date but we're aiming for the first half of 2023.

+

Budget Pro was released into alpha on the 1st June. We are half through finishing + the development and pushing for a beta release in August/September.

Will you update Budget after you release Budget Pro?

Yes, both Budget and Budget Pro will receive regular updates and we have an diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php index d074cd8..251ef94 100644 --- a/resources/views/landing.blade.php +++ b/resources/views/landing.blade.php @@ -13,10 +13,11 @@

Budget

A budgeting tool so easy to use, it’s child play!

-

A free open source budgeting tool
+

A free and open source budgeting tool
powered by the Costs to Expect API.

If you need to collaborate or have more advanced budgeting requirements Budget Pro might - be more suitable for you. Budget Pro is currency in alpha and is free to use during the alpha and beta period.

+ be more suitable for you.

+

Budget Pro is currently in alpha and is FREE to use during the alpha and beta period.

Try Budget Pro Register for free Sign-in @@ -30,7 +31,7 @@

Simple

Our overview is so clear and simple, a child could manage your budget. - We wouldn’t recommend it, but you get the idea.

+ We would not recommend it, but you get the idea.

diff --git a/resources/views/version-compare.blade.php b/resources/views/version-compare.blade.php index e6ea04a..685a403 100644 --- a/resources/views/version-compare.blade.php +++ b/resources/views/version-compare.blade.php @@ -17,11 +17,14 @@

Budget and Budget Pro

-

Budget Pro is in development and we hope to have it released within the first - half of 2023. Please review the table below to see how Budget and Budget Pro compare -

+

Budget Pro + recently entered alpha, we are adding a few more features and expect to enter the + beta period soon.

+ +

During the alpha & beta period, Budget Pro + is FREE for all.

-

The tables below detail some of the features planned for Budget Pro.

+

The tables below detail the differences between Budget & Budget Pro.

@@ -124,6 +127,16 @@ No Planned First priority after the release of the Budget Pro beta + + Monthly Budgets + Yes + Yes + + + Weekly Budgets * + No + Yes + Fixed Budget Item Amounts Yes @@ -164,11 +177,6 @@ GBP, USD, EUR, CAD, AUD, NZD & INR GBP, USD, EUR, CAD, AUD, NZD & INR - - Currencies per Budget - 1 - 3 Multiple currencies supported on a Budget - Budget Item Frequencies Annually, Monthly & One-Off @@ -189,6 +197,11 @@ No Yes + + Cost + FREE + Monthly subscription or lifetime purchase + @@ -225,15 +238,25 @@ No Yes + + Set Datetime Format + No + Yes + Define Colours for Categories * No Yes - Number of Visible Months on Budget + Number of Visible Periods for Monthly Budget 3 - 3, 6, or 12 + 3, 6, 12 and quarterly + + + Number of Visible Periods for Weekly Budget + N/A + 4, 6, 13 and quarterly Customise Expense Bars * From 18015d1d177a0510f535d03a530338b614dad257 Mon Sep 17 00:00:00 2001 From: Dean Blackborough Date: Wed, 14 Jun 2023 15:22:28 +0100 Subject: [PATCH 3/3] Release - Date correction - Added release date and version --- composer.lock | 105 ++++++++++++++++++--------------- config/app/config.php | 4 +- resources/views/faqs.blade.php | 2 +- 3 files changed, 59 insertions(+), 52 deletions(-) diff --git a/composer.lock b/composer.lock index 67f9792..4691042 100644 --- a/composer.lock +++ b/composer.lock @@ -976,16 +976,16 @@ }, { "name": "laravel/framework", - "version": "v10.13.0", + "version": "v10.13.5", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "7322723585103082758d74917db62980684845cb" + "reference": "03106ae9ba2ec4b36dc973b7bdca6fad81e032b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/7322723585103082758d74917db62980684845cb", - "reference": "7322723585103082758d74917db62980684845cb", + "url": "https://api.github.com/repos/laravel/framework/zipball/03106ae9ba2ec4b36dc973b7bdca6fad81e032b4", + "reference": "03106ae9ba2ec4b36dc973b7bdca6fad81e032b4", "shasum": "" }, "require": { @@ -1172,7 +1172,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-05-30T14:46:25+00:00" + "time": "2023-06-08T20:25:36+00:00" }, { "name": "laravel/sanctum", @@ -5819,16 +5819,16 @@ }, { "name": "fakerphp/faker", - "version": "v1.22.0", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2" + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2", - "reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", + "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01", "shasum": "" }, "require": { @@ -5881,9 +5881,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.22.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0" }, - "time": "2023-05-14T12:31:37+00:00" + "time": "2023-06-12T08:44:38+00:00" }, { "name": "filp/whoops", @@ -6009,38 +6009,44 @@ }, { "name": "mockery/mockery", - "version": "1.5.1", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e" + "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e", - "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e", + "url": "https://api.github.com/repos/mockery/mockery/zipball/13a7fa2642c76c58fa2806ef7f565344c817a191", + "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": "^7.3 || ^8.0" + "php": "^7.4 || ^8.0" }, "conflict": { "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.3" + "phpunit/phpunit": "^8.5 || ^9.3", + "psalm/plugin-phpunit": "^0.18", + "vimeo/psalm": "^5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-main": "1.6.x-dev" } }, "autoload": { - "psr-0": { - "Mockery": "library/" + "files": [ + "library/helpers.php", + "library/Mockery.php" + ], + "psr-4": { + "Mockery\\": "library/Mockery" } }, "notification-url": "https://packagist.org/downloads/", @@ -6075,9 +6081,9 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.5.1" + "source": "https://github.com/mockery/mockery/tree/1.6.2" }, - "time": "2022-09-07T15:32:08+00:00" + "time": "2023-06-07T09:07:52+00:00" }, { "name": "myclabs/deep-copy", @@ -6657,16 +6663,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.8", + "version": "9.6.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e" + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/17d621b3aff84d0c8b62539e269e87d8d5baa76e", - "reference": "17d621b3aff84d0c8b62539e269e87d8d5baa76e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", + "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", "shasum": "" }, "require": { @@ -6740,7 +6746,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" }, "funding": [ { @@ -6756,7 +6762,7 @@ "type": "tidelift" } ], - "time": "2023-05-11T05:14:45+00:00" + "time": "2023-06-11T06:13:56+00:00" }, { "name": "roave/security-advisories", @@ -6764,17 +6770,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "e7a16840e9d12291c351fee9896838900f534d68" + "reference": "601b276d21df95e49f1802c7432b788cfaac15a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e7a16840e9d12291c351fee9896838900f534d68", - "reference": "e7a16840e9d12291c351fee9896838900f534d68", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/601b276d21df95e49f1802c7432b788cfaac15a8", + "reference": "601b276d21df95e49f1802c7432b788cfaac15a8", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.1.9", + "admidio/admidio": "<4.2.8", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<=2.2.1", "akaunting/akaunting": "<2.1.13", @@ -6845,7 +6851,7 @@ "contao/core-bundle": "<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "contao/managed-edition": "<=1.5", - "craftcms/cms": ">= 4.0.0-RC1, <= 4.4.5|>= 4.0.0-RC1, <= 4.4.6|<=3.8.5|>=4,<4.4.6|>= 4.0.0-RC1, < 4.4.6|>= 4.0.0-RC1, < 4.3.7|>= 4.0.0-RC1, < 4.2.1", + "craftcms/cms": ">= 4.0.0-RC1, < 4.4.12|>= 4.0.0-RC1, <= 4.4.5|>= 4.0.0-RC1, <= 4.4.6|<=3.8.5|>=4,<4.4.6|>= 4.0.0-RC1, < 4.4.6|>= 4.0.0-RC1, < 4.3.7|>= 4.0.0-RC1, < 4.2.1", "croogo/croogo": "<3.0.7", "cuyz/valinor": "<0.12", "czproject/git-php": "<4.0.3", @@ -6853,6 +6859,7 @@ "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", "dbrisinajumi/d2files": "<1", + "dcat/laravel-admin": "<=2.1.3-beta", "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", "directmailteam/direct-mail": "<5.2.4", @@ -6924,7 +6931,7 @@ "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "froala/wysiwyg-editor": "<3.2.7", - "froxlor/froxlor": "<2.0.16", + "froxlor/froxlor": "<2.1", "fuel/core": "<1.8.1", "funadmin/funadmin": "<=3.2", "gaoming13/wechat-php-sdk": "<=1.10.2", @@ -7026,7 +7033,7 @@ "melisplatform/melis-front": "<5.0.1", "mezzio/mezzio-swoole": "<3.7|>=4,<4.3", "mgallegos/laravel-jqgrid": "<=1.3", - "microweber/microweber": "<1.3.4", + "microweber/microweber": "<=1.3.4", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", "mobiledetect/mobiledetectlib": "<2.8.32", @@ -7098,10 +7105,10 @@ "pimcore/customer-management-framework-bundle": "<3.3.10", "pimcore/data-hub": "<1.2.4", "pimcore/perspective-editor": "<1.5.1", - "pimcore/pimcore": "<10.5.21", + "pimcore/pimcore": "<10.5.23", "pixelfed/pixelfed": "<=0.11.4", "pocketmine/bedrock-protocol": "<8.0.2", - "pocketmine/pocketmine-mp": "<4.12.5|>= 4.0.0-BETA5, < 4.4.2", + "pocketmine/pocketmine-mp": "<4.20.5|>=4.21,<4.21.1|< 4.18.0-ALPHA2|>= 4.0.0-BETA5, < 4.4.2", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", "prestashop/blockwishlist": ">=2,<2.1.1", @@ -7364,7 +7371,7 @@ "type": "tidelift" } ], - "time": "2023-05-31T16:04:38+00:00" + "time": "2023-06-14T05:04:21+00:00" }, { "name": "sebastian/cli-parser", @@ -8332,16 +8339,16 @@ }, { "name": "spatie/backtrace", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/spatie/backtrace.git", - "reference": "ec4dd16476b802dbdc6b4467f84032837e316b8c" + "reference": "47794d19e3215ace9e005a8f200cd7cc7be52572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/backtrace/zipball/ec4dd16476b802dbdc6b4467f84032837e316b8c", - "reference": "ec4dd16476b802dbdc6b4467f84032837e316b8c", + "url": "https://api.github.com/repos/spatie/backtrace/zipball/47794d19e3215ace9e005a8f200cd7cc7be52572", + "reference": "47794d19e3215ace9e005a8f200cd7cc7be52572", "shasum": "" }, "require": { @@ -8378,7 +8385,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/backtrace/tree/1.4.0" + "source": "https://github.com/spatie/backtrace/tree/1.4.1" }, "funding": [ { @@ -8390,7 +8397,7 @@ "type": "other" } ], - "time": "2023-03-04T08:57:24+00:00" + "time": "2023-06-13T14:35:04+00:00" }, { "name": "spatie/flare-client-php", @@ -8463,16 +8470,16 @@ }, { "name": "spatie/ignition", - "version": "1.8.0", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "ad13a6792992411e05d3d3b293e26bdf9f9a7321" + "reference": "d8eb8ea1ed27f48a694405cff363746ffd37f13e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/ad13a6792992411e05d3d3b293e26bdf9f9a7321", - "reference": "ad13a6792992411e05d3d3b293e26bdf9f9a7321", + "url": "https://api.github.com/repos/spatie/ignition/zipball/d8eb8ea1ed27f48a694405cff363746ffd37f13e", + "reference": "d8eb8ea1ed27f48a694405cff363746ffd37f13e", "shasum": "" }, "require": { @@ -8542,7 +8549,7 @@ "type": "github" } ], - "time": "2023-05-25T10:19:32+00:00" + "time": "2023-06-06T14:14:58+00:00" }, { "name": "spatie/laravel-ignition", diff --git a/config/app/config.php b/config/app/config.php index b4e6b95..60e57e6 100644 --- a/config/app/config.php +++ b/config/app/config.php @@ -11,8 +11,8 @@ 'item_subtype_id' => env('ITEM_SUBTYPE_ID'), 'cookie_user' => env('SESSION_NAME_USER'), 'cookie_bearer' => env('SESSION_NAME_BEARER'), - 'version' => 'v1.11.1', - 'release_date' => '2nd June 2023', + 'version' => 'v1.11.2', + 'release_date' => '14th June 2023', 'exception_notification_email' => env('EXCEPTION_NOTIFICATION_EMAIL'), 'timezone' => 'UTC', // We can allow users to override this later ]; diff --git a/resources/views/faqs.blade.php b/resources/views/faqs.blade.php index e36e89c..c1646ff 100644 --- a/resources/views/faqs.blade.php +++ b/resources/views/faqs.blade.php @@ -97,7 +97,7 @@ the downgrade but no data will be lost.

When will Budget Pro release?

-

Budget Pro was released into alpha on the 1st June. We are half through finishing +

Budget Pro was released into alpha on the 2nd June. We are half through finishing the development and pushing for a beta release in August/September.

Will you update Budget after you release Budget Pro?