Merge branch 'master' into dependabot/pip/lxml-4.6.5

Build(deps): Bump lodash from 4.17.20 to 4.17.21 (#461 )
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-02-07 23:49:42 +00:00 · 2021-12-19 12:12:11 +00:00 · 2021-12-19 12:12:01 +00:00 · 2021-12-19 12:11:52 +00:00 · 2021-12-19 12:11:43 +00:00 · 2021-12-19 11:58:08 +00:00
5 changed files with 1159 additions and 11180 deletions
--- a/RIGS/templates/partials/item_row.html
+++ b/RIGS/templates/partials/item_row.html
--- a/RIGS/templates/partials/item_table.html
+++ b/RIGS/templates/partials/item_table.html
@@ -23,7 +23,7 @@
 		</thead>
 		<tbody id="item-table-body">
 			{% for item in object.items.all %}
-				{% include 'item_row.html' %}
+				{% include 'partials/item_row.html' %}
 			{% endfor %}
 		</tbody>
        {% if auth or perms.RIGS.view_event %}
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,7 +3,7 @@
 var gulp = require('gulp');

 const terser = require('gulp-uglify');
-const sass = require('gulp-sass');
+const sass = require('gulp-sass')(require('node-sass'));
 const flatten = require('gulp-flatten');
 const autoprefixer = require('autoprefixer')
 const postcss = require('gulp-postcss')
@@ -15,8 +15,6 @@ const cssnano = require('cssnano');
 const con = require('gulp-concat');
 const gulpif = require('gulp-if');

-sass.compiler = require('node-sass');
-
 function fonts(done) {
    return gulp.src('node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*')
        .pipe(gulp.dest('pipeline/built_assets/fonts'))
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,35 +5,36 @@
  "author": "Tom Price",
  "license": "Custom",
  "dependencies": {
-    "@forevolve/bootstrap-dark": "^1.0.0-alpha.1075",
-    "@fortawesome/fontawesome-free": "^5.15.2",
+    "@forevolve/bootstrap-dark": "^2.1.0",
+    "@fortawesome/fontawesome-free": "^5.15.4",
    "ajax-bootstrap-select": "^1.4.5",
-    "autocompleter": "^6.0.3",
-    "autoprefixer": "^9.8.0",
+    "autocompleter": "^6.1.2",
+    "autoprefixer": "^10.4.0",
    "bootstrap": "^4.5.2",
    "bootstrap-select": "^1.13.17",
-    "clipboard": "^2.0.6",
-    "cssnano": "^4.1.10",
+    "clipboard": "^2.0.8",
+    "cssnano": "^5.0.13",
    "flatpickr": "^4.6.6",
-    "fullcalendar": "^5.3.2",
+    "fullcalendar": "^5.10.1",
    "gulp": "^4.0.2",
    "gulp-concat": "^2.6.1",
    "gulp-flatten": "^0.4.0",
    "gulp-if": "^3.0.0",
-    "gulp-postcss": "^8.0.0",
-    "gulp-sass": "^4.1.0",
-    "gulp-sourcemaps": "^2.6.5",
+    "gulp-postcss": "^9.0.1",
+    "gulp-sass": "^5.0.0",
+    "gulp-sourcemaps": "^3.0.0",
    "gulp-uglify": "^3.0.2",
-    "html5sortable": "^0.10.0",
-    "jquery": "^3.5.1",
-    "konami": "^1.6.2",
+    "html5sortable": "^0.13.3",
+    "jquery": "^3.6.0",
+    "konami": "^1.6.3",
    "moment": "^2.27.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^7.0.0",
    "popper.js": "^1.16.1",
-    "uglify-js": "^3.12.6"
+    "postcss": "^8.4.5",
+    "uglify-js": "^3.14.5"
  },
  "devDependencies": {
-    "browser-sync": "^2.26.12"
+    "browser-sync": "^2.27.7"
  },
  "scripts": {
    "gulp": "gulp",
Author	SHA1	Message	Date
Arona Jones	ba444e8a9b	Merge branch 'master' into dependabot/pip/lxml-4.6.5	2021-12-19 12:12:11 +00:00
dependabot[bot]	708a387774	Build(deps): Bump lodash from 4.17.20 to 4.17.21 (#461 ) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-12-19 12:12:01 +00:00
dependabot[bot]	af6fe582e0	Build(deps): Bump hosted-git-info from 2.8.8 to 2.8.9 (#460 ) Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) --- updated-dependencies: - dependency-name: hosted-git-info dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-12-19 12:11:52 +00:00
dependabot[bot]	905a144e7d	Build(deps): Bump path-parse from 1.0.6 to 1.0.7 (#459 ) Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-12-19 12:11:43 +00:00
Arona Jones	f6d1b48301	Merge branch 'master' into dependabot/pip/lxml-4.6.5	2021-12-19 11:58:08 +00:00
Arona Jones	0e64021f01	Pin >8 ver of postcss	2021-12-19 11:49:58 +00:00
Arona Jones	2eb87a51f8	Update for gulp-sass change	2021-12-19 11:39:26 +00:00
Arona Jones	99132dd1c2	Merge branch 'master' into dependabot/pip/lxml-4.6.5	2021-12-19 11:27:43 +00:00
Arona Jones	30fac1d1b9	NPM Dependency update	2021-12-19 11:26:55 +00:00