diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt index 8a7c9ee3..9b9c16db 100644 --- a/api/tacticalrmm/requirements.txt +++ b/api/tacticalrmm/requirements.txt @@ -10,7 +10,7 @@ cryptography==3.4.8 daphne==3.0.2 Django==3.2.7 django-cors-headers==3.8.0 -django-ipware==3.0.2 +django-ipware==4.0.0 django-rest-knox==4.1.0 djangorestframework==3.12.4 future==0.18.2 @@ -19,7 +19,7 @@ msgpack==1.0.2 packaging==21.0 psycopg2-binary==2.9.1 pycparser==2.20 -pycryptodome==3.10.1 +pycryptodome==3.10.4 pyotp==2.6.0 pyparsing==2.4.7 pytz==2021.1 @@ -27,9 +27,9 @@ qrcode==6.1 redis==3.5.3 requests==2.26.0 six==1.16.0 -sqlparse==0.4.1 -twilio==6.63.1 -urllib3==1.26.6 +sqlparse==0.4.2 +twilio==7.0.0 +urllib3==1.26.7 uWSGI==2.0.19.1 validators==0.18.2 vine==5.0.0 diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index 68f8ccfe..d3cf9163 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -32,7 +32,7 @@ NATS_SERVER_VER = "2.3.3" PIP_VER = "21" NPM_VER = "22" -SETUPTOOLS_VER = "57.5.0" +SETUPTOOLS_VER = "58.1.0" WHEEL_VER = "0.37.0" DL_64 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe" diff --git a/install.sh b/install.sh index 3142faf8..ab7f815c 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="53" +SCRIPT_VERSION="54" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/install.sh' sudo apt install -y curl wget dirmngr gnupg lsb-release diff --git a/web/package-lock.json b/web/package-lock.json index 1fb14ca7..d21ff982 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -8,13 +8,13 @@ "name": "web", "version": "0.1.8", "dependencies": { - "@quasar/extras": "^1.10.12", + "@quasar/extras": "^1.11.1", "apexcharts": "^3.27.1", - "axios": "^0.21.3", + "axios": "^0.21.4", "dotenv": "^8.6.0", "prismjs": "^1.23.0", "qrcode.vue": "^3.2.2", - "quasar": "^2.0.4", + "quasar": "^2.1.0", "vue-prism-editor": "^2.0.0-alpha.2", "vue3-apexcharts": "^1.4.0", "vuex": "^4.0.2" @@ -2148,9 +2148,9 @@ } }, "node_modules/@quasar/extras": { - "version": "1.10.12", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.12.tgz", - "integrity": "sha512-CVSxLw/Z6kaEYrooJX7mpby6YDm0eSa8D9/1+KEfiTYfLrPE4wTRuNGKN5liuLtVhFMdGrEkj6T6DInKpQWW9A==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.11.1.tgz", + "integrity": "sha512-/h6EH4+7peanrgT1ErTSG2KwHuVrpnvS3lkmtuErCXrdpiV0z0DpGxdfIjsbhKqAPkAb6h5Zsdh72nBdKp1tsg==", "funding": { "type": "github", "url": "https://donate.quasar.dev" @@ -3209,9 +3209,9 @@ } }, "node_modules/axios": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz", - "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "dependencies": { "follow-redirects": "^1.14.0" } @@ -10460,9 +10460,9 @@ } }, "node_modules/quasar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.4.tgz", - "integrity": "sha512-W53vn99KKeJI+xHT7ah1qOGCqEDG2+x7G47se8lf93wFTXQAyBw+O0TbuOdZqoKpguwT4T2yo4dTMz7WRmRqGA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.1.0.tgz", + "integrity": "sha512-TSAAoHrRYNYcSO0zEz3yqYA00Blfwzt8tl7o3/fVyLD6XRrePwB3K0P3ATTQEWISTIUkSklXo5d/c5oXlAQO+g==", "engines": { "node": ">= 10.18.1", "npm": ">= 6.13.4", @@ -14926,9 +14926,9 @@ } }, "@quasar/extras": { - "version": "1.10.12", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.10.12.tgz", - "integrity": "sha512-CVSxLw/Z6kaEYrooJX7mpby6YDm0eSa8D9/1+KEfiTYfLrPE4wTRuNGKN5liuLtVhFMdGrEkj6T6DInKpQWW9A==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.11.1.tgz", + "integrity": "sha512-/h6EH4+7peanrgT1ErTSG2KwHuVrpnvS3lkmtuErCXrdpiV0z0DpGxdfIjsbhKqAPkAb6h5Zsdh72nBdKp1tsg==" }, "@quasar/fastclick": { "version": "1.1.4", @@ -15858,9 +15858,9 @@ } }, "axios": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz", - "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "requires": { "follow-redirects": "^1.14.0" } @@ -21420,9 +21420,9 @@ "dev": true }, "quasar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.0.4.tgz", - "integrity": "sha512-W53vn99KKeJI+xHT7ah1qOGCqEDG2+x7G47se8lf93wFTXQAyBw+O0TbuOdZqoKpguwT4T2yo4dTMz7WRmRqGA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-2.1.0.tgz", + "integrity": "sha512-TSAAoHrRYNYcSO0zEz3yqYA00Blfwzt8tl7o3/fVyLD6XRrePwB3K0P3ATTQEWISTIUkSklXo5d/c5oXlAQO+g==" }, "query-string": { "version": "5.1.1", diff --git a/web/package.json b/web/package.json index 0774d4ab..d0908194 100644 --- a/web/package.json +++ b/web/package.json @@ -10,13 +10,13 @@ "test:e2e:ci": "cross-env E2E_TEST=true start-test \"quasar dev\" http-get://localhost:8080 \"cypress run\"" }, "dependencies": { - "@quasar/extras": "^1.10.12", + "@quasar/extras": "^1.11.1", "apexcharts": "^3.27.1", - "axios": "^0.21.3", + "axios": "^0.21.4", "dotenv": "^8.6.0", "prismjs": "^1.23.0", "qrcode.vue": "^3.2.2", - "quasar": "^2.0.4", + "quasar": "^2.1.0", "vue-prism-editor": "^2.0.0-alpha.2", "vue3-apexcharts": "^1.4.0", "vuex": "^4.0.2" @@ -26,8 +26,9 @@ "@quasar/cli": "^1.2.1" }, "browserslist": [ - "last 3 Chrome versions", - "last 3 Firefox versions", - "last 2 Edge versions" + "last 2 Chrome versions", + "last 2 Firefox versions", + "last 2 Edge versions", + "last 1 Safari versions" ] } \ No newline at end of file