From 855f0545b3ee806f058e128c8956a9e6a7e78d09 Mon Sep 17 00:00:00 2001 From: Martin Sundhaug Date: Fri, 15 Jul 2022 17:50:08 +0200 Subject: [PATCH 01/13] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c33dae4..a0b6910 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Server code to manage piSignage players in a LAN or Private Network or to setup 1. Change to pisignage-server directory where you have pulled the code last time 2. Issue the command `git pull origin master` - ***IMPORTANT: If you are upadating from before 24 Nov 2016, after git pull, please change the uri variable in config/env/development.js to 'mongodb://localhost/pisignage-dev' to retain the old data*** + ***IMPORTANT: If you are updating from before 24 Nov 2016, after git pull, please change the uri variable in config/env/development.js to 'mongodb://localhost/pisignage-dev' to retain the old data*** 3. Apply your code changes if any 4. rm package-lock.json 5. rm -rf node_modules (entire directory and its contents) From 3a492ae68e069b3255bc6b896bf048504f9331ab Mon Sep 17 00:00:00 2001 From: Tunisiano18 Date: Tue, 16 Aug 2022 09:58:18 +0200 Subject: [PATCH 02/13] Solving #124 Solving issue #124 --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index aac09e9..1c4a482 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +version: '3' services: mongo: image: mongo:4.4 From cdaef90fab3d0a9aa37bab62f40eeebadbd34918 Mon Sep 17 00:00:00 2001 From: Tunisiano18 Date: Tue, 16 Aug 2022 17:04:58 +0200 Subject: [PATCH 03/13] version: '3' --- docker-compose.prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 249b28f..28ecfaf 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,3 +1,4 @@ +version: '3' services: mongo: image: mongo:4.4 From ad524af6740df05e9f7c34d3df8915956325a536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Nov 2022 01:27:21 +0000 Subject: [PATCH 04/13] Bump socket.io-parser from 3.3.2 to 3.3.3 Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/3.3.2...3.3.3) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index d309144..85420b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2514,13 +2514,16 @@ } }, "node_modules/socket.io-parser": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", - "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.2.tgz", + "integrity": "sha512-QFZBaZDNqZXeemwejc7D39jrq2eGK/qZuVDiMPKzZK1hLlNvjGilGt4ckfQZeVX4dGmuPzCytN9ZW1nQlEWjgA==", "dependencies": { "component-emitter": "1.2.1", "debug": "~4.1.0", "isarray": "2.0.1" + }, + "engines": { + "node": ">=10.0.0" } }, "node_modules/socket.io-parser/node_modules/debug": { @@ -2598,9 +2601,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "node_modules/socket.io/node_modules/socket.io-client/node_modules/socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz", + "integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==", "dependencies": { "component-emitter": "~1.3.0", "debug": "~3.1.0", @@ -4835,9 +4838,9 @@ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, "socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz", + "integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==", "requires": { "component-emitter": "~1.3.0", "debug": "~3.1.0", @@ -4878,9 +4881,9 @@ } }, "socket.io-parser": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz", - "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.2.tgz", + "integrity": "sha512-QFZBaZDNqZXeemwejc7D39jrq2eGK/qZuVDiMPKzZK1hLlNvjGilGt4ckfQZeVX4dGmuPzCytN9ZW1nQlEWjgA==", "requires": { "component-emitter": "1.2.1", "debug": "~4.1.0", From 34d190101ce588a588f58c3a6188a118b7892481 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Nov 2022 00:00:34 +0000 Subject: [PATCH 05/13] Bump engine.io from 3.6.0 to 3.6.1 Bumps [engine.io](https://github.com/socketio/engine.io) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/engine.io/compare/3.6.0...3.6.1) --- updated-dependencies: - dependency-name: engine.io dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index d309144..4b7bb55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -747,9 +747,9 @@ } }, "node_modules/engine.io": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.6.0.tgz", - "integrity": "sha512-Kc8fo5bbg8F4a2f3HPHTEpGyq/IRIQpyeHu3H1ThR14XDD7VrLcsGBo16HUpahgp8YkHJDaU5gNxJZbuGcuueg==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.6.1.tgz", + "integrity": "sha512-dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==", "dependencies": { "accepts": "~1.3.4", "base64id": "2.0.0", @@ -3441,9 +3441,9 @@ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" }, "engine.io": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.6.0.tgz", - "integrity": "sha512-Kc8fo5bbg8F4a2f3HPHTEpGyq/IRIQpyeHu3H1ThR14XDD7VrLcsGBo16HUpahgp8YkHJDaU5gNxJZbuGcuueg==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.6.1.tgz", + "integrity": "sha512-dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==", "requires": { "accepts": "~1.3.4", "base64id": "2.0.0", From e787ca0a06b4ee6cde7b7f665757f20c7f9c5d09 Mon Sep 17 00:00:00 2001 From: Storm Van Soldt <13080497+stormvansoldt@users.noreply.github.com> Date: Thu, 5 Jan 2023 18:06:38 -0700 Subject: [PATCH 06/13] Fixed broken git command, server version hash now displays correctly on the web dashboard --- app/controllers/licenses.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/licenses.js b/app/controllers/licenses.js index c0122ba..fdf658e 100644 --- a/app/controllers/licenses.js +++ b/app/controllers/licenses.js @@ -95,10 +95,12 @@ exports.getSettings = function(req,res) { } else { var obj = data.toObject() obj.serverIp = serverIp; - exec('git log -1 --format=%cd;git rev-parse HEAD',function(err,stdout,stderr){ + exec('git log -1 --format="%cd" && git log -1 --format="%H"',function(err,stdout,stderr){ if(err || stderr){ obj.date = 'N/A'; obj.version = 'N/A'; + console.log('There was an error obtaining the current server version from git:'); + console.log(stderr); }else{ stdout = stdout.trim().split('\n'); obj.date = [stdout[0].split(' ')[1],stdout[0].split(' ')[2],stdout[0].split(' ')[4]].join(' '); From bf22420da7aad9f0ccc179fb689157ef5f90da1f Mon Sep 17 00:00:00 2001 From: Abhijith B N Date: Wed, 11 Jan 2023 13:14:31 +0530 Subject: [PATCH 07/13] minor changes-refer commit note 1) players.js : since "file" from player2 is file path, check for indexOf 2) Correct orientation of screenshot for portrait 90 and 270 in piShell screenshot window 3) Horizontal and vertical flip orientation of player apart from std orientation as it is available in pisignage.com --- app/controllers/players.js | 2 +- public/app/css/custom.css | 4 ++-- public/app/js/controllers/groups.js | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/players.js b/app/controllers/players.js index 2ca3a79..d4523a7 100644 --- a/app/controllers/players.js +++ b/app/controllers/players.js @@ -625,7 +625,7 @@ exports.upload = function (cpuId, filename, data) { // else // console.log("info","Forever Log file saved for player : "+cpuId); }) - } else if (path.extname(filename) == '.log' && filename != "forever_out.log") { + } else if (path.extname(filename) == '.log' && filename != "forever_out.log" && filename.indexOf('forever_out.log')===-1 ) { try { logData = JSON.parse(data); logData.installation = player.installation; diff --git a/public/app/css/custom.css b/public/app/css/custom.css index a3e15f6..86fd65b 100644 --- a/public/app/css/custom.css +++ b/public/app/css/custom.css @@ -136,13 +136,13 @@ body { .portrait { max-height:468px; max-width:988px; - transform: rotate(-90deg); + transform: rotate(90deg); } .portrait270 { max-height:468px; max-width:988px; - transform: rotate(90deg); + transform: rotate(-90deg); } .statcard-number { margin-top: 0; diff --git a/public/app/js/controllers/groups.js b/public/app/js/controllers/groups.js index efb1b84..be91bff 100644 --- a/public/app/js/controllers/groups.js +++ b/public/app/js/controllers/groups.js @@ -502,7 +502,9 @@ angular.module('piGroups.controllers', []) $scope.orientations = [ {value: 'landscape', name: "Landscape Mode"}, {value: 'portrait', name: "Portrait Right (Hardware)"}, - {value: 'portrait270', name: "Portrait Left (Hardware)"} + {value: 'portrait270', name: "Portrait Left (Hardware)"}, + {value: 'invert', name: "Vertical Flip"}, + {value: 'invert-horizontal', name: "Horizontal Flip"} ]; $scope.tempPopup.monitorArrangement = $scope.tempPopup.monitorArrangement || {}; From 735f638fbb16a564213b97ebfe77dbc5beacc0a8 Mon Sep 17 00:00:00 2001 From: Sarge Date: Tue, 17 Jan 2023 00:47:54 -0700 Subject: [PATCH 08/13] fix for main menu hiding overflow content --- public/app/partials/menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/partials/menu.html b/public/app/partials/menu.html index 2f4cbd3..29ac175 100644 --- a/public/app/partials/menu.html +++ b/public/app/partials/menu.html @@ -18,7 +18,7 @@ -
+