Compare commits

..

19 Commits

Author SHA1 Message Date
dependabot[bot]
511ac49ee5 Bump multer from 2.0.2 to 2.1.1 in /src/server
Bumps [multer](https://github.com/expressjs/multer) from 2.0.2 to 2.1.1.
- [Release notes](https://github.com/expressjs/multer/releases)
- [Changelog](https://github.com/expressjs/multer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/expressjs/multer/compare/v2.0.2...v2.1.1)

---
updated-dependencies:
- dependency-name: multer
  dependency-version: 2.1.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-05 08:06:53 +00:00
01f2752fcb Finish version bump 2026-01-22 13:25:04 +01:00
Janis Hutz
89d7ca4379 Merge pull request #55 from janishutz/dependabot/npm_and_yarn/src/webapp/main/multi-a3036e3255
Bump tar and pdfjs-dist in /src/webapp/main
2026-01-22 12:23:11 +00:00
dependabot[bot]
aad3f47e41 Bump tar and pdfjs-dist in /src/webapp/main
Removes [tar](https://github.com/isaacs/node-tar). It's no longer used after updating ancestor dependency [pdfjs-dist](https://github.com/mozilla/pdf.js). These dependencies need to be updated together.


Removes `tar`

Updates `pdfjs-dist` from 4.2.67 to 4.10.38
- [Release notes](https://github.com/mozilla/pdf.js/releases)
- [Commits](https://github.com/mozilla/pdf.js/compare/v4.2.67...v4.10.38)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 
  dependency-type: indirect
- dependency-name: pdfjs-dist
  dependency-version: 4.10.38
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-22 12:23:05 +00:00
Janis Hutz
ad2a86c3ab Merge pull request #54 from janishutz/dependabot/npm_and_yarn/src/webapp/setup/lodash-4.17.23
Bump lodash from 4.17.21 to 4.17.23 in /src/webapp/setup
2026-01-22 12:22:55 +00:00
Janis Hutz
fa104cc100 Merge pull request #53 from janishutz/dependabot/npm_and_yarn/src/server/lodash-es-4.17.23
Bump lodash-es from 4.17.21 to 4.17.23 in /src/server
2026-01-22 12:22:43 +00:00
dependabot[bot]
04db517ff1 Bump lodash from 4.17.21 to 4.17.23 in /src/webapp/setup
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash
  dependency-version: 4.17.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-22 12:22:14 +00:00
dependabot[bot]
20f841367b Bump lodash-es from 4.17.21 to 4.17.23 in /src/server
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-version: 4.17.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-22 12:22:11 +00:00
Janis Hutz
707091be2b Merge pull request #52 from janishutz/dependabot/npm_and_yarn/src/webapp/main/lodash-es-4.17.23
Bump lodash-es from 4.17.21 to 4.17.23 in /src/webapp/main
2026-01-22 12:20:57 +00:00
Janis Hutz
e15ed09735 Merge pull request #51 from janishutz/dependabot/npm_and_yarn/src/server/multi-516376c24b
Bump tar and bcrypt in /src/server
2026-01-22 12:20:40 +00:00
Janis Hutz
e67fac0436 Merge pull request #50 from janishutz/dependabot/npm_and_yarn/src/server/multi-6d05d0e569
Bump qs, body-parser and express in /src/server
2026-01-22 12:20:28 +00:00
Janis Hutz
28ebd7da97 Merge pull request #49 from janishutz/dependabot/npm_and_yarn/src/server/nodemailer-7.0.11
Bump nodemailer from 7.0.10 to 7.0.11 in /src/server
2026-01-22 12:20:11 +00:00
f7ea972264 Prepare version bump 2026-01-22 13:19:31 +01:00
28acb2070c [Android] Update app 2026-01-22 13:08:38 +01:00
dependabot[bot]
000339add6 Bump lodash-es from 4.17.21 to 4.17.23 in /src/webapp/main
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.21 to 4.17.23.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.21...4.17.23)

---
updated-dependencies:
- dependency-name: lodash-es
  dependency-version: 4.17.23
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-21 23:39:30 +00:00
dependabot[bot]
2895709c73 Bump tar and bcrypt in /src/server
Removes [tar](https://github.com/isaacs/node-tar). It's no longer used after updating ancestor dependency [bcrypt](https://github.com/kelektiv/node.bcrypt.js). These dependencies need to be updated together.


Removes `tar`

Updates `bcrypt` from 5.1.1 to 6.0.0
- [Release notes](https://github.com/kelektiv/node.bcrypt.js/releases)
- [Changelog](https://github.com/kelektiv/node.bcrypt.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kelektiv/node.bcrypt.js/compare/v5.1.1...v6.0.0)

---
updated-dependencies:
- dependency-name: tar
  dependency-version: 
  dependency-type: indirect
- dependency-name: bcrypt
  dependency-version: 6.0.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-16 21:36:26 +00:00
dependabot[bot]
cda7769398 Bump qs, body-parser and express in /src/server
Bumps [qs](https://github.com/ljharb/qs), [body-parser](https://github.com/expressjs/body-parser) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together.

Updates `qs` from 6.14.0 to 6.14.1
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.14.0...v6.14.1)

Updates `body-parser` from 1.20.3 to 1.20.4
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.20.3...1.20.4)

Updates `express` from 4.21.2 to 4.22.1
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/v4.22.1/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.21.2...v4.22.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: direct:production
- dependency-name: body-parser
  dependency-version: 1.20.4
  dependency-type: direct:production
- dependency-name: express
  dependency-version: 4.22.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-01-01 13:53:43 +00:00
dependabot[bot]
19ecd7b1db Bump nodemailer from 7.0.10 to 7.0.11 in /src/server
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 7.0.10 to 7.0.11.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v7.0.10...v7.0.11)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-version: 7.0.11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-12-02 03:47:08 +00:00
0219e718dc Finish version bump & security fixes 2025-11-19 15:25:18 +01:00
18 changed files with 591 additions and 1661 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "libreevent",
"version": "1.1.14",
"version": "1.1.16",
"description": "A free and open source event management solution",
"main": "/dist/app.js",
"scripts": {

View File

@@ -6,7 +6,7 @@
#
#
v="V1.1.14"
v="V1.1.16"
echo "
_ _ _ _
@@ -73,6 +73,15 @@ node prepareDB.js
sleep 1
echo "
==> Updating dependencies of backend <==
"
npm audit fix --force
sleep 1
echo "
==> Collecting files to archive <==

View File

@@ -6,6 +6,7 @@
<GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="/usr/share/java/gradle" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>

View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">

View File

@@ -5,14 +5,14 @@ plugins {
android {
namespace = "com.janishutz.libreevent"
compileSdk = 35
compileSdk = 36
defaultConfig {
applicationId = "com.janishutz.libreevent"
minSdk = 24
targetSdk = 35
versionCode = 5
versionName = "1.0.1"
targetSdk = 36
versionCode = 6
versionName = "1.1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

View File

@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-feature android:name="android.hardware.camera" android:required="true" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="true"
tools:ignore="UnnecessaryRequiredFeature" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
@@ -11,7 +16,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.LibreeventEntryControl"
tools:targetApi="31">
tools:targetApi="35">
<activity
android:name=".MainActivity"
android:exported="true">
@@ -26,8 +31,4 @@
android:exported="true">
</activity>
</application>
<uses-feature android:name="android.hardware.camera" android:required="true" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="true" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

View File

@@ -13,6 +13,7 @@ import com.journeyapps.barcodescanner.CaptureActivity
import com.journeyapps.barcodescanner.CaptureManager
import com.journeyapps.barcodescanner.DecoratedBarcodeView
import java.util.Date
import androidx.core.content.edit
class ScannerActivity : CaptureActivity() {
@@ -30,10 +31,10 @@ class ScannerActivity : CaptureActivity() {
val logoutButton = findViewById<Button>(R.id.logoutButton)
logoutButton.setOnClickListener {
val sharedPref = applicationContext.getSharedPreferences( "login", MODE_PRIVATE )
val editor = sharedPref.edit()
editor.remove( "password" )
editor.remove( "loginOk" )
editor.apply()
sharedPref.edit {
remove("password")
remove("loginOk")
}
val switchIntent = Intent(this, MainActivity::class.java)
switchIntent.putExtra("hasSwitched", true)
startActivity(switchIntent)
@@ -52,14 +53,12 @@ class ScannerActivity : CaptureActivity() {
captureManager.initializeFromIntent(intent, null)
captureManager.decode()
barcodeView.decodeContinuous(object : BarcodeCallback {
override fun barcodeResult(result: BarcodeResult?) {
if (result != null) {
val scannedData = result.text // This is the scanned data (e.g., QR code content)
handleScanResult(scannedData)
}
barcodeView.decodeContinuous { result ->
if (result != null) {
val scannedData = result.text // This is the scanned data (e.g., QR code content)
handleScanResult(scannedData)
}
})
}
}
private fun handleScanResult(result: String) {
@@ -73,13 +72,17 @@ class ScannerActivity : CaptureActivity() {
lastScanned = result
val alertDialogBuilder = AlertDialog.Builder(this)
if ( status == "ticketValid" ) {
alertDialogBuilder.setTitle("Ticket is valid")
} else if ( status == "ticketInvalid" ) {
alertDialogBuilder.setTitle("Ticket is invalid")
} else if ( status == "Error" ) {
alertDialogBuilder.setTitle("There was an error connecting")
alertDialogBuilder.setMessage("Please log out and log in again")
when (status) {
"ticketValid" -> {
alertDialogBuilder.setTitle("Ticket is valid")
}
"ticketInvalid" -> {
alertDialogBuilder.setTitle("Ticket is invalid")
}
"Error" -> {
alertDialogBuilder.setTitle("There was an error connecting")
alertDialogBuilder.setMessage("Please log out and log in again")
}
}
alertDialogBuilder.setIcon(android.R.drawable.ic_dialog_alert)

View File

@@ -10,13 +10,14 @@
<com.journeyapps.barcodescanner.DecoratedBarcodeView
android:id="@+id/barcodeScannerView"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<Button
android:id="@+id/logoutButton"
android:layout_width="122dp"
android:layout_height="wrap_content"
android:text="Log out" />
android:text="@string/log_out" />
</com.journeyapps.barcodescanner.DecoratedBarcodeView>
</FrameLayout>

View File

@@ -1,3 +1,4 @@
<resources>
<string name="app_name">libreevent entry control</string>
<string name="log_out">Log out</string>
</resources>

View File

@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.9.1" apply false
id("com.android.application") version "8.13.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
}

View File

@@ -1,6 +1,6 @@
#Sun Sep 03 11:15:46 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "libreevent",
"version": "1.1.14",
"version": "1.1.15",
"description": "Free & Open source event management solution",
"main": "index.js",
"directories": {
@@ -9,7 +9,7 @@
"dependencies": {
"@pdfme/generator": "^5.3.15",
"axios": "^1.8.4",
"bcrypt": "^5.1.1",
"bcrypt": "^6.0.0",
"body-parser": "^1.20.3",
"crypto-js": "^4.2.0",
"express": "^4.21.2",
@@ -17,7 +17,7 @@
"html-to-text": "^9.0.5",
"multer": "^2.0.0",
"mysql": "^2.18.1",
"nodemailer": "^6.10.1",
"nodemailer": "^7.0.10",
"pdf-lib": "^1.17.1",
"png-to-ico": "^2.1.8",
"qs": "^6.14.0",

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "libreevent",
"version": "1.1.14",
"version": "1.1.15",
"private": false,
"scripts": {
"dev": "vite --host",

View File

@@ -1,12 +1,12 @@
{
"name": "libreevent-setup",
"version": "1.1.14",
"version": "1.1.15",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "libreevent-setup",
"version": "1.1.14",
"version": "1.1.15",
"dependencies": {
"pinia": "^2.1.3",
"vue": "^3.3.4",
@@ -1672,10 +1672,11 @@
"dev": true
},
"node_modules/js-yaml": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
"dev": true,
"license": "MIT",
"dependencies": {
"argparse": "^2.0.1"
},
@@ -1724,10 +1725,11 @@
}
},
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"dev": true
"version": "4.17.23",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
"integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
"dev": true,
"license": "MIT"
},
"node_modules/lodash.merge": {
"version": "4.6.2",
@@ -2295,9 +2297,9 @@
"dev": true
},
"node_modules/vite": {
"version": "6.3.6",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
"integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
"version": "6.4.1",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz",
"integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==",
"dev": true,
"license": "MIT",
"dependencies": {

View File

@@ -1,6 +1,6 @@
{
"name": "libreevent-setup",
"version": "1.1.14",
"version": "1.1.15",
"private": true,
"scripts": {
"dev": "vite",