Automated merge from dev to live

Automated merge from main to dev
Merge branch 'auto-merge'
2026-07-13 13:33:27 +02:00 · 2026-07-13 13:33:18 +02:00 · 2026-07-13 13:32:11 +02:00 · 2026-07-13 13:06:52 +02:00 · 2026-07-13 13:06:43 +02:00 · 2026-07-13 13:02:52 +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
Bruno Eckhardt	13a98f2880	Automated merge from dev to live	2026-07-13 13:33:27 +02:00
Bruno Eckhardt	cba34c4329	Automated merge from main to dev	2026-07-13 13:33:18 +02:00
Bruno Eckhardt	1fba004b9b	Merge branch 'auto-merge'	2026-07-13 13:32:11 +02:00
Bruno Eckhardt	c173ea0c18	Automated merge from dev to live	2026-07-13 13:06:52 +02:00
Bruno Eckhardt	82ac74a7ee	Automated merge from main to dev	2026-07-13 13:06:43 +02:00
Bruno Eckhardt	2748349060	Merge branch 'auto-merge'	2026-07-13 13:02:52 +02:00
Bruno Eckhardt	a0914b60a6	Automated merge from dev to live	2026-07-13 12:35:55 +02:00
Bruno Eckhardt	0541557ae9	Automated merge from main to dev	2026-07-13 12:35:47 +02:00
Bruno Eckhardt	992ac5eb6a	Merge branch 'auto-merge'	2026-07-13 12:35:11 +02:00
Bruno Eckhardt	e98dbdc77b	Automated merge from dev to live	2026-07-13 12:32:44 +02:00
Bruno Eckhardt	aa4829343e	Automated merge from main to dev	2026-07-13 12:32:36 +02:00
Bruno Eckhardt	523400ac0e	Merge branch 'auto-merge'	2026-07-13 12:31:02 +02:00
Bruno Eckhardt	7d8a891798	Merge branch 'dev' into live	2026-07-13 10:46:24 +02:00
Bruno Eckhardt	ddbf5b697f	Merge branch 'main' into dev	2026-07-13 10:46:18 +02:00
Bruno Eckhardt	643be91c57	Merge branch 'dev' into live	2026-07-08 09:41:07 +02:00
Bruno Eckhardt	f1b58a3399	Merge branch 'main' into dev	2026-07-08 09:40:54 +02:00
Bruno Eckhardt	61ada9f2e3	Merge branch 'dev' into live	2026-07-08 08:59:44 +02:00
Bruno Eckhardt	5759f999c5	Merge branch 'main' into dev	2026-07-08 08:59:32 +02:00
Bruno Eckhardt	20e0e09305	Merge branch 'dev' into live	2026-07-08 08:16:57 +02:00
Bruno Eckhardt	d8a0121ac2	Merge branch 'main' into dev	2026-07-08 08:16:50 +02:00
Tower	733fc7dc12	Merge branch 'dev' into live	2026-07-07 19:20:36 +02:00
Tower	99f4f8a746	Merge branch 'main' into dev	2026-07-07 19:20:24 +02:00
Bruno Eckhardt	81ff082d71	Merge branch 'dev' into live	2026-07-07 14:28:05 +02:00
Bruno Eckhardt	3b7453563d	Merge branch 'main' into dev	2026-07-07 14:27:52 +02:00
Bruno Eckhardt	9b1dfa8441	Merge branch 'dev' into live	2026-07-07 10:08:57 +02:00
Bruno Eckhardt	2f285f284b	Merge branch 'main' into dev	2026-07-07 10:08:46 +02:00
Bruno Eckhardt	fe5979d4d0	Merge branch 'dev' into live	2026-07-07 09:07:50 +02:00
Bruno Eckhardt	950fcd6f3b	Merge branch 'main' into dev	2026-07-07 09:07:39 +02:00
Tower	3843677903	Merge branch 'dev' into live	2026-07-06 22:30:50 +02:00
Tower	ca867e91d0	Merge branch 'main' into dev	2026-07-06 22:30:45 +02:00
Tower	ad763caaf5	Merge branch 'dev' into live	2026-07-06 22:26:56 +02:00
Tower	9ca5e7617c	Merge branch 'main' into dev	2026-07-06 22:26:50 +02:00
Tower	37871de69f	Merge branch 'dev' into live	2026-07-06 21:52:19 +02:00
Tower	0431257a44	Merge branch 'main' into dev	2026-07-06 21:52:03 +02:00
Bruno Eckhardt	33e4388b20	Merge branch 'dev' into live	2026-07-06 15:51:42 +02:00
Bruno Eckhardt	5479d0e364	Merge branch 'main' into dev	2026-07-06 15:51:36 +02:00
Bruno Eckhardt	206d56b10c	Merge branch 'dev' into live	2026-07-06 15:18:31 +02:00
Bruno Eckhardt	f0f7c16abc	Merge branch 'main' into dev	2026-07-06 15:18:25 +02:00
Bruno Eckhardt	859f67ca02	Merge branch 'dev' into live	2026-07-06 14:33:49 +02:00
Bruno Eckhardt	69199c78eb	Merge branch 'main' into dev	2026-07-06 14:33:41 +02:00
Bruno Eckhardt	e0e9bca81a	Merge branch 'dev' into live	2026-07-06 14:25:43 +02:00
Bruno Eckhardt	232cc27ce3	Merge branch 'main' into dev	2026-07-06 14:25:25 +02:00
Bruno Eckhardt	d727452dd8	Merge branch 'dev' into live	2026-07-06 14:22:17 +02:00
Bruno Eckhardt	636f6b5c37	Merge branch 'main' into dev	2026-07-06 14:22:06 +02:00
Bruno Eckhardt	62844653d2	Merge branch 'dev' into live	2026-07-06 14:13:54 +02:00
Bruno Eckhardt	88a95d28e3	Merge branch 'main' into dev	2026-07-06 14:13:46 +02:00
Bruno Eckhardt	14e01891a2	Merge branch 'dev' into live	2026-07-06 13:50:26 +02:00
Bruno Eckhardt	4cadcf263d	Merge branch 'main' into dev	2026-07-06 13:50:21 +02:00
Bruno Eckhardt	1dfc6c9ac5	Merge branch 'dev' into live	2026-07-06 13:42:29 +02:00
Bruno Eckhardt	4e43f234c2	Merge branch 'main' into dev	2026-07-06 13:42:22 +02:00
Bruno Eckhardt	671688f37d	Merge branch 'dev' into live	2026-07-06 08:47:47 +02:00
Bruno Eckhardt	1eff0a54a6	Merge branch 'main' into dev	2026-07-06 08:47:42 +02:00
Bruno Eckhardt	5ea0308b83	mobile optimizing	2026-07-06 08:46:30 +02:00
Bruno Eckhardt	859c1563fb	Merge branch 'dev' into live	2026-07-06 08:41:00 +02:00
Bruno Eckhardt	9c1c86a7e7	Merge branch 'main' into dev	2026-07-06 08:40:53 +02:00
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