Merge pull request #181 from deanblackborough/v2.11.0

v2.10.4
costs-to-expect · May 23, 2020 · dd1bd7b · dd1bd7b
2 parents d33650b + af72334
commit dd1bd7b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 The complete changelog for the Costs to Expect REST API, our changelog follows the format defined at https://keepachangelog.com/en/1.0.0/
 
+## [v2.10.4] - 2020-05-23
+### Fixed
+- We have adjusted the lottery value to reduce session clears.
+- We have updated to v3.5.1 of Jquery, v3.5.0 was bugged.
+
 ## [v2.10.3] - 2020-05-09
 ### Fixed
 - We have updated the delete resource type action; we have added additional checks before we attempt to delete, it was possible to remove relationship values which made the resource type inaccessible.

diff --git a/config/api/app/version.php b/config/api/app/version.php
@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 return [
-    'version'=> '2.10.3',
+    'version'=> '2.10.4',
     'prefix' => 'v2',
-    'release_date' => '2020-05-09',
+    'release_date' => '2020-05-23',
     'changelog' => [
         'api' => '/v2/changelog',
         'markdown' => 'https://github.com/costs-to-expect/api/blob/master/CHANGELOG.md'

diff --git a/config/session.php b/config/session.php
@@ -109,7 +109,7 @@
     |
     */
 
-    'lottery' => [2, 100],
+    'lottery' => [2, 1000],
 
     /*
     |--------------------------------------------------------------------------

diff --git a/public/package.json b/public/package.json
@@ -4,7 +4,7 @@
     "description": "The Costs to Expect API",
     "dependencies": {
         "bootstrap": "^4.3",
-        "jquery": "^3.5",
+        "jquery": "^3.5.1",
         "open-iconic": "^1.1.1",
         "popper.js": "^1.16"
     },

diff --git a/public/yarn.lock b/public/yarn.lock
@@ -7,10 +7,10 @@ bootstrap@^4.3:
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01"
   integrity sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA==
 
-jquery@^3.5:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
-  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
+jquery@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
 open-iconic@^1.1.1:
   version "1.1.1"

diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -252,6 +252,8 @@ function gtag(){dataLayer.push(arguments);}
                         <li>We have switched the table we look at to return created at for an item; we should be using the sub table, not the base item table.</li>
                         <li>We have corrected the `/resource-types/` OPTIONS request; `public` is not a required field.</li>
                         <li>We have updated the delete resource type action; we have added additional checks before we attempt to delete, it was possible to remove relationship values which made the resource type inaccessible.</li>
+                        <li>We have adjusted the lottery value to reduce session clears.</li>
+                        <li>We have updated to v3.5.1 of Jquery, v3.5.0 was bugged.</li>
                     </ul>
                 </div>
             </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,7 @@ @@
         |
         */
-        'lottery' => [2, 100],
+        'lottery' => [2, 1000],
         /*
         |--------------------------------------------------------------------------
@@ Expand Down @@