Merge branch 'DEV' into LIVE

Merge branch 'main' into DEV
2026-07-05 19:13:32 +02:00 · 2026-07-05 19:13:20 +02:00 · 2026-07-05 19:07:18 +02:00 · 2026-07-05 19:07:07 +02:00 · 2026-07-01 20:10:15 +02:00 · 2026-07-01 20:09:58 +02:00
1 changed files with 1 additions and 1 deletions
@@ -44,7 +44,7 @@ function db_connect() {
        ]
    ];

-    $enviroment = 'vpn';
+    $enviroment = 'live';

    mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT);
Author	SHA1	Message	Date
Tower	d6232f6418	Merge branch 'DEV' into LIVE	2026-07-05 19:13:32 +02:00
Tower	878b691ab1	Merge branch 'main' into DEV	2026-07-05 19:13:20 +02:00
Tower	a7368eb18f	Merge branch 'DEV' into LIVE	2026-07-05 19:07:18 +02:00
Tower	38adea29cf	Merge branch 'main' into DEV	2026-07-05 19:07:07 +02:00
Tower	f6fbc8404c	Merge branch 'DEV' into LIVE	2026-07-01 20:10:15 +02:00
Tower	e45fecf6ff	Merge branch 'main' into DEV	2026-07-01 20:09:58 +02:00
Bruno Eckhardt	5dce558640	Merge branch 'DEV' into LIVE	2026-05-20 12:33:38 +02:00
Bruno Eckhardt	ffb6f38af0	Merge branch 'main' into DEV	2026-05-20 12:33:26 +02:00
Tower	3e54b917ca	Merge branch 'DEV' into LIVE	2026-05-19 19:50:24 +02:00
Tower	4756d0586f	Merge branch 'main' into DEV	2026-05-19 19:50:14 +02:00
Bruno Eckhardt	86a1eecd8d	Merge branch 'DEV' into LIVE	2026-05-19 10:38:34 +02:00
Bruno Eckhardt	9dcf0ced19	Merge branch 'main' into DEV	2026-05-19 10:38:20 +02:00
Bruno Eckhardt	c05f9f721c	Merge branch 'DEV' into LIVE	2026-05-19 10:11:25 +02:00
Bruno Eckhardt	04c89fb676	Merge branch 'main' into DEV	2026-05-19 10:11:14 +02:00
Bruno Eckhardt	5160bbc5a5	Merge branch 'DEV' into LIVE	2026-05-19 07:17:41 +02:00
Bruno Eckhardt	e9550b9a05	Merge branch 'main' into DEV	2026-05-19 07:17:31 +02:00
Bruno Eckhardt	c5aabcf5d1	Merge branch 'DEV' into LIVE	2026-05-11 14:17:44 +02:00
Bruno Eckhardt	e13ac6c503	Merge branch 'main' into DEV	2026-05-11 14:17:15 +02:00
Bruno Eckhardt	bcaaac8a19	Merge branch 'DEV' into LIVE	2026-05-11 13:18:35 +02:00
Bruno Eckhardt	e2ee377e35	Merge branch 'main' into DEV	2026-05-11 13:18:23 +02:00
Bruno Eckhardt	57813e3309	Merge branch 'DEV' into LIVE	2026-05-11 13:14:55 +02:00
Bruno Eckhardt	9eb06a3a16	Merge branch 'main' into DEV	2026-05-11 13:14:46 +02:00
Bruno Eckhardt	a920fe99a8	Merge branch 'DEV' into LIVE	2026-05-11 13:09:39 +02:00
Bruno Eckhardt	0776ae8dd0	Merge branch 'main' into DEV	2026-05-11 13:09:30 +02:00
Bruno Eckhardt	21fa9145cb	Merge branch 'DEV' into LIVE	2026-05-11 12:55:32 +02:00
Bruno Eckhardt	c350f4c776	Merge branch 'main' into DEV	2026-05-11 12:55:21 +02:00
Tower	fd5f3093c6	Merge branch 'DEV' into LIVE	2026-04-10 21:44:08 +02:00
Tower	c47723ec00	Merge branch 'main' into DEV	2026-04-10 21:43:42 +02:00
Tower	737ea6e962	Merge branch 'DEV' into LIVE	2026-04-08 16:54:39 +02:00
Tower	0e5cdcd725	Merge branch 'main' into DEV	2026-04-08 16:54:24 +02:00
Bruno Eckhardt	739fda06e7	db fix	2026-04-08 16:36:53 +02:00
Bruno Eckhardt	3d170a38d8	Merge branch 'main' into DEV	2026-04-08 16:35:47 +02:00
Bruno Eckhardt	03febbc877	fix	2026-03-27 06:57:33 +01:00
Bruno Eckhardt	bdc41bbd48	Merge branch 'main' into LIVE	2026-03-27 06:56:36 +01:00
Bruno Eckhardt	1f3e8228d1	fix	2026-03-26 08:13:59 +01:00
Bruno Eckhardt	dccec7642b	Merge branch 'DEV' into LIVE # Conflicts: # WEBROOT/controller/DatabaseConnect.php	2026-03-26 08:13:20 +01:00
Bruno Eckhardt	6f74a11a79	Merge branch 'main' into DEV	2026-03-26 08:11:59 +01:00
Bruno Eckhardt	ea51b1808a	Merge branch 'main' into DEV	2026-03-25 08:47:16 +01:00
Bruno Eckhardt	2eacb68fd6	Merge branch 'main' into LIVE	2026-03-25 08:47:05 +01:00
Bruno Eckhardt	8c53e850c1	Merge branch 'main' into LIVE	2026-03-25 07:46:45 +01:00
Bruno Eckhardt	0d9b9e7b07	Merge branch 'main' into DEV	2026-03-25 07:46:23 +01:00
Bruno Eckhardt	9b6060d39f	Merge branch 'main' into DEV	2026-03-23 15:45:43 +01:00
Bruno Eckhardt	01d6c69b3e	Merge branch 'main' into LIVE	2026-03-23 15:45:26 +01:00
Bruno Eckhardt	7c94592b2c	Merge branch 'main' into LIVE	2026-03-23 10:48:08 +01:00
Bruno Eckhardt	883a1fd76f	Merge branch 'main' into DEV	2026-03-23 10:37:03 +01:00
Bruno Eckhardt	dd08ec793a	Merge branch 'main' into DEV	2026-03-23 08:58:33 +01:00
Bruno Eckhardt	24799dffbe	Merge branch 'main' into LIVE	2026-03-23 08:58:26 +01:00
Bruno Eckhardt	34f464f442	dev db	2026-03-23 08:20:25 +01:00
Bruno Eckhardt	d1464d874f	Merge branch 'main' into LIVE	2026-03-23 08:19:28 +01:00
Bruno Eckhardt	8f5a616dd8	live db	2026-03-23 08:18:54 +01:00