UiO-Gaming/infoscreen3
1
0 Fork 0
mirror of https://github.com/UiO-Gaming/infoscreen3.git synced 2026-11-07 14:54:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
227 Commits 1 Branch 0 Tags
a7bfdd253b0f5efa61bbba8920798eaee552e494
Commit Graph
227 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Petri Järvisalo a7bfdd253b Merge pull request #51 from kasimos/fixLocalAssets 
Improve useLocalAssets behaviour
 2024-06-07 03:22:46 +03:00
Timo Wagner 49410b0c16 Add missing localAsset in editSlide 2024-06-06 18:01:33 +02:00
Timo Wagner 65d40b7701 Improve useLocalAssets behaviour 2024-06-06 17:57:01 +02:00
Petri Järvisalo c6b822a0d9 Merge pull request #50 from kasimos/fixStreamName 
Fix stream url to match doc, make sure port is int
 2024-05-08 22:34:45 +03:00
Timo Wagner 1d2b29417c Fix stream url to match doc, make sure port is int 2024-05-04 23:41:33 +02:00
Petri Järvisalo 885c50e63c Merge pull request #49 from kasimos/fixLobby 
Fix connection to lobby socket
 2024-05-02 14:28:01 +03:00
Timo Wagner 250b31a7a2 Add proper removal of dispatcher event for the adminlobby 2024-05-01 21:43:48 +02:00
Timo Wagner bbf39cc9f0 Fix connection to lobby socket 2024-04-27 00:54:14 +02:00
Petri Järvisalo c75da4bca6 Merge pull request #48 from kasimos/fixEmptyBundleCrashes 
Fix various crashes in case all bundles have been dropped
 2024-04-26 16:09:04 +03:00
Timo Wagner 011bd33438 Fix various crashes in case all bundles have been dropped 2024-04-26 13:25:40 +02:00
Petri Järvisalo 510847da5b Merge pull request #47 from kasimos/fixDeleteBundleAgain 
Fix deleting bundle with same name throwing error
 2024-04-26 13:05:48 +03:00
Petri Järvisalo 66c77187ac Merge pull request #45 from kasimos/guardRails 
Add customizable guardrails into the edit slide canvas
 2024-04-26 13:05:10 +03:00
Timo Wagner 3a12750b60 Fix deleting bundle with same name throws errorr 2024-04-26 11:40:53 +02:00
Timo Wagner b985bc27b1 Add Guardrails to env variables in README.md 2024-04-24 11:57:16 +02:00
kasimos b8c7de986e Add customizable guardrails into the edit slide canvas 2024-04-23 17:21:17 +02:00
Petri Järvisalo c15fcdaff0 Merge pull request #44 from reaby/dependabot/npm_and_yarn/tar-6.2.1 
Bump tar from 6.1.12 to 6.2.1
 2024-04-12 12:21:14 +03:00
dependabot[bot] 6f07a5f6ec Bump tar from 6.1.12 to 6.2.1 
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.12 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.12...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-11 05:18:50 +00:00
Petri Järvisalo 2ad0af1e89 Merge pull request #43 from reaby/dependabot/npm_and_yarn/express-4.19.2 
Bump express from 4.18.2 to 4.19.2
 2024-04-05 14:30:48 +03:00
dependabot[bot] 8c29c066f6 Bump express from 4.18.2 to 4.19.2 
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-28 16:41:49 +00:00
Petri Järvisalo 609768a273 Merge pull request #42 from reaby/dependabot/npm_and_yarn/ip-2.0.1 
Bump ip from 2.0.0 to 2.0.1
 2024-02-21 15:41:43 +02:00
dependabot[bot] 2623f0341e Bump ip from 2.0.0 to 2.0.1 
Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-20 18:43:50 +00:00
Petri Järvisalo 923ee57722 Merge branch 'master' of https://github.com/reaby/infoscreen3 2023-12-01 02:39:17 +02:00
Petri Järvisalo 239178f525 adds clear button to status text, removed non-working youtube display. 2023-12-01 02:39:03 +02:00
Petri Järvisalo 57bb336477 Merge pull request #40 from VibroAxe/patch-2 
Update edit.js
 2023-11-30 16:05:11 +02:00
James Kinsman 4d763809ef Update edit.js 
Added a grid emphasis at 4:3 to assist with designing slides for older projection environments
 2023-11-30 11:19:21 +00:00
Petri Järvisalo 02269f03bc Update readme with more recent docker container instructions! 2023-11-30 02:43:10 +02:00
Petri Järvisalo b76887de40 Merge pull request #39 from VibroAxe/patch-1 
Docker file has invalid command causing error on build
 2023-11-30 02:40:29 +02:00
