From e68397d0c55cf25cbd269739951790cfdefa8397 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 28 Sep 2020 16:30:07 +0200 Subject: [PATCH] Updated bootstrap-switch to 3.4.0 --- CHANGELOG.md | 1 + app/frontend/packs/application.js | 4 ++-- package.json | 4 ++-- yarn.lock | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff8cca2a2..afcb17722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Updated FontAwesome from v4 to v5 - Updated jquery-minicolors to 2.3.5 - Updated angular-bootstrap-switch to 0.5.2 +- Updated bootstrap-switch to 3.4.0 ## v4.5.6 2020 September 1st diff --git a/app/frontend/packs/application.js b/app/frontend/packs/application.js index 80e3726f2..4e3a4b219 100644 --- a/app/frontend/packs/application.js +++ b/app/frontend/packs/application.js @@ -39,8 +39,8 @@ import 'nvd3/build/nv.d3.js'; import 'twitter-fetcher'; import 'medium-editor/dist/js/medium-editor'; import 'angular-medium-editor/dist/angular-medium-editor'; -import 'bootstrap-switch/dist/js/bootstrap-switch.min'; -import 'angular-bootstrap-switch/dist/angular-bootstrap-switch.min'; +import 'bootstrap-switch/dist/js/bootstrap-switch'; +import 'angular-bootstrap-switch/dist/angular-bootstrap-switch'; import 'angular-base64-upload/dist/angular-base64-upload.min'; import 'summernote'; import 'angular-summernote/dist/angular-summernote'; diff --git a/package.json b/package.json index f949b5f51..020a92bf8 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "webpack-dev-server": "^3.11.0" }, "dependencies": { - "@fortawesome/fontawesome-free": "5.14.0", "@claviska/jquery-minicolors": "^2.3.5", + "@fortawesome/fontawesome-free": "5.14.0", "@rails/webpacker": "5.2.1", "@uirouter/angularjs": "0.4", "AngularDevise": "https://github.com/cloudspace/angular_devise.git#1.0.2", @@ -67,7 +67,7 @@ "angular-unsavedchanges": "0.2", "angular-xeditable": "0.10", "bootstrap-sass": "3.4.1", - "bootstrap-switch": "3.3.2", + "bootstrap-switch": "^3.4.0", "checklist-model": "0.2", "codemirror": "^4.8.0", "d3": "3.5", diff --git a/yarn.lock b/yarn.lock index 0f2c20add..805159643 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1810,6 +1810,11 @@ bootstrap-switch@3.3.2: dependencies: jquery ">=1.9.0" +bootstrap-switch@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.4.0.tgz#6bbb0445ad8b4264883d06366d48aad3c06988f4" + integrity sha512-P4Qdx7mLjqgilKQeeuDCf8AHWeO7992+NFfh0doAA/ExaJqr02QFHhq18GL8EYd2XRviJ16pUUyMRsfOVaPEVg== + bootstrap@>=2.3.2: version "4.5.2" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab"