Skip to content

Commit

Permalink
Merge release/2.2.1 into master (#240)
Browse files Browse the repository at this point in the history
* Resolve popUpSkin load error (#233)

* Bump lodash from 4.17.15 to 4.17.19 (#227)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: upgrade @fortawesome/fontawesome-free from 5.13.0 to 5.13.1 (#225)

Snyk has created this PR to upgrade @fortawesome/fontawesome-free from 5.13.0 to 5.13.1.

See this package in NPM:
https://www.npmjs.com/package/@fortawesome/fontawesome-free

See this project in Snyk:
https://app.snyk.io/org/david-poindexter/project/b978b9ac-6ce2-4460-90e7-1aa147995d69?utm_source=github&utm_medium=upgrade-pr

* v2.2.1 (#238)

* Correct version issue in project-details (#239)

* v2.2.1

* Update project-details to change version to 2.2.1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Snyk bot <github+bot@snyk.io>
  • Loading branch information
3 people authored Aug 8, 2020
1 parent 59cc6cf commit d131cae
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "nvquicktheme",
"version": "2.2.0",
"version": "2.2.1",
"description": "Barebones Bootstrap 4 DNN Theme",
"main": "gulpfile.js",
"author": "nvisionative",
"license": "GPL-3.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.9.0",
"@fortawesome/fontawesome-free": "^5.13.1",
"bootstrap": "^4.4.1",
"normalize.css": "^8.0.1"
},
Expand Down
1 change: 1 addition & 0 deletions partials/_registers-popUpSkin.ascx
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<%@ Control Language="C#" AutoEventWireup="false" Explicit="True" Inherits="DotNetNuke.UI.Skins.Skin" %>
<%@ Register TagPrefix="dnn" TagName="META" Src="~/Admin/Skins/Meta.ascx" %>
<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" Assembly="DotNetNuke.Web.Client" %>
2 changes: 1 addition & 1 deletion project-details.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"project": "nvQuickTheme",
"version": "2.2.0",
"version": "2.2.1",
"author": "TK Sheppard &amp; David Poindexter",
"company": "nvisionative",
"url": "www.nvquicktheme.com",
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


"@fortawesome/fontawesome-free@^5.9.0":
version "5.13.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.0.tgz#fcb113d1aca4b471b709e8c9c168674fbd6e06d9"
integrity sha512-xKOeQEl5O47GPZYIMToj6uuA2syyFlq9EMSl2ui0uytjY9xbe8XS0pexNWmxrdcCyNGyDmLyYw5FtKsalBUeOg==
"@fortawesome/fontawesome-free@^5.13.1":
version "5.13.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz#c53b4066edae16cd1fd669f687baf031b45fb9d6"
integrity sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw==

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
Expand Down Expand Up @@ -3371,9 +3371,9 @@ lodash.templatesettings@^4.0.0:
lodash._reinterpolate "^3.0.0"

lodash@^4.0.0, lodash@^4.12.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@~4.17.11, lodash@~4.17.12:
version "4.17.15"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
version "4.17.19"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==

logalot@^2.0.0:
version "2.1.0"
Expand Down

0 comments on commit d131cae

Please sign in to comment.