James Kinsman 52aabffd8a Create docker-compose.yml 
Added new docker-compose.yml file to simplify docker deployment

Uses bind mounts for data to allow persistance between images

Deploy using `docker compose up -d --build` after editing the .env
 2023-11-29 22:07:58 +00:00
James Kinsman 46a74061b8 Update Dockerfile 
config-default.js doesn't exist, use config.js instead
 2023-11-29 22:03:03 +00:00
Petri Järvisalo 2d0701bdc9 update package-lock.json 2023-11-29 22:55:16 +02:00
Petri Järvisalo 3e9ae5e6a2 implement #38 - add accesskey for views 2023-11-29 22:54:11 +02:00
Petri Järvisalo 84389c7dfc readme fixes 2023-11-12 03:29:44 +02:00
Petri Järvisalo fd494661ff fixes.. to readme 2023-11-12 03:27:51 +02:00
Petri Järvisalo 5c14b71e30 more badges to readme! 2023-11-12 03:23:42 +02:00
Petri Järvisalo 2c59a25e66 add better chat link 2023-11-12 03:19:57 +02:00
Petri Järvisalo cc44c610eb add discord link 2023-11-12 02:54:27 +02:00
Petri Järvisalo f7c98a1477 add *.zip to gitignore 2023-11-12 02:12:45 +02:00
Petri Järvisalo a0875f8c1f Update Infoscreen3 to 1.6.4 
* Update npm dependencies
* Change config to use environmental variables,
* Fix videos to actually show (modern browsers needs muted volume)
* Fix videos to load actually for lite and css views
* Provide zip with precompiled binaries for super-easy setup
 2023-11-12 02:06:32 +02:00
Petri Järvisalo 383d9123ef Merge pull request #35 from reaby/dependabot/npm_and_yarn/semver-6.3.1 
Bump semver from 6.3.0 to 6.3.1
 2023-09-20 01:02:27 +03:00
dependabot[bot] 32347b1b66 Bump semver from 6.3.0 to 6.3.1 
Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-11 22:28:02 +00:00
Petri Järvisalo 0f77e31d45 Merge pull request #33 from reaby/dependabot/npm_and_yarn/socket.io-parser-4.2.3 
Bump socket.io-parser from 4.2.1 to 4.2.3
 2023-06-06 16:08:34 +03:00
dependabot[bot] d04cc0a7ed Bump socket.io-parser from 4.2.1 to 4.2.3 
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.1 to 4.2.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/4.2.1...4.2.3)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-24 00:41:37 +00:00
Petri Järvisalo c6fb569206 Merge pull request #32 from reaby/dependabot/npm_and_yarn/engine.io-and-socket.io-6.4.2 
Bump engine.io and socket.io
 2023-05-22 06:42:24 +03:00
dependabot[bot] f2082f8e7a Bump engine.io and socket.io 
Bumps [engine.io](https://github.com/socketio/engine.io) to 6.4.2 and updates ancestor dependency [socket.io](https://github.com/socketio/socket.io). These dependencies need to be updated together.


Updates `engine.io` from 6.2.1 to 6.4.2
- [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/6.2.1...6.4.2)

Updates `socket.io` from 4.5.3 to 4.6.1
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/4.5.3...4.6.1)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
- dependency-name: socket.io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-04 00:55:47 +00:00
Petri Järvisalo 6787175a53 Merge pull request #30 from reaby/dependabot/npm_and_yarn/sqlite3-5.1.5 
Bump sqlite3 from 5.1.2 to 5.1.5
 2023-03-19 20:39:34 +02:00
dependabot[bot] 9516dd8b8b Bump sqlite3 from 5.1.2 to 5.1.5 
Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.1.2 to 5.1.5.
- [Release notes](https://github.com/TryGhost/node-sqlite3/releases)
- [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.1.2...v5.1.5)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-13 21:48:48 +00:00
Petri Järvisalo 3ac13068f2 Merge pull request #29 from tormodhope/master 
Update Dockerfile
 2023-02-11 04:05:38 +02:00
Petri Järvisalo e7f7c1f275 Merge pull request #28 from reaby/dependabot/npm_and_yarn/http-cache-semantics-4.1.1 
Bump http-cache-semantics from 4.1.0 to 4.1.1
 2023-02-11 04:03:04 +02:00
tormodhope 855167c166 Update Dockerfile 
added "rm /usr/bin/python" because bin already exists and Docker build fail withour removing ut first.
 2023-02-10 16:20:48 +01:00
dependabot[bot] 3ac33eea4a Bump http-cache-semantics from 4.1.0 to 4.1.1 
Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-04 12:03:32 +00:00