diff --git a/app/Lib/Logging/Handler/AbstractRallyWebhookHandler.php b/app/Lib/Logging/Handler/AbstractRallyWebhookHandler.php
index c8ca5ddff..e75277791 100644
--- a/app/Lib/Logging/Handler/AbstractRallyWebhookHandler.php
+++ b/app/Lib/Logging/Handler/AbstractRallyWebhookHandler.php
@@ -95,7 +95,7 @@ protected function getSlackData(array $record) : array {
if(!empty($objectData['objTrueSec'])){
// System trueSec
- $attachment['fields'][] = $this->generateAttachmentField('TrueSec', $objectData['objTrueSec']);
+ $attachment['fields'][] = $this->generateAttachmentField('TrueSec', strval($objectData['objTrueSec']));
}
if(!empty($objectData['objCountPlanets'])){
diff --git a/app/Model/Pathfinder/CorporationModel.php b/app/Model/Pathfinder/CorporationModel.php
index 17e39b26f..09815b7a0 100644
--- a/app/Model/Pathfinder/CorporationModel.php
+++ b/app/Model/Pathfinder/CorporationModel.php
@@ -379,6 +379,10 @@ public function getById(int $id, int $ttl = self::DEFAULT_SQL_TTL, bool $isActiv
public function saveStructure(StructureModel $structure){
if( !$structure->dry() ){
$corporationStructure = $this->rel('corporationStructures');
+
+ // reset in case of potential "contiue" from parent loop
+ $corporationStructure->reset();
+
$corporationStructure->corporationId = $this;
$corporationStructure->structureId = $structure;
$corporationStructure->save();
diff --git a/app/pathfinder.ini b/app/pathfinder.ini
index 0ba55f007..b0b4b0416 100644
--- a/app/pathfinder.ini
+++ b/app/pathfinder.ini
@@ -13,8 +13,8 @@ NAME = Pathfinder
; Version is used for CSS/JS cache busting and is part of the URL for static resources:
; e.g. public/js/vX.X.X/app.js
; Syntax: String (current version)
-; Default: v2.1.4
-VERSION = v2.1.4
+; Default: v2.2.0
+VERSION = v2.2.0
; Contact information [optional]
; Shown on 'licence', 'contact' page.
diff --git a/app/requirements.ini b/app/requirements.ini
index 73b083650..f4c3fbd6d 100644
--- a/app/requirements.ini
+++ b/app/requirements.ini
@@ -34,7 +34,7 @@ MAX_EXECUTION_TIME = 10
; max memory limit
; some requests e.g. build indexes on /setup page require more RAM
-MEMORY_LIMIT = 128M
+MEMORY_LIMIT = 256M
; max variable size for $_GET, $_POST and $_COOKIE
; this is required for importing larger maps
diff --git a/composer.json b/composer.json
index b636bd3fc..04e28a960 100644
--- a/composer.json
+++ b/composer.json
@@ -34,15 +34,15 @@
"ikkez/f3-cortex": "dev-master#af035616ae8d708776117e05603dac43835f3d9a",
"ikkez/f3-sheet": "0.4.*",
"xfra35/f3-cron": "1.2.*",
- "monolog/monolog": "2.3.4",
+ "monolog/monolog": "2.3.5",
"swiftmailer/swiftmailer": "6.2.*",
"league/html-to-markdown": "5.0.*",
- "cache/redis-adapter": "1.0.*",
+ "cache/redis-adapter": "1.1.*",
"cache/filesystem-adapter": "1.0.*",
"cache/array-adapter": "1.1.*",
"cache/void-adapter": "1.0.*",
"cache/namespaced-cache": "1.1.*",
- "react/socket": "1.3.*",
+ "react/socket": "1.9.*",
"react/promise-stream": "1.2.*",
"clue/ndjson-react": "1.2.*",
"firebase/php-jwt": "^5.4",
diff --git a/composer.lock b/composer.lock
index 9b827904b..18868dd70 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "1d2297f696ea64b10ef5cdc5ff8688c2",
+ "content-hash": "d3b5649c7fbb9f015a1352673ee89b59",
"packages": [
{
"name": "bcosca/fatfree-core",
@@ -179,27 +179,28 @@
},
{
"name": "cache/filesystem-adapter",
- "version": "1.0.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-cache/filesystem-adapter.git",
- "reference": "d50680b6dabbe39f9831f5fc9efa61c09d936017"
+ "reference": "1501ca71502f45114844824209e6a41d87afb221"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-cache/filesystem-adapter/zipball/d50680b6dabbe39f9831f5fc9efa61c09d936017",
- "reference": "d50680b6dabbe39f9831f5fc9efa61c09d936017",
+ "url": "https://api.github.com/repos/php-cache/filesystem-adapter/zipball/1501ca71502f45114844824209e6a41d87afb221",
+ "reference": "1501ca71502f45114844824209e6a41d87afb221",
"shasum": ""
},
"require": {
"cache/adapter-common": "^1.0",
"league/flysystem": "^1.0",
- "php": "^5.6 || ^7.0",
+ "php": "^5.6 || ^7.0 || ^8.0",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0"
},
"provide": {
- "psr/cache-implementation": "^1.0"
+ "psr/cache-implementation": "^1.0",
+ "psr/simple-cache-implementation": "^1.0"
},
"require-dev": {
"cache/integration-tests": "^0.16",
@@ -208,7 +209,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
@@ -232,7 +233,7 @@
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
+ "homepage": "https://github.com/nyholm"
}
],
"description": "A PSR-6 cache implementation using filesystem. This implementation supports tags",
@@ -244,9 +245,9 @@
"tag"
],
"support": {
- "source": "https://github.com/php-cache/filesystem-adapter/tree/master"
+ "source": "https://github.com/php-cache/filesystem-adapter/tree/1.1.0"
},
- "time": "2017-07-16T21:09:25+00:00"
+ "time": "2020-12-14T12:17:39+00:00"
},
{
"name": "cache/hierarchical-cache",
@@ -375,27 +376,28 @@
},
{
"name": "cache/redis-adapter",
- "version": "1.0.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-cache/redis-adapter.git",
- "reference": "95ab6c72739951c6cb44d0051b338bfd5aff806b"
+ "reference": "80645507231494f9daa874e7bc1bf85d72443188"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-cache/redis-adapter/zipball/95ab6c72739951c6cb44d0051b338bfd5aff806b",
- "reference": "95ab6c72739951c6cb44d0051b338bfd5aff806b",
+ "url": "https://api.github.com/repos/php-cache/redis-adapter/zipball/80645507231494f9daa874e7bc1bf85d72443188",
+ "reference": "80645507231494f9daa874e7bc1bf85d72443188",
"shasum": ""
},
"require": {
"cache/adapter-common": "^1.0",
"cache/hierarchical-cache": "^1.0",
- "php": "^5.6 || ^7.0",
+ "php": "^5.6 || ^7.0 || ^8.0",
"psr/cache": "^1.0",
"psr/simple-cache": "^1.0"
},
"provide": {
- "psr/cache-implementation": "^1.0"
+ "psr/cache-implementation": "^1.0",
+ "psr/simple-cache-implementation": "^1.0"
},
"require-dev": {
"cache/integration-tests": "^0.16",
@@ -407,7 +409,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
@@ -431,7 +433,7 @@
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com",
- "homepage": "https://github.com/Nyholm"
+ "homepage": "https://github.com/nyholm"
}
],
"description": "A PSR-6 cache implementation using Redis (PhpRedis). This implementation supports tags",
@@ -444,9 +446,9 @@
"tag"
],
"support": {
- "source": "https://github.com/php-cache/redis-adapter/tree/master"
+ "source": "https://github.com/php-cache/redis-adapter/tree/1.1.0"
},
- "time": "2017-07-16T21:09:25+00:00"
+ "time": "2020-12-14T12:17:39+00:00"
},
{
"name": "cache/tag-interop",
@@ -1575,16 +1577,16 @@
},
{
"name": "league/mime-type-detection",
- "version": "1.7.0",
+ "version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git",
- "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3"
+ "reference": "b38b25d7b372e9fddb00335400467b223349fd7e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
- "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3",
+ "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b38b25d7b372e9fddb00335400467b223349fd7e",
+ "reference": "b38b25d7b372e9fddb00335400467b223349fd7e",
"shasum": ""
},
"require": {
@@ -1615,7 +1617,7 @@
"description": "Mime-type detection for Flysystem",
"support": {
"issues": "https://github.com/thephpleague/mime-type-detection/issues",
- "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0"
+ "source": "https://github.com/thephpleague/mime-type-detection/tree/1.8.0"
},
"funding": [
{
@@ -1627,20 +1629,20 @@
"type": "tidelift"
}
],
- "time": "2021-01-18T20:58:21+00:00"
+ "time": "2021-09-25T08:23:19+00:00"
},
{
"name": "monolog/monolog",
- "version": "2.3.4",
+ "version": "2.3.5",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "437e7a1c50044b92773b361af77620efb76fff59"
+ "reference": "fd4380d6fc37626e2f799f29d91195040137eba9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437e7a1c50044b92773b361af77620efb76fff59",
- "reference": "437e7a1c50044b92773b361af77620efb76fff59",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd4380d6fc37626e2f799f29d91195040137eba9",
+ "reference": "fd4380d6fc37626e2f799f29d91195040137eba9",
"shasum": ""
},
"require": {
@@ -1656,7 +1658,7 @@
"elasticsearch/elasticsearch": "^7",
"graylog2/gelf-php": "^1.4.2",
"mongodb/mongodb": "^1.8",
- "php-amqplib/php-amqplib": "~2.4",
+ "php-amqplib/php-amqplib": "~2.4 || ^3",
"php-console/php-console": "^3.1.3",
"phpspec/prophecy": "^1.6.1",
"phpstan/phpstan": "^0.12.91",
@@ -1714,7 +1716,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
- "source": "https://github.com/Seldaek/monolog/tree/2.3.4"
+ "source": "https://github.com/Seldaek/monolog/tree/2.3.5"
},
"funding": [
{
@@ -1726,7 +1728,7 @@
"type": "tidelift"
}
],
- "time": "2021-09-15T11:27:21+00:00"
+ "time": "2021-10-01T21:08:31+00:00"
},
{
"name": "psr/cache",
@@ -2261,16 +2263,16 @@
},
{
"name": "react/promise-stream",
- "version": "v1.2.0",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise-stream.git",
- "reference": "6384d8b76cf7dcc44b0bf3343fb2b2928412d1fe"
+ "reference": "3ebd94fe0d8edbf44937948af28d02d5437e9949"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/promise-stream/zipball/6384d8b76cf7dcc44b0bf3343fb2b2928412d1fe",
- "reference": "6384d8b76cf7dcc44b0bf3343fb2b2928412d1fe",
+ "url": "https://api.github.com/repos/reactphp/promise-stream/zipball/3ebd94fe0d8edbf44937948af28d02d5437e9949",
+ "reference": "3ebd94fe0d8edbf44937948af28d02d5437e9949",
"shasum": ""
},
"require": {
@@ -2280,7 +2282,7 @@
},
"require-dev": {
"clue/block-react": "^1.0",
- "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35",
+ "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
"react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
"react/promise-timer": "^1.0"
},
@@ -2300,7 +2302,23 @@
"authors": [
{
"name": "Christian Lück",
- "email": "christian@lueck.tv"
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
}
],
"description": "The missing link between Promise-land and Stream-land for ReactPHP",
@@ -2315,9 +2333,19 @@
],
"support": {
"issues": "https://github.com/reactphp/promise-stream/issues",
- "source": "https://github.com/reactphp/promise-stream/tree/v1.2.0"
+ "source": "https://github.com/reactphp/promise-stream/tree/v1.3.0"
},
- "time": "2019-07-03T12:29:10+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/WyriHaximus",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/clue",
+ "type": "github"
+ }
+ ],
+ "time": "2021-10-18T10:47:09+00:00"
},
{
"name": "react/promise-timer",
@@ -2404,30 +2432,31 @@
},
{
"name": "react/socket",
- "version": "v1.3.0",
+ "version": "v1.9.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/socket.git",
- "reference": "10f0629ec83ea0fa22597f348623f554227e3ca0"
+ "reference": "aa6e3f8ebcd6dec3ad1ee92a449b4cc341994001"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/reactphp/socket/zipball/10f0629ec83ea0fa22597f348623f554227e3ca0",
- "reference": "10f0629ec83ea0fa22597f348623f554227e3ca0",
+ "url": "https://api.github.com/repos/reactphp/socket/zipball/aa6e3f8ebcd6dec3ad1ee92a449b4cc341994001",
+ "reference": "aa6e3f8ebcd6dec3ad1ee92a449b4cc341994001",
"shasum": ""
},
"require": {
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
"php": ">=5.3.0",
- "react/dns": "^1.0 || ^0.4.13",
- "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
+ "react/dns": "^1.8",
+ "react/event-loop": "^1.2",
"react/promise": "^2.6.0 || ^1.2.1",
"react/promise-timer": "^1.4.0",
- "react/stream": "^1.1"
+ "react/stream": "^1.2"
},
"require-dev": {
"clue/block-react": "^1.2",
- "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+ "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+ "react/promise-stream": "^1.2"
},
"type": "library",
"autoload": {
@@ -2439,6 +2468,28 @@
"license": [
"MIT"
],
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "email": "christian@clue.engineering",
+ "homepage": "https://clue.engineering/"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "email": "reactphp@ceesjankiewiet.nl",
+ "homepage": "https://wyrihaximus.net/"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "email": "jsorgalla@gmail.com",
+ "homepage": "https://sorgalla.com/"
+ },
+ {
+ "name": "Chris Boden",
+ "email": "cboden@gmail.com",
+ "homepage": "https://cboden.dev/"
+ }
+ ],
"description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
"keywords": [
"Connection",
@@ -2449,9 +2500,19 @@
],
"support": {
"issues": "https://github.com/reactphp/socket/issues",
- "source": "https://github.com/reactphp/socket/tree/v1.3.0"
+ "source": "https://github.com/reactphp/socket/tree/v1.9.0"
},
- "time": "2019-07-10T10:11:14+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/WyriHaximus",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/clue",
+ "type": "github"
+ }
+ ],
+ "time": "2021-08-03T12:37:06+00:00"
},
{
"name": "react/stream",
diff --git a/export/sql/eve_universe.sql.zip b/export/sql/eve_universe.sql.zip
index 7953149f9..117b33825 100644
Binary files a/export/sql/eve_universe.sql.zip and b/export/sql/eve_universe.sql.zip differ
diff --git a/js/app/init.js b/js/app/init.js
index 2ff035f57..609ba20d1 100644
--- a/js/app/init.js
+++ b/js/app/init.js
@@ -479,7 +479,7 @@ define([], () => {
},
wormholeSizes: {
wh_jump_mass_xl: {
- jumpMassMin: 1350000000,
+ jumpMassMin: 1000000000,
type: 'wh_jump_mass_xl',
class: 'pf-jump-mass-xl',
label: 'XL',
diff --git a/js/app/util.js b/js/app/util.js
index f7138ef00..9cef85a48 100644
--- a/js/app/util.js
+++ b/js/app/util.js
@@ -2611,7 +2611,7 @@ define([
row += userName;
row += '';
row += '
';
- row += shipName;
+ row += unicodeToString(shipName);
row += ' | ';
row += '';
row += shipTypeName;
diff --git a/package-lock.json b/package-lock.json
index 3dee29729..a22ed9a62 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "pathfinder-eve",
- "version": "2.1.4",
+ "version": "2.2.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -31,25 +31,26 @@
}
},
"@gulp-sourcemaps/identity-map": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz",
- "integrity": "sha512-ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz",
+ "integrity": "sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==",
"dev": true,
"requires": {
- "acorn": "^5.0.3",
- "css": "^2.2.1",
- "normalize-path": "^2.1.1",
+ "acorn": "^6.4.1",
+ "normalize-path": "^3.0.0",
+ "postcss": "^7.0.16",
"source-map": "^0.6.0",
- "through2": "^2.0.3"
+ "through2": "^3.0.1"
},
"dependencies": {
- "normalize-path": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
- "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "postcss": {
+ "version": "7.0.39",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+ "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
"dev": true,
"requires": {
- "remove-trailing-separator": "^1.0.1"
+ "picocolors": "^0.2.1",
+ "source-map": "^0.6.1"
}
},
"source-map": {
@@ -57,6 +58,16 @@
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
+ },
+ "through2": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
+ "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.4",
+ "readable-stream": "2 || 3"
+ }
}
}
},
@@ -114,9 +125,9 @@
"dev": true
},
"@types/glob": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz",
- "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+ "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
"dev": true,
"requires": {
"@types/minimatch": "*",
@@ -136,9 +147,9 @@
"dev": true
},
"@types/node": {
- "version": "16.9.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz",
- "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==",
+ "version": "16.11.8",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.8.tgz",
+ "integrity": "sha512-hmT5gfpRkkHr7DZZHMf3jBe/zNcVGN+jXSL2f8nAsYfBPxQFToKwQlS/zES4Sjp488Bi73i+p6bvrNRRGU0x9Q==",
"dev": true
},
"@types/normalize-package-data": {
@@ -161,9 +172,9 @@
"dev": true
},
"acorn": {
- "version": "5.7.4",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
- "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+ "version": "6.4.2",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+ "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
"dev": true
},
"ajv": {
@@ -218,9 +229,9 @@
}
},
"ansi-regex": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
},
"ansi-styles": {
@@ -561,17 +572,16 @@
"dev": true
},
"autoprefixer": {
- "version": "9.8.6",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
- "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+ "version": "10.3.4",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz",
+ "integrity": "sha512-EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw==",
"dev": true,
"requires": {
- "browserslist": "^4.12.0",
- "caniuse-lite": "^1.0.30001109",
- "colorette": "^1.2.1",
+ "browserslist": "^4.16.8",
+ "caniuse-lite": "^1.0.30001252",
+ "colorette": "^1.3.0",
+ "fraction.js": "^4.1.1",
"normalize-range": "^0.1.2",
- "num2fraction": "^1.2.2",
- "postcss": "^7.0.32",
"postcss-value-parser": "^4.1.0"
}
},
@@ -1107,27 +1117,10 @@
"get-value": "^2.0.6",
"has-value": "^1.0.0",
"isobject": "^3.0.1",
+ "set-value": "^2.0.0",
"to-object-path": "^0.3.0",
"union-value": "^1.0.0",
"unset-value": "^1.0.0"
- },
- "dependencies": {
- "set-value": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz",
- "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==",
- "requires": {
- "is-plain-object": "^2.0.4",
- "is-primitive": "^3.0.1"
- },
- "dependencies": {
- "is-primitive": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
- "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w=="
- }
- }
- }
}
},
"cacheable-request": {
@@ -1249,6 +1242,7 @@
"async-each": "^1.0.1",
"braces": "^2.3.2",
"fsevents": "^1.2.7",
+ "glob-parent": ">=5.1.2",
"inherits": "^2.0.3",
"is-binary-path": "^1.0.0",
"is-glob": "^4.0.0",
@@ -1259,11 +1253,24 @@
},
"dependencies": {
"glob-parent": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz",
- "integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==",
+ "version": ">=5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
"requires": {
- "is-glob": "^4.0.1"
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+ },
+ "dependencies": {
+ "is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "^2.1.0"
+ }
+ }
}
}
}
@@ -1574,15 +1581,14 @@
}
},
"css": {
- "version": "2.2.4",
- "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
- "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
+ "integrity": "sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==",
"dev": true,
"requires": {
- "inherits": "^2.0.3",
+ "inherits": "^2.0.4",
"source-map": "^0.6.1",
- "source-map-resolve": "^0.5.2",
- "urix": "^0.1.0"
+ "source-map-resolve": "^0.6.0"
},
"dependencies": {
"source-map": {
@@ -1590,6 +1596,16 @@
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
+ },
+ "source-map-resolve": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz",
+ "integrity": "sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==",
+ "dev": true,
+ "requires": {
+ "atob": "^2.1.2",
+ "decode-uri-component": "^0.2.0"
+ }
}
}
},
@@ -1603,7 +1619,17 @@
"boolbase": "^1.0.0",
"css-what": "^3.2.1",
"domutils": "^1.7.0",
- "nth-check": "^1.0.2"
+ "nth-check": "^2.0.1"
+ },
+ "dependencies": {
+ "nth-check": {
+ "version": "2.0.1",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "boolbase": "~1.0.0"
+ }
+ }
}
},
"css-select-base-adapter": {
@@ -2334,9 +2360,9 @@
}
},
"es-abstract": {
- "version": "1.18.6",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
- "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
+ "version": "1.19.1",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
+ "integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
"dev": true,
"optional": true,
"requires": {
@@ -2351,7 +2377,9 @@
"is-callable": "^1.2.4",
"is-negative-zero": "^2.0.1",
"is-regex": "^1.1.4",
+ "is-shared-array-buffer": "^1.0.1",
"is-string": "^1.0.7",
+ "is-weakref": "^1.0.1",
"object-inspect": "^1.11.0",
"object-keys": "^1.1.1",
"object.assign": "^4.1.2",
@@ -2770,15 +2798,6 @@
"to-regex-range": "^5.0.1"
}
},
- "glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dev": true,
- "requires": {
- "is-glob": "^4.0.1"
- }
- },
"is-number": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -2819,13 +2838,13 @@
"dev": true
},
"fast-xml-parser": {
- "version": "3.20.0",
- "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.20.0.tgz",
- "integrity": "sha512-cMQwDJYVDjMPU56DviszewgMKuNzuf4NQSBuDf9RgZ6FKm5QEMxW05Za8lvnuL6moxoeZVUWBlL733WmovvV6g==",
+ "version": "3.21.1",
+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz",
+ "integrity": "sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==",
"dev": true,
"optional": true,
"requires": {
- "strnum": "^1.0.3"
+ "strnum": "^1.0.4"
}
},
"fastq": {
@@ -2945,7 +2964,7 @@
"integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
"dev": true,
"requires": {
- "semver-regex": "^2.0.0"
+ "semver-regex": ">=3.1.3"
}
},
"findup-sync": {
@@ -3033,6 +3052,12 @@
"mime-types": "^2.1.12"
}
},
+ "fraction.js": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+ "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+ "dev": true
+ },
"fragment-cache": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -3219,16 +3244,15 @@
}
},
"gifsicle": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-5.2.0.tgz",
- "integrity": "sha512-vOIS3j0XoTCxq9pkGj43gEix82RkI5FveNgaFZutjbaui/HH+4fR8Y56dwXDuxYo8hR4xOo6/j2h1WHoQW6XLw==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-5.2.1.tgz",
+ "integrity": "sha512-9ewIQQCAnSmkU2DhuWafd1DdsgzAkKqIWnY+023xBLSiK9Az2TDUozWQW+SyRQgFMclbe6RQldUk/49TRO3Aqw==",
"dev": true,
"optional": true,
"requires": {
"bin-build": "^3.0.0",
"bin-wrapper": "^4.0.0",
- "execa": "^5.0.0",
- "logalot": "^2.0.0"
+ "execa": "^5.0.0"
},
"dependencies": {
"cross-spawn": {
@@ -3335,6 +3359,15 @@
"path-is-absolute": "^1.0.0"
}
},
+ "glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
+ "requires": {
+ "is-glob": "^4.0.1"
+ }
+ },
"glob-stream": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
@@ -3343,6 +3376,7 @@
"requires": {
"extend": "^3.0.0",
"glob": "^7.1.1",
+ "glob-parent": "^5.1.2",
"is-negated-glob": "^1.0.0",
"ordered-read-streams": "^1.0.0",
"pumpify": "^1.3.5",
@@ -3356,8 +3390,21 @@
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "dev": true,
"requires": {
- "is-glob": "^4.0.1"
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
+ },
+ "dependencies": {
+ "is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "^2.1.0"
+ }
+ }
}
}
}
@@ -3566,27 +3613,37 @@
}
},
"gulp-autoprefixer": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-7.0.1.tgz",
- "integrity": "sha512-QJGEmHw+bEt7FSqvmbAUTxbCuNLJYx4sz3ox9WouYqT/7j5FH5CQ8ZnpL1M7H5npX1bUJa7lUVY1w20jXxhOxg==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-8.0.0.tgz",
+ "integrity": "sha512-sVR++PIaXpa81p52dmmA/jt50bw0egmylK5mjagfgOJ8uLDGaF9tHyzvetkY9Uo0gBZUS5sVqN3kX/GlUKOyog==",
"dev": true,
"requires": {
- "autoprefixer": "^9.6.1",
- "fancy-log": "^1.3.2",
+ "autoprefixer": "^10.2.6",
+ "fancy-log": "^1.3.3",
"plugin-error": "^1.0.1",
- "postcss": "^7.0.17",
- "through2": "^3.0.1",
+ "postcss": "^8.3.0",
+ "through2": "^4.0.2",
"vinyl-sourcemaps-apply": "^0.2.1"
},
"dependencies": {
+ "readable-stream": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "dev": true,
+ "requires": {
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
+ }
+ },
"through2": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz",
- "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==",
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+ "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
"dev": true,
"requires": {
- "inherits": "^2.0.4",
- "readable-stream": "2 || 3"
+ "readable-stream": "3"
}
}
}
@@ -3662,14 +3719,15 @@
}
},
"gulp-filter": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-6.0.0.tgz",
- "integrity": "sha512-veQFW93kf6jBdWdF/RxMEIlDK2mkjHyPftM381DID2C9ImTVngwYpyyThxm4/EpgcNOT37BLefzMOjEKbyYg0Q==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-7.0.0.tgz",
+ "integrity": "sha512-ZGWtJo0j1mHfP77tVuhyqem4MRA5NfNRjoVe6VAkLGeQQ/QGo2VsFwp7zfPTGDsd1rwzBmoDHhxpE6f5B3Zuaw==",
"dev": true,
"requires": {
- "multimatch": "^4.0.0",
+ "multimatch": "^5.0.0",
"plugin-error": "^1.0.1",
- "streamfilter": "^3.0.0"
+ "streamfilter": "^3.0.0",
+ "to-absolute-glob": "^2.0.2"
}
},
"gulp-gm": {
@@ -3846,21 +3904,6 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
}
}
},
@@ -4048,22 +4091,22 @@
}
},
"gulp-sourcemaps": {
- "version": "2.6.5",
- "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz",
- "integrity": "sha512-SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg==",
- "dev": true,
- "requires": {
- "@gulp-sourcemaps/identity-map": "1.X",
- "@gulp-sourcemaps/map-sources": "1.X",
- "acorn": "5.X",
- "convert-source-map": "1.X",
- "css": "2.X",
- "debug-fabulous": "1.X",
- "detect-newline": "2.X",
- "graceful-fs": "4.X",
- "source-map": "~0.6.0",
- "strip-bom-string": "1.X",
- "through2": "2.X"
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz",
+ "integrity": "sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==",
+ "dev": true,
+ "requires": {
+ "@gulp-sourcemaps/identity-map": "^2.0.1",
+ "@gulp-sourcemaps/map-sources": "^1.0.0",
+ "acorn": "^6.4.1",
+ "convert-source-map": "^1.0.0",
+ "css": "^3.0.0",
+ "debug-fabulous": "^1.0.0",
+ "detect-newline": "^2.0.0",
+ "graceful-fs": "^4.0.0",
+ "source-map": "^0.6.0",
+ "strip-bom-string": "^1.0.0",
+ "through2": "^2.0.0"
},
"dependencies": {
"source-map": {
@@ -4117,6 +4160,7 @@
"lodash._reescape": "^3.0.0",
"lodash._reevaluate": "^3.0.0",
"lodash._reinterpolate": "^3.0.0",
+ "lodash.template": ">=4.5.0",
"minimist": "^1.1.0",
"multipipe": "^0.1.2",
"object-assign": "^3.0.0",
@@ -4156,23 +4200,6 @@
"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
"dev": true
},
- "lodash.template": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
- "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
- "requires": {
- "lodash._reinterpolate": "^3.0.0",
- "lodash.templatesettings": "^4.0.0"
- }
- },
- "lodash.templatesettings": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
- "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
- "requires": {
- "lodash._reinterpolate": "^3.0.0"
- }
- },
"replace-ext": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
@@ -4439,9 +4466,9 @@
"dev": true
},
"ignore": {
- "version": "5.1.8",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
- "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+ "version": "5.1.9",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
+ "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
"dev": true
},
"imagemin": {
@@ -4763,7 +4790,8 @@
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "dev": true
},
"is-finite": {
"version": "1.1.0",
@@ -4803,6 +4831,7 @@
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+ "dev": true,
"requires": {
"is-extglob": "^2.1.1"
}
@@ -4909,6 +4938,7 @@
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dev": true,
"requires": {
"isobject": "^3.0.1"
}
@@ -4958,6 +4988,13 @@
"integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==",
"dev": true
},
+ "is-shared-array-buffer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
+ "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
+ "dev": true,
+ "optional": true
+ },
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -5021,6 +5058,16 @@
"integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
"dev": true
},
+ "is-weakref": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
+ "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "call-bind": "^1.0.0"
+ }
+ },
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -5051,7 +5098,8 @@
"isobject": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
},
"isstream": {
"version": "0.1.2",
@@ -5332,6 +5380,36 @@
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
},
+ "lodash._basecopy": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+ "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
+ "dev": true
+ },
+ "lodash._basetostring": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+ "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
+ "dev": true
+ },
+ "lodash._basevalues": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+ "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
+ "dev": true
+ },
+ "lodash._getnative": {
+ "version": "3.9.1",
+ "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+ "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+ "dev": true
+ },
+ "lodash._isiterateecall": {
+ "version": "3.0.9",
+ "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+ "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
+ "dev": true
+ },
"lodash._reescape": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
@@ -5347,7 +5425,14 @@
"lodash._reinterpolate": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
- "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+ "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+ "dev": true
+ },
+ "lodash._root": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+ "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
+ "dev": true
},
"lodash.assign": {
"version": "4.2.0",
@@ -5367,12 +5452,44 @@
"integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=",
"dev": true
},
+ "lodash.escape": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+ "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+ "dev": true,
+ "requires": {
+ "lodash._root": "^3.0.0"
+ }
+ },
+ "lodash.isarguments": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+ "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+ "dev": true
+ },
+ "lodash.isarray": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+ "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+ "dev": true
+ },
"lodash.isobject": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz",
"integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=",
"dev": true
},
+ "lodash.keys": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+ "dev": true,
+ "requires": {
+ "lodash._getnative": "^3.0.0",
+ "lodash.isarguments": "^3.0.0",
+ "lodash.isarray": "^3.0.0"
+ }
+ },
"lodash.merge": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -5385,6 +5502,37 @@
"integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
"dev": true
},
+ "lodash.restparam": {
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+ "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
+ "dev": true
+ },
+ "lodash.template": {
+ "version": ">=4.5.0",
+ "dev": true,
+ "requires": {
+ "lodash._basecopy": "^3.0.0",
+ "lodash._basetostring": "^3.0.0",
+ "lodash._basevalues": "^3.0.0",
+ "lodash._isiterateecall": "^3.0.0",
+ "lodash._reinterpolate": "^3.0.0",
+ "lodash.escape": "^3.0.0",
+ "lodash.keys": "^3.0.0",
+ "lodash.restparam": "^3.0.0",
+ "lodash.templatesettings": "^3.0.0"
+ }
+ },
+ "lodash.templatesettings": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
+ "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
+ "dev": true,
+ "requires": {
+ "lodash._reinterpolate": "^3.0.0",
+ "lodash.escape": "^3.0.0"
+ }
+ },
"log-symbols": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
@@ -5632,7 +5780,8 @@
"normalize-package-data": "^2.3.4",
"object-assign": "^4.0.1",
"read-pkg-up": "^1.0.1",
- "redent": "^1.0.0"
+ "redent": "^1.0.0",
+ "trim-newlines": ">=3.0.1"
},
"dependencies": {
"object-assign": {
@@ -5640,11 +5789,6 @@
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true
- },
- "trim-newlines": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz",
- "integrity": "sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew=="
}
}
},
@@ -5842,9 +5986,9 @@
"dev": true
},
"multimatch": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz",
- "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz",
+ "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==",
"dev": true,
"requires": {
"@types/minimatch": "^3.0.3",
@@ -5883,6 +6027,12 @@
"integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
"dev": true
},
+ "nanoid": {
+ "version": "3.1.25",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+ "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==",
+ "dev": true
+ },
"nanomatch": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -6162,7 +6312,7 @@
"normalize-package-data": "^3.0.0",
"read-pkg-up": "^7.0.1",
"redent": "^3.0.0",
- "trim-newlines": "^3.0.0",
+ "trim-newlines": ">=3.0.1",
"type-fest": "^0.18.0",
"yargs-parser": "^20.2.3"
}
@@ -6453,22 +6603,6 @@
"set-blocking": "~2.0.0"
}
},
- "nth-check": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
- "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
- "dev": true,
- "optional": true,
- "requires": {
- "boolbase": "~1.0.0"
- }
- },
- "num2fraction": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
- "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
- "dev": true
- },
"number-is-nan": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -6565,15 +6699,15 @@
}
},
"object.getownpropertydescriptors": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
- "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz",
+ "integrity": "sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==",
"dev": true,
"optional": true,
"requires": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3",
- "es-abstract": "^1.18.0-next.2"
+ "es-abstract": "^1.19.1"
}
},
"object.map": {
@@ -6606,15 +6740,15 @@
}
},
"object.values": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
- "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+ "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
"dev": true,
"optional": true,
"requires": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3",
- "es-abstract": "^1.18.2"
+ "es-abstract": "^1.19.1"
}
},
"once": {
@@ -6800,6 +6934,12 @@
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
"dev": true
},
+ "path-dirname": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+ "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+ "dev": true
+ },
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@@ -6871,6 +7011,12 @@
"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
"dev": true
},
+ "picocolors": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+ "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+ "dev": true
+ },
"picomatch": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
@@ -6937,22 +7083,14 @@
"dev": true
},
"postcss": {
- "version": "7.0.36",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
- "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+ "version": "8.3.6",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
+ "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
"dev": true,
"requires": {
- "chalk": "^2.4.2",
- "source-map": "^0.6.1",
- "supports-color": "^6.1.0"
- },
- "dependencies": {
- "source-map": {
- "version": "0.6.1",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
- "dev": true
- }
+ "colorette": "^1.2.2",
+ "nanoid": "^3.1.23",
+ "source-map-js": "^0.6.2"
}
},
"postcss-value-parser": {
@@ -7519,10 +7657,9 @@
},
"dependencies": {
"ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
- "dev": true
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
},
"camelcase": {
"version": "5.3.1",
@@ -7611,6 +7748,14 @@
"dev": true,
"requires": {
"ansi-regex": "^4.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "dev": true
+ }
}
},
"which-module": {
@@ -7719,9 +7864,7 @@
}
},
"semver-regex": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
- "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
+ "version": ">=3.1.3",
"dev": true
},
"semver-truncate": {
@@ -7745,6 +7888,29 @@
"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
"dev": true
},
+ "set-value": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ }
+ }
+ },
"shebang-command": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -7791,9 +7957,9 @@
"dev": true
},
"slash": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
- "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+ "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
"dev": true
},
"snapdragon": {
@@ -7927,6 +8093,12 @@
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
+ "source-map-js": {
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
+ "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+ "dev": true
+ },
"source-map-resolve": {
"version": "0.5.3",
"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
@@ -8216,6 +8388,14 @@
"dev": true,
"requires": {
"ansi-regex": "^2.0.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "dev": true
+ }
}
},
"strip-bom": {
@@ -8280,19 +8460,27 @@
}
},
"strnum": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.3.tgz",
- "integrity": "sha512-GVoRjsqAYZkAH16GDzfTuafuwKxzKdaaCQyLaWf37gOP1e2PPbAKWoME1OmO+c4RCKMfNrrPRDLFCNBFU45N/A==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.4.tgz",
+ "integrity": "sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw==",
"dev": true,
"optional": true
},
"supports-color": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
- "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
- "has-flag": "^3.0.0"
+ "has-flag": "^4.0.0"
+ },
+ "dependencies": {
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true
+ }
}
},
"sver-compat": {
@@ -8598,6 +8786,12 @@
"integrity": "sha1-x/wnpbVDCtSGJnrmZtkj90oKsyA=",
"dev": true
},
+ "trim-newlines": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+ "dev": true
+ },
"trim-repeated": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz",
@@ -8734,31 +8928,29 @@
"requires": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
- "is-extendable": "^0.1.1"
+ "is-extendable": "^0.1.1",
+ "set-value": "^2.0.1"
},
"dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "^0.1.0"
+ }
+ },
"set-value": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz",
- "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+ "dev": true,
"requires": {
- "is-plain-object": "^2.0.4",
- "is-primitive": "^3.0.1"
- },
- "dependencies": {
- "is-plain-object": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "requires": {
- "isobject": "^3.0.1"
- }
- },
- "is-primitive": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
- "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w=="
- }
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
}
}
}
@@ -9094,14 +9286,18 @@
"set-blocking": "^2.0.0",
"string-width": "^1.0.2",
"which-module": "^1.0.0",
- "y18n": "^3.2.1"
- },
- "dependencies": {
- "yargs-parser": {
- "version": "20.2.9",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
- "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
- }
+ "y18n": "^3.2.1",
+ "yargs-parser": "^5.0.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz",
+ "integrity": "sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^3.0.0",
+ "object.assign": "^4.1.0"
}
},
"yauzl": {
diff --git a/package.json b/package.json
index 9760c6572..02e29de35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "pathfinder-eve",
- "version": "2.1.4",
+ "version": "2.2.0",
"engines": {
"node": "12.x"
},
@@ -14,12 +14,12 @@
"file-extension": "^4.0.5",
"flat": "^5.0.0",
"gulp": "^4.0.2",
- "gulp-autoprefixer": "^7.0.1",
+ "gulp-autoprefixer": "^8.0.0",
"gulp-brotli": "^3.0.0",
"gulp-bytediff": "1.0.x",
"gulp-clean-css": "^4.3.0",
"gulp-debug": "^4.0.0",
- "gulp-filter": "^6.0.0",
+ "gulp-filter": "^7.0.0",
"gulp-gzip": "1.x.x",
"gulp-if": "^3.0.0",
"gulp-image-resize": "^0.13.1 ",
@@ -28,7 +28,7 @@
"gulp-rename": "^2.0.0",
"gulp-requirejs-optimize": "1.3.x",
"gulp-sass": "^5.0.0",
- "gulp-sourcemaps": "^2.6.5",
+ "gulp-sourcemaps": "^3.0.0",
"gulp-uglify": "^3.0.2",
"imagemin-webp": "^6.0.0",
"jshint": "^2.11.0",
@@ -39,7 +39,7 @@
"pretty-bytes": "^5.3.0",
"promised-del": "1.0.x",
"sass": "^1.41.1",
- "slash": "3.0.0",
+ "slash": "4.0.0",
"terminal-table": "0.0.x",
"uglify-es": "^3.0.x"
},
diff --git a/public/css/v2.1.4/pathfinder.css b/public/css/v2.2.0/pathfinder.css
similarity index 100%
rename from public/css/v2.1.4/pathfinder.css
rename to public/css/v2.2.0/pathfinder.css
diff --git a/public/css/v2.1.4/pathfinder.css.br b/public/css/v2.2.0/pathfinder.css.br
similarity index 100%
rename from public/css/v2.1.4/pathfinder.css.br
rename to public/css/v2.2.0/pathfinder.css.br
diff --git a/public/css/v2.1.4/pathfinder.css.map b/public/css/v2.2.0/pathfinder.css.map
similarity index 100%
rename from public/css/v2.1.4/pathfinder.css.map
rename to public/css/v2.2.0/pathfinder.css.map
diff --git a/public/img/v2.1.4/gallery/admin_1.jpg b/public/img/v2.2.0/gallery/admin_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/admin_1.jpg
rename to public/img/v2.2.0/gallery/admin_1.jpg
diff --git a/public/img/v2.1.4/gallery/admin_1.webp b/public/img/v2.2.0/gallery/admin_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/admin_1.webp
rename to public/img/v2.2.0/gallery/admin_1.webp
diff --git a/public/img/v2.1.4/gallery/admin_2.jpg b/public/img/v2.2.0/gallery/admin_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/admin_2.jpg
rename to public/img/v2.2.0/gallery/admin_2.jpg
diff --git a/public/img/v2.1.4/gallery/admin_2.webp b/public/img/v2.2.0/gallery/admin_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/admin_2.webp
rename to public/img/v2.2.0/gallery/admin_2.webp
diff --git a/public/img/v2.1.4/gallery/connection_1.jpg b/public/img/v2.2.0/gallery/connection_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/connection_1.jpg
rename to public/img/v2.2.0/gallery/connection_1.jpg
diff --git a/public/img/v2.1.4/gallery/connection_1.webp b/public/img/v2.2.0/gallery/connection_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/connection_1.webp
rename to public/img/v2.2.0/gallery/connection_1.webp
diff --git a/public/img/v2.1.4/gallery/development_1.jpg b/public/img/v2.2.0/gallery/development_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/development_1.jpg
rename to public/img/v2.2.0/gallery/development_1.jpg
diff --git a/public/img/v2.1.4/gallery/development_1.webp b/public/img/v2.2.0/gallery/development_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/development_1.webp
rename to public/img/v2.2.0/gallery/development_1.webp
diff --git a/public/img/v2.1.4/gallery/development_2.jpg b/public/img/v2.2.0/gallery/development_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/development_2.jpg
rename to public/img/v2.2.0/gallery/development_2.jpg
diff --git a/public/img/v2.1.4/gallery/development_2.webp b/public/img/v2.2.0/gallery/development_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/development_2.webp
rename to public/img/v2.2.0/gallery/development_2.webp
diff --git a/public/img/v2.1.4/gallery/discord_1.jpg b/public/img/v2.2.0/gallery/discord_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/discord_1.jpg
rename to public/img/v2.2.0/gallery/discord_1.jpg
diff --git a/public/img/v2.1.4/gallery/discord_1.webp b/public/img/v2.2.0/gallery/discord_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/discord_1.webp
rename to public/img/v2.2.0/gallery/discord_1.webp
diff --git a/public/img/v2.1.4/gallery/install_db.jpg b/public/img/v2.2.0/gallery/install_db.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/install_db.jpg
rename to public/img/v2.2.0/gallery/install_db.jpg
diff --git a/public/img/v2.1.4/gallery/install_db.webp b/public/img/v2.2.0/gallery/install_db.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/install_db.webp
rename to public/img/v2.2.0/gallery/install_db.webp
diff --git a/public/img/v2.1.4/gallery/install_settings.jpg b/public/img/v2.2.0/gallery/install_settings.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/install_settings.jpg
rename to public/img/v2.2.0/gallery/install_settings.jpg
diff --git a/public/img/v2.1.4/gallery/install_settings.webp b/public/img/v2.2.0/gallery/install_settings.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/install_settings.webp
rename to public/img/v2.2.0/gallery/install_settings.webp
diff --git a/public/img/v2.1.4/gallery/intel_1.jpg b/public/img/v2.2.0/gallery/intel_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/intel_1.jpg
rename to public/img/v2.2.0/gallery/intel_1.jpg
diff --git a/public/img/v2.1.4/gallery/intel_1.webp b/public/img/v2.2.0/gallery/intel_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/intel_1.webp
rename to public/img/v2.2.0/gallery/intel_1.webp
diff --git a/public/img/v2.1.4/gallery/kb_1.jpg b/public/img/v2.2.0/gallery/kb_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/kb_1.jpg
rename to public/img/v2.2.0/gallery/kb_1.jpg
diff --git a/public/img/v2.1.4/gallery/kb_1.webp b/public/img/v2.2.0/gallery/kb_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/kb_1.webp
rename to public/img/v2.2.0/gallery/kb_1.webp
diff --git a/public/img/v2.1.4/gallery/kb_2.jpg b/public/img/v2.2.0/gallery/kb_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/kb_2.jpg
rename to public/img/v2.2.0/gallery/kb_2.jpg
diff --git a/public/img/v2.1.4/gallery/kb_2.webp b/public/img/v2.2.0/gallery/kb_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/kb_2.webp
rename to public/img/v2.2.0/gallery/kb_2.webp
diff --git a/public/img/v2.1.4/gallery/log_1.jpg b/public/img/v2.2.0/gallery/log_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/log_1.jpg
rename to public/img/v2.2.0/gallery/log_1.jpg
diff --git a/public/img/v2.1.4/gallery/log_1.webp b/public/img/v2.2.0/gallery/log_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/log_1.webp
rename to public/img/v2.2.0/gallery/log_1.webp
diff --git a/public/img/v2.1.4/gallery/login_1.jpg b/public/img/v2.2.0/gallery/login_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/login_1.jpg
rename to public/img/v2.2.0/gallery/login_1.jpg
diff --git a/public/img/v2.1.4/gallery/login_1.webp b/public/img/v2.2.0/gallery/login_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/login_1.webp
rename to public/img/v2.2.0/gallery/login_1.webp
diff --git a/public/img/v2.1.4/gallery/map_1.jpg b/public/img/v2.2.0/gallery/map_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/map_1.jpg
rename to public/img/v2.2.0/gallery/map_1.jpg
diff --git a/public/img/v2.1.4/gallery/map_1.webp b/public/img/v2.2.0/gallery/map_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/map_1.webp
rename to public/img/v2.2.0/gallery/map_1.webp
diff --git a/public/img/v2.1.4/gallery/map_2.jpg b/public/img/v2.2.0/gallery/map_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/map_2.jpg
rename to public/img/v2.2.0/gallery/map_2.jpg
diff --git a/public/img/v2.1.4/gallery/map_2.webp b/public/img/v2.2.0/gallery/map_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/map_2.webp
rename to public/img/v2.2.0/gallery/map_2.webp
diff --git a/public/img/v2.1.4/gallery/map_3.jpg b/public/img/v2.2.0/gallery/map_3.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/map_3.jpg
rename to public/img/v2.2.0/gallery/map_3.jpg
diff --git a/public/img/v2.1.4/gallery/map_3.webp b/public/img/v2.2.0/gallery/map_3.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/map_3.webp
rename to public/img/v2.2.0/gallery/map_3.webp
diff --git a/public/img/v2.1.4/gallery/route_1.jpg b/public/img/v2.2.0/gallery/route_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/route_1.jpg
rename to public/img/v2.2.0/gallery/route_1.jpg
diff --git a/public/img/v2.1.4/gallery/route_1.webp b/public/img/v2.2.0/gallery/route_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/route_1.webp
rename to public/img/v2.2.0/gallery/route_1.webp
diff --git a/public/img/v2.1.4/gallery/route_2.jpg b/public/img/v2.2.0/gallery/route_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/route_2.jpg
rename to public/img/v2.2.0/gallery/route_2.jpg
diff --git a/public/img/v2.1.4/gallery/route_2.webp b/public/img/v2.2.0/gallery/route_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/route_2.webp
rename to public/img/v2.2.0/gallery/route_2.webp
diff --git a/public/img/v2.1.4/gallery/settings_1.jpg b/public/img/v2.2.0/gallery/settings_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/settings_1.jpg
rename to public/img/v2.2.0/gallery/settings_1.jpg
diff --git a/public/img/v2.1.4/gallery/settings_1.webp b/public/img/v2.2.0/gallery/settings_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/settings_1.webp
rename to public/img/v2.2.0/gallery/settings_1.webp
diff --git a/public/img/v2.1.4/gallery/signatures_1.jpg b/public/img/v2.2.0/gallery/signatures_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/signatures_1.jpg
rename to public/img/v2.2.0/gallery/signatures_1.jpg
diff --git a/public/img/v2.1.4/gallery/signatures_1.webp b/public/img/v2.2.0/gallery/signatures_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/signatures_1.webp
rename to public/img/v2.2.0/gallery/signatures_1.webp
diff --git a/public/img/v2.1.4/gallery/signatures_2.jpg b/public/img/v2.2.0/gallery/signatures_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/signatures_2.jpg
rename to public/img/v2.2.0/gallery/signatures_2.jpg
diff --git a/public/img/v2.1.4/gallery/signatures_2.webp b/public/img/v2.2.0/gallery/signatures_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/signatures_2.webp
rename to public/img/v2.2.0/gallery/signatures_2.webp
diff --git a/public/img/v2.1.4/gallery/statistics_1.jpg b/public/img/v2.2.0/gallery/statistics_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/statistics_1.jpg
rename to public/img/v2.2.0/gallery/statistics_1.jpg
diff --git a/public/img/v2.1.4/gallery/statistics_1.webp b/public/img/v2.2.0/gallery/statistics_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/statistics_1.webp
rename to public/img/v2.2.0/gallery/statistics_1.webp
diff --git a/public/img/v2.1.4/gallery/statistics_2.jpg b/public/img/v2.2.0/gallery/statistics_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/statistics_2.jpg
rename to public/img/v2.2.0/gallery/statistics_2.jpg
diff --git a/public/img/v2.1.4/gallery/statistics_2.webp b/public/img/v2.2.0/gallery/statistics_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/statistics_2.webp
rename to public/img/v2.2.0/gallery/statistics_2.webp
diff --git a/public/img/v2.1.4/gallery/system_1.jpg b/public/img/v2.2.0/gallery/system_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/system_1.jpg
rename to public/img/v2.2.0/gallery/system_1.jpg
diff --git a/public/img/v2.1.4/gallery/system_1.webp b/public/img/v2.2.0/gallery/system_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/system_1.webp
rename to public/img/v2.2.0/gallery/system_1.webp
diff --git a/public/img/v2.1.4/gallery/system_2.jpg b/public/img/v2.2.0/gallery/system_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/system_2.jpg
rename to public/img/v2.2.0/gallery/system_2.jpg
diff --git a/public/img/v2.1.4/gallery/system_2.webp b/public/img/v2.2.0/gallery/system_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/system_2.webp
rename to public/img/v2.2.0/gallery/system_2.webp
diff --git a/public/img/v2.1.4/gallery/taskmanager_1.jpg b/public/img/v2.2.0/gallery/taskmanager_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/taskmanager_1.jpg
rename to public/img/v2.2.0/gallery/taskmanager_1.jpg
diff --git a/public/img/v2.1.4/gallery/taskmanager_1.webp b/public/img/v2.2.0/gallery/taskmanager_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/taskmanager_1.webp
rename to public/img/v2.2.0/gallery/taskmanager_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/admin_1.jpg b/public/img/v2.2.0/gallery/thumbs/admin_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/admin_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/admin_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/admin_1.webp b/public/img/v2.2.0/gallery/thumbs/admin_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/admin_1.webp
rename to public/img/v2.2.0/gallery/thumbs/admin_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/admin_2.jpg b/public/img/v2.2.0/gallery/thumbs/admin_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/admin_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/admin_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/admin_2.webp b/public/img/v2.2.0/gallery/thumbs/admin_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/admin_2.webp
rename to public/img/v2.2.0/gallery/thumbs/admin_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/connection_1.jpg b/public/img/v2.2.0/gallery/thumbs/connection_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/connection_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/connection_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/connection_1.webp b/public/img/v2.2.0/gallery/thumbs/connection_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/connection_1.webp
rename to public/img/v2.2.0/gallery/thumbs/connection_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/development_1.jpg b/public/img/v2.2.0/gallery/thumbs/development_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/development_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/development_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/development_1.webp b/public/img/v2.2.0/gallery/thumbs/development_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/development_1.webp
rename to public/img/v2.2.0/gallery/thumbs/development_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/development_2.jpg b/public/img/v2.2.0/gallery/thumbs/development_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/development_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/development_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/development_2.webp b/public/img/v2.2.0/gallery/thumbs/development_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/development_2.webp
rename to public/img/v2.2.0/gallery/thumbs/development_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/discord_1.jpg b/public/img/v2.2.0/gallery/thumbs/discord_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/discord_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/discord_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/discord_1.webp b/public/img/v2.2.0/gallery/thumbs/discord_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/discord_1.webp
rename to public/img/v2.2.0/gallery/thumbs/discord_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/install_db.jpg b/public/img/v2.2.0/gallery/thumbs/install_db.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/install_db.jpg
rename to public/img/v2.2.0/gallery/thumbs/install_db.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/install_db.webp b/public/img/v2.2.0/gallery/thumbs/install_db.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/install_db.webp
rename to public/img/v2.2.0/gallery/thumbs/install_db.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/install_settings.jpg b/public/img/v2.2.0/gallery/thumbs/install_settings.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/install_settings.jpg
rename to public/img/v2.2.0/gallery/thumbs/install_settings.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/install_settings.webp b/public/img/v2.2.0/gallery/thumbs/install_settings.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/install_settings.webp
rename to public/img/v2.2.0/gallery/thumbs/install_settings.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/intel_1.jpg b/public/img/v2.2.0/gallery/thumbs/intel_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/intel_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/intel_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/intel_1.webp b/public/img/v2.2.0/gallery/thumbs/intel_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/intel_1.webp
rename to public/img/v2.2.0/gallery/thumbs/intel_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/kb_1.jpg b/public/img/v2.2.0/gallery/thumbs/kb_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/kb_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/kb_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/kb_1.webp b/public/img/v2.2.0/gallery/thumbs/kb_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/kb_1.webp
rename to public/img/v2.2.0/gallery/thumbs/kb_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/kb_2.jpg b/public/img/v2.2.0/gallery/thumbs/kb_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/kb_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/kb_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/kb_2.webp b/public/img/v2.2.0/gallery/thumbs/kb_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/kb_2.webp
rename to public/img/v2.2.0/gallery/thumbs/kb_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/log_1.jpg b/public/img/v2.2.0/gallery/thumbs/log_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/log_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/log_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/log_1.webp b/public/img/v2.2.0/gallery/thumbs/log_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/log_1.webp
rename to public/img/v2.2.0/gallery/thumbs/log_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/login_1.jpg b/public/img/v2.2.0/gallery/thumbs/login_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/login_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/login_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/login_1.webp b/public/img/v2.2.0/gallery/thumbs/login_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/login_1.webp
rename to public/img/v2.2.0/gallery/thumbs/login_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/map_1.jpg b/public/img/v2.2.0/gallery/thumbs/map_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/map_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/map_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/map_1.webp b/public/img/v2.2.0/gallery/thumbs/map_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/map_1.webp
rename to public/img/v2.2.0/gallery/thumbs/map_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/map_2.jpg b/public/img/v2.2.0/gallery/thumbs/map_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/map_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/map_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/map_2.webp b/public/img/v2.2.0/gallery/thumbs/map_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/map_2.webp
rename to public/img/v2.2.0/gallery/thumbs/map_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/map_3.jpg b/public/img/v2.2.0/gallery/thumbs/map_3.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/map_3.jpg
rename to public/img/v2.2.0/gallery/thumbs/map_3.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/map_3.webp b/public/img/v2.2.0/gallery/thumbs/map_3.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/map_3.webp
rename to public/img/v2.2.0/gallery/thumbs/map_3.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/route_1.jpg b/public/img/v2.2.0/gallery/thumbs/route_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/route_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/route_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/route_1.webp b/public/img/v2.2.0/gallery/thumbs/route_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/route_1.webp
rename to public/img/v2.2.0/gallery/thumbs/route_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/route_2.jpg b/public/img/v2.2.0/gallery/thumbs/route_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/route_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/route_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/route_2.webp b/public/img/v2.2.0/gallery/thumbs/route_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/route_2.webp
rename to public/img/v2.2.0/gallery/thumbs/route_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/settings_1.jpg b/public/img/v2.2.0/gallery/thumbs/settings_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/settings_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/settings_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/settings_1.webp b/public/img/v2.2.0/gallery/thumbs/settings_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/settings_1.webp
rename to public/img/v2.2.0/gallery/thumbs/settings_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/signatures_1.jpg b/public/img/v2.2.0/gallery/thumbs/signatures_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/signatures_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/signatures_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/signatures_1.webp b/public/img/v2.2.0/gallery/thumbs/signatures_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/signatures_1.webp
rename to public/img/v2.2.0/gallery/thumbs/signatures_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/signatures_2.jpg b/public/img/v2.2.0/gallery/thumbs/signatures_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/signatures_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/signatures_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/signatures_2.webp b/public/img/v2.2.0/gallery/thumbs/signatures_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/signatures_2.webp
rename to public/img/v2.2.0/gallery/thumbs/signatures_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/statistics_1.jpg b/public/img/v2.2.0/gallery/thumbs/statistics_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/statistics_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/statistics_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/statistics_1.webp b/public/img/v2.2.0/gallery/thumbs/statistics_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/statistics_1.webp
rename to public/img/v2.2.0/gallery/thumbs/statistics_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/statistics_2.jpg b/public/img/v2.2.0/gallery/thumbs/statistics_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/statistics_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/statistics_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/statistics_2.webp b/public/img/v2.2.0/gallery/thumbs/statistics_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/statistics_2.webp
rename to public/img/v2.2.0/gallery/thumbs/statistics_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/system_1.jpg b/public/img/v2.2.0/gallery/thumbs/system_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/system_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/system_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/system_1.webp b/public/img/v2.2.0/gallery/thumbs/system_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/system_1.webp
rename to public/img/v2.2.0/gallery/thumbs/system_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/system_2.jpg b/public/img/v2.2.0/gallery/thumbs/system_2.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/system_2.jpg
rename to public/img/v2.2.0/gallery/thumbs/system_2.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/system_2.webp b/public/img/v2.2.0/gallery/thumbs/system_2.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/system_2.webp
rename to public/img/v2.2.0/gallery/thumbs/system_2.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/taskmanager_1.jpg b/public/img/v2.2.0/gallery/thumbs/taskmanager_1.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/taskmanager_1.jpg
rename to public/img/v2.2.0/gallery/thumbs/taskmanager_1.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/taskmanager_1.webp b/public/img/v2.2.0/gallery/thumbs/taskmanager_1.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/taskmanager_1.webp
rename to public/img/v2.2.0/gallery/thumbs/taskmanager_1.webp
diff --git a/public/img/v2.1.4/gallery/thumbs/wip.jpg b/public/img/v2.2.0/gallery/thumbs/wip.jpg
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/wip.jpg
rename to public/img/v2.2.0/gallery/thumbs/wip.jpg
diff --git a/public/img/v2.1.4/gallery/thumbs/wip.webp b/public/img/v2.2.0/gallery/thumbs/wip.webp
similarity index 100%
rename from public/img/v2.1.4/gallery/thumbs/wip.webp
rename to public/img/v2.2.0/gallery/thumbs/wip.webp
diff --git a/public/img/v2.1.4/header/pf-header-1200.jpg b/public/img/v2.2.0/header/pf-header-1200.jpg
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-1200.jpg
rename to public/img/v2.2.0/header/pf-header-1200.jpg
diff --git a/public/img/v2.1.4/header/pf-header-1200.png b/public/img/v2.2.0/header/pf-header-1200.png
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-1200.png
rename to public/img/v2.2.0/header/pf-header-1200.png
diff --git a/public/img/v2.1.4/header/pf-header-1200.webp b/public/img/v2.2.0/header/pf-header-1200.webp
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-1200.webp
rename to public/img/v2.2.0/header/pf-header-1200.webp
diff --git a/public/img/v2.1.4/header/pf-header-1600.jpg b/public/img/v2.2.0/header/pf-header-1600.jpg
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-1600.jpg
rename to public/img/v2.2.0/header/pf-header-1600.jpg
diff --git a/public/img/v2.1.4/header/pf-header-1600.png b/public/img/v2.2.0/header/pf-header-1600.png
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-1600.png
rename to public/img/v2.2.0/header/pf-header-1600.png
diff --git a/public/img/v2.1.4/header/pf-header-1600.webp b/public/img/v2.2.0/header/pf-header-1600.webp
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-1600.webp
rename to public/img/v2.2.0/header/pf-header-1600.webp
diff --git a/public/img/v2.1.4/header/pf-header-3840.jpg b/public/img/v2.2.0/header/pf-header-3840.jpg
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-3840.jpg
rename to public/img/v2.2.0/header/pf-header-3840.jpg
diff --git a/public/img/v2.1.4/header/pf-header-3840.png b/public/img/v2.2.0/header/pf-header-3840.png
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-3840.png
rename to public/img/v2.2.0/header/pf-header-3840.png
diff --git a/public/img/v2.1.4/header/pf-header-3840.webp b/public/img/v2.2.0/header/pf-header-3840.webp
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-3840.webp
rename to public/img/v2.2.0/header/pf-header-3840.webp
diff --git a/public/img/v2.1.4/header/pf-header-480.jpg b/public/img/v2.2.0/header/pf-header-480.jpg
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-480.jpg
rename to public/img/v2.2.0/header/pf-header-480.jpg
diff --git a/public/img/v2.1.4/header/pf-header-480.png b/public/img/v2.2.0/header/pf-header-480.png
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-480.png
rename to public/img/v2.2.0/header/pf-header-480.png
diff --git a/public/img/v2.1.4/header/pf-header-480.webp b/public/img/v2.2.0/header/pf-header-480.webp
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-480.webp
rename to public/img/v2.2.0/header/pf-header-480.webp
diff --git a/public/img/v2.1.4/header/pf-header-780.jpg b/public/img/v2.2.0/header/pf-header-780.jpg
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-780.jpg
rename to public/img/v2.2.0/header/pf-header-780.jpg
diff --git a/public/img/v2.1.4/header/pf-header-780.png b/public/img/v2.2.0/header/pf-header-780.png
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-780.png
rename to public/img/v2.2.0/header/pf-header-780.png
diff --git a/public/img/v2.1.4/header/pf-header-780.webp b/public/img/v2.2.0/header/pf-header-780.webp
similarity index 100%
rename from public/img/v2.1.4/header/pf-header-780.webp
rename to public/img/v2.2.0/header/pf-header-780.webp
diff --git a/public/img/v2.1.4/icons/client/ui/window/charcustomization.png b/public/img/v2.2.0/icons/client/ui/window/charcustomization.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/charcustomization.png
rename to public/img/v2.2.0/icons/client/ui/window/charcustomization.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/clonebay.png b/public/img/v2.2.0/icons/client/ui/window/clonebay.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/clonebay.png
rename to public/img/v2.2.0/icons/client/ui/window/clonebay.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/concord.png b/public/img/v2.2.0/icons/client/ui/window/concord.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/concord.png
rename to public/img/v2.2.0/icons/client/ui/window/concord.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/docking.png b/public/img/v2.2.0/icons/client/ui/window/docking.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/docking.png
rename to public/img/v2.2.0/icons/client/ui/window/docking.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/factionalwarfare.png b/public/img/v2.2.0/icons/client/ui/window/factionalwarfare.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/factionalwarfare.png
rename to public/img/v2.2.0/icons/client/ui/window/factionalwarfare.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/fitting.png b/public/img/v2.2.0/icons/client/ui/window/fitting.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/fitting.png
rename to public/img/v2.2.0/icons/client/ui/window/fitting.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/industry.png b/public/img/v2.2.0/icons/client/ui/window/industry.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/industry.png
rename to public/img/v2.2.0/icons/client/ui/window/industry.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/insurance.png b/public/img/v2.2.0/icons/client/ui/window/insurance.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/insurance.png
rename to public/img/v2.2.0/icons/client/ui/window/insurance.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/jumpclones.png b/public/img/v2.2.0/icons/client/ui/window/jumpclones.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/jumpclones.png
rename to public/img/v2.2.0/icons/client/ui/window/jumpclones.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/lpstore.png b/public/img/v2.2.0/icons/client/ui/window/lpstore.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/lpstore.png
rename to public/img/v2.2.0/icons/client/ui/window/lpstore.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/market.png b/public/img/v2.2.0/icons/client/ui/window/market.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/market.png
rename to public/img/v2.2.0/icons/client/ui/window/market.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/repairshop.png b/public/img/v2.2.0/icons/client/ui/window/repairshop.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/repairshop.png
rename to public/img/v2.2.0/icons/client/ui/window/repairshop.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/reprocess.png b/public/img/v2.2.0/icons/client/ui/window/reprocess.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/reprocess.png
rename to public/img/v2.2.0/icons/client/ui/window/reprocess.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/research.png b/public/img/v2.2.0/icons/client/ui/window/research.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/research.png
rename to public/img/v2.2.0/icons/client/ui/window/research.png
diff --git a/public/img/v2.1.4/icons/client/ui/window/skins.png b/public/img/v2.2.0/icons/client/ui/window/skins.png
similarity index 100%
rename from public/img/v2.1.4/icons/client/ui/window/skins.png
rename to public/img/v2.2.0/icons/client/ui/window/skins.png
diff --git a/public/img/v2.1.4/icons/grid_left.png b/public/img/v2.2.0/icons/grid_left.png
similarity index 100%
rename from public/img/v2.1.4/icons/grid_left.png
rename to public/img/v2.2.0/icons/grid_left.png
diff --git a/public/img/v2.1.4/icons/grid_right.png b/public/img/v2.2.0/icons/grid_right.png
similarity index 100%
rename from public/img/v2.1.4/icons/grid_right.png
rename to public/img/v2.2.0/icons/grid_right.png
diff --git a/public/img/v2.1.4/icons/logo_anoik.png b/public/img/v2.2.0/icons/logo_anoik.png
similarity index 100%
rename from public/img/v2.1.4/icons/logo_anoik.png
rename to public/img/v2.2.0/icons/logo_anoik.png
diff --git a/public/img/v2.1.4/icons/logo_dotlan.png b/public/img/v2.2.0/icons/logo_dotlan.png
similarity index 100%
rename from public/img/v2.1.4/icons/logo_dotlan.png
rename to public/img/v2.2.0/icons/logo_dotlan.png
diff --git a/public/img/v2.1.4/icons/logo_eve.png b/public/img/v2.2.0/icons/logo_eve.png
similarity index 100%
rename from public/img/v2.1.4/icons/logo_eve.png
rename to public/img/v2.2.0/icons/logo_eve.png
diff --git a/public/img/v2.1.4/icons/logo_eveeye.png b/public/img/v2.2.0/icons/logo_eveeye.png
similarity index 100%
rename from public/img/v2.1.4/icons/logo_eveeye.png
rename to public/img/v2.2.0/icons/logo_eveeye.png
diff --git a/public/img/v2.1.4/misc/donate_patreon.png b/public/img/v2.2.0/misc/donate_patreon.png
similarity index 100%
rename from public/img/v2.1.4/misc/donate_patreon.png
rename to public/img/v2.2.0/misc/donate_patreon.png
diff --git a/public/img/v2.1.4/misc/donate_paypal.png b/public/img/v2.2.0/misc/donate_paypal.png
similarity index 100%
rename from public/img/v2.1.4/misc/donate_paypal.png
rename to public/img/v2.2.0/misc/donate_paypal.png
diff --git a/public/img/v2.1.4/misc/grid_40x40.png b/public/img/v2.2.0/misc/grid_40x40.png
similarity index 100%
rename from public/img/v2.1.4/misc/grid_40x40.png
rename to public/img/v2.2.0/misc/grid_40x40.png
diff --git a/public/img/v2.1.4/misc/logo.png b/public/img/v2.2.0/misc/logo.png
similarity index 100%
rename from public/img/v2.1.4/misc/logo.png
rename to public/img/v2.2.0/misc/logo.png
diff --git a/public/img/v2.1.4/misc/logo_alpha.png b/public/img/v2.2.0/misc/logo_alpha.png
similarity index 100%
rename from public/img/v2.1.4/misc/logo_alpha.png
rename to public/img/v2.2.0/misc/logo_alpha.png
diff --git a/public/img/v2.1.4/misc/notification.png b/public/img/v2.2.0/misc/notification.png
similarity index 100%
rename from public/img/v2.1.4/misc/notification.png
rename to public/img/v2.2.0/misc/notification.png
diff --git a/public/img/v2.1.4/sso/eve_sso_login_buttons_large_black.png b/public/img/v2.2.0/sso/eve_sso_login_buttons_large_black.png
similarity index 100%
rename from public/img/v2.1.4/sso/eve_sso_login_buttons_large_black.png
rename to public/img/v2.2.0/sso/eve_sso_login_buttons_large_black.png
diff --git a/public/img/v2.1.4/sso/eve_sso_login_buttons_large_black_hover.png b/public/img/v2.2.0/sso/eve_sso_login_buttons_large_black_hover.png
similarity index 100%
rename from public/img/v2.1.4/sso/eve_sso_login_buttons_large_black_hover.png
rename to public/img/v2.2.0/sso/eve_sso_login_buttons_large_black_hover.png
diff --git a/public/img/v2.1.4/svg/bubble.svg b/public/img/v2.2.0/svg/bubble.svg
similarity index 100%
rename from public/img/v2.1.4/svg/bubble.svg
rename to public/img/v2.2.0/svg/bubble.svg
diff --git a/public/img/v2.1.4/svg/ccp_sso.svg b/public/img/v2.2.0/svg/ccp_sso.svg
similarity index 100%
rename from public/img/v2.1.4/svg/ccp_sso.svg
rename to public/img/v2.2.0/svg/ccp_sso.svg
diff --git a/public/img/v2.1.4/svg/grid_layout.svg b/public/img/v2.2.0/svg/grid_layout.svg
similarity index 100%
rename from public/img/v2.1.4/svg/grid_layout.svg
rename to public/img/v2.2.0/svg/grid_layout.svg
diff --git a/public/img/v2.1.4/svg/logo_inline.svg b/public/img/v2.2.0/svg/logo_inline.svg
similarity index 100%
rename from public/img/v2.1.4/svg/logo_inline.svg
rename to public/img/v2.2.0/svg/logo_inline.svg
diff --git a/public/img/v2.1.4/svg/logo_simple.svg b/public/img/v2.2.0/svg/logo_simple.svg
similarity index 100%
rename from public/img/v2.1.4/svg/logo_simple.svg
rename to public/img/v2.2.0/svg/logo_simple.svg
diff --git a/public/img/v2.1.4/svg/swords.svg b/public/img/v2.2.0/svg/swords.svg
similarity index 100%
rename from public/img/v2.1.4/svg/swords.svg
rename to public/img/v2.2.0/svg/swords.svg
diff --git a/public/js/v2.1.4/app/admin.js b/public/js/v2.1.4/app/admin.js
deleted file mode 100644
index ba6bd1a71..000000000
--- a/public/js/v2.1.4/app/admin.js
+++ /dev/null
@@ -1,2 +0,0 @@
-if(function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,o=Object.getPrototypeOf,a=n.slice,i=n.concat,s=n.push,l=n.indexOf,c={},u=c.toString,d=c.hasOwnProperty,f=d.toString,p=f.call(Object),h={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},g=function(e){return null!=e&&e===e.window},v={type:!0,src:!0,nonce:!0,noModule:!0};function y(e,t,n){var o,a,i=(n=n||r).createElement("script");if(i.text=e,t)for(o in v)(a=t[o]||t.getAttribute&&t.getAttribute(o))&&i.setAttribute(o,a);n.head.appendChild(i).parentNode.removeChild(i)}function b(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[u.call(e)]||"object":typeof e}var w="3.4.1",x=function(e,t){return new x.fn.init(e,t)},S=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function C(e){var t=!!e&&"length"in e&&e.length,n=b(e);return!m(e)&&!g(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+$+")"+$+"*"),W=new RegExp($+"|>"),V=new RegExp(M),X=new RegExp("^"+N+"$"),Y={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N+"|[*])"),ATTR:new RegExp("^"+B),PSEUDO:new RegExp("^"+M),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+$+"*(even|odd|(([+-]|)(\\d*)n|)"+$+"*(?:([+-]|)"+$+"*(\\d+)|))"+$+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+$+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+$+"*((?:-\\d)?\\d*)"+$+"*\\)|)(?=[^-]|$)","i")},G=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+$+"?|("+$+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,oe=function(e,t){return t?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},ae=function(){f()},ie=we(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{F.apply(E=j.call(x.childNodes),x.childNodes),E[x.childNodes.length].nodeType}catch(t){F={apply:E.length?function(e,t){P.apply(e,j.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}function se(e,t,r,o){var a,s,c,u,d,h,v,y=t&&t.ownerDocument,S=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==S&&9!==S&&11!==S)return r;if(!o&&((t?t.ownerDocument||t:x)!==p&&f(t),t=t||p,m)){if(11!==S&&(d=J.exec(e)))if(a=d[1]){if(9===S){if(!(c=t.getElementById(a)))return r;if(c.id===a)return r.push(c),r}else if(y&&(c=y.getElementById(a))&&b(t,c)&&c.id===a)return r.push(c),r}else{if(d[2])return F.apply(r,t.getElementsByTagName(e)),r;if((a=d[3])&&n.getElementsByClassName&&t.getElementsByClassName)return F.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&!I[e+" "]&&(!g||!g.test(e))&&(1!==S||"object"!==t.nodeName.toLowerCase())){if(v=e,y=t,1===S&&W.test(e)){for((u=t.getAttribute("id"))?u=u.replace(re,oe):t.setAttribute("id",u=w),s=(h=i(e)).length;s--;)h[s]="#"+u+" "+be(h[s]);v=h.join(","),y=ee.test(e)&&ve(t.parentNode)||t}try{return F.apply(r,y.querySelectorAll(v)),r}catch(t){I(e,!0)}finally{u===w&&t.removeAttribute("id")}}}return l(e.replace(q,"$1"),t,r,o)}function le(){var e=[];return function t(n,o){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=o}}function ce(e){return e[w]=!0,e}function ue(e){var t=p.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function de(e,t){for(var n=e.split("|"),o=n.length;o--;)r.attrHandle[n[o]]=t}function fe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function pe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function he(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function me(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function ge(e){return ce(function(t){return t=+t,ce(function(n,r){for(var o,a=e([],n.length,t),i=a.length;i--;)n[o=a[i]]&&(n[o]=!(r[o]=n[o]))})})}function ve(e){return e&&void 0!==e.getElementsByTagName&&e}for(t in n=se.support={},a=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!G.test(t||n&&n.nodeName||"HTML")},f=se.setDocument=function(e){var t,o,i=e?e.ownerDocument||e:x;return i!==p&&9===i.nodeType&&i.documentElement&&(h=(p=i).documentElement,m=!a(p),x!==p&&(o=p.defaultView)&&o.top!==o&&(o.addEventListener?o.addEventListener("unload",ae,!1):o.attachEvent&&o.attachEvent("onunload",ae)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(p.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Z.test(p.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=w,!p.getElementsByName||!p.getElementsByName(w).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if(void 0!==t.getElementById&&m){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(te,ne);return function(e){var n=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if(void 0!==t.getElementById&&m){var n,r,o,a=t.getElementById(e);if(a){if((n=a.getAttributeNode("id"))&&n.value===e)return[a];for(o=t.getElementsByName(e),r=0;a=o[r++];)if((n=a.getAttributeNode("id"))&&n.value===e)return[a]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return void 0!==t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],o=0,a=t.getElementsByTagName(e);if("*"===e){for(;n=a[o++];)1===n.nodeType&&r.push(n);return r}return a},r.find.CLASS=n.getElementsByClassName&&function(e,t){if(void 0!==t.getElementsByClassName&&m)return t.getElementsByClassName(e)},v=[],g=[],(n.qsa=Z.test(p.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&g.push("[*^$]="+$+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||g.push("\\["+$+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+w+"-]").length||g.push("~="),e.querySelectorAll(":checked").length||g.push(":checked"),e.querySelectorAll("a#"+w+"+*").length||g.push(".#.+[+~]")}),ue(function(e){e.innerHTML="";var t=p.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&g.push("name"+$+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&g.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(n.matchesSelector=Z.test(y=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=y.call(e,"*"),y.call(e,"[s!='']:x"),v.push("!=",M)}),g=g.length&&new RegExp(g.join("|")),v=v.length&&new RegExp(v.join("|")),t=Z.test(h.compareDocumentPosition),b=t||Z.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},k=t?function(e,t){if(e===t)return d=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===p||e.ownerDocument===x&&b(x,e)?-1:t===p||t.ownerDocument===x&&b(x,t)?1:u?L(u,e)-L(u,t):0:4&r?-1:1)}:function(e,t){if(e===t)return d=!0,0;var n,r=0,o=e.parentNode,a=t.parentNode,i=[e],s=[t];if(!o||!a)return e===p?-1:t===p?1:o?-1:a?1:u?L(u,e)-L(u,t):0;if(o===a)return fe(e,t);for(n=e;n=n.parentNode;)i.unshift(n);for(n=t;n=n.parentNode;)s.unshift(n);for(;i[r]===s[r];)r++;return r?fe(i[r],s[r]):i[r]===x?-1:s[r]===x?1:0}),p},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&f(e),n.matchesSelector&&m&&!I[t+" "]&&(!v||!v.test(t))&&(!g||!g.test(t)))try{var r=y.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){I(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return Y.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&V.test(n)&&(t=i(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=_[e+" "];return t||(t=new RegExp("(^|"+$+")"+e+"("+$+"|$)"))&&_(e,function(e){return t.test("string"==typeof e.className&&e.className||void 0!==e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var o=se.attr(r,e);return null==o?"!="===t:!t||(o+="","="===t?o===n:"!="===t?o!==n:"^="===t?n&&0===o.indexOf(n):"*="===t?n&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function E(e,t,n){return m(t)?x.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?x.grep(e,function(e){return e===t!==n}):"string"!=typeof t?x.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(x.fn.init=function(e,t,n){var o,a;if(!e)return this;if(n=n||O,"string"==typeof e){if(!(o="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:P.exec(e))||!o[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(o[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(o[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(o[1])&&x.isPlainObject(t))for(o in t)m(this[o])?this[o](t[o]):this.attr(o,t[o]);return this}return(a=r.getElementById(o[2]))&&(this[0]=a,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(x):x.makeArray(e,this)}).prototype=x.fn,O=x(r);var F=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function L(e,t){for(;(e=e[t])&&1!==e.nodeType;);return e}x.fn.extend({has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,me={option:[1,""],thead:[1,""],col:[2,""],tr:[2,""],td:[3,""],_default:[0,"",""]};function ge(e,t){var n;return n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&k(e,t)?x.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;nx",h.noCloneChecked=!!ye.cloneNode(!0).lastChild.defaultValue;var Se=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,_e=/^([^.]*)(?:\.(.+)|)/;function Te(){return!0}function De(){return!1}function Ie(e,t){return e===function(){try{return r.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,o,a){var i,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],a);return e}if(null==r&&null==o?(o=n,r=n=void 0):null==o&&("string"==typeof n?(o=r,r=void 0):(o=r,r=n,n=void 0)),!1===o)o=De;else if(!o)return e;return 1===a&&(i=o,(o=function(e){return x().off(e),i.apply(this,arguments)}).guid=i.guid||(i.guid=x.guid++)),e.each(function(){x.event.add(this,t,o,r,n)})}function Ae(e,t,n){n?(Q.set(e,t,!1),x.event.add(e,t,{namespace:!1,handler:function(e){var r,o,i=Q.get(this,t);if(1&e.isTrigger&&this[t]){if(i.length)(x.event.special[t]||{}).delegateType&&e.stopPropagation();else if(i=a.call(arguments),Q.set(this,t,i),r=n(this,t),this[t](),i!==(o=Q.get(this,t))||r?Q.set(this,t,!1):o={},i!==o)return e.stopImmediatePropagation(),e.preventDefault(),o.value}else i.length&&(Q.set(this,t,{value:x.event.trigger(x.extend(i[0],x.Event.prototype),i.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,t)&&x.event.add(e,t,Te)}x.event={global:{},add:function(e,t,n,r,o){var a,i,s,l,c,u,d,f,p,h,m,g=Q.get(e);if(g)for(n.handler&&(n=(a=n).handler,o=a.selector),o&&x.find.matchesSelector(oe,o),n.guid||(n.guid=x.guid++),(l=g.events)||(l=g.events={}),(i=g.handle)||(i=g.handle=function(t){return void 0!==x&&x.event.triggered!==t.type?x.event.dispatch.apply(e,arguments):void 0}),c=(t=(t||"").match(R)||[""]).length;c--;)p=m=(s=_e.exec(t[c])||[])[1],h=(s[2]||"").split(".").sort(),p&&(d=x.event.special[p]||{},p=(o?d.delegateType:d.bindType)||p,d=x.event.special[p]||{},u=x.extend({type:p,origType:m,data:r,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:h.join(".")},a),(f=l[p])||((f=l[p]=[]).delegateCount=0,d.setup&&!1!==d.setup.call(e,r,h,i)||e.addEventListener&&e.addEventListener(p,i)),d.add&&(d.add.call(e,u),u.handler.guid||(u.handler.guid=n.guid)),o?f.splice(f.delegateCount++,0,u):f.push(u),x.event.global[p]=!0)},remove:function(e,t,n,r,o){var a,i,s,l,c,u,d,f,p,h,m,g=Q.hasData(e)&&Q.get(e);if(g&&(l=g.events)){for(c=(t=(t||"").match(R)||[""]).length;c--;)if(p=m=(s=_e.exec(t[c])||[])[1],h=(s[2]||"").split(".").sort(),p){for(d=x.event.special[p]||{},f=l[p=(r?d.delegateType:d.bindType)||p]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=a=f.length;a--;)u=f[a],!o&&m!==u.origType||n&&n.guid!==u.guid||s&&!s.test(u.namespace)||r&&r!==u.selector&&("**"!==r||!u.selector)||(f.splice(a,1),u.selector&&f.delegateCount--,d.remove&&d.remove.call(e,u));i&&!f.length&&(d.teardown&&!1!==d.teardown.call(e,h,g.handle)||x.removeEvent(e,p,g.handle),delete l[p])}else for(p in l)x.event.remove(e,p+t[c],n,r,!0);x.isEmptyObject(l)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,o,a,i,s=x.event.fix(e),l=new Array(arguments.length),c=(Q.get(this,"events")||{})[s.type]||[],u=x.event.special[s.type]||{};for(l[0]=s,t=1;t\x20\t\r\n\f]*)[^>]*)\/>/gi,Oe=/ |