2134 Commits

Author SHA1 Message Date
AEon-Jan
d9362d137e Fix Gameserver Buttons 2020-07-24 02:04:13 +02:00
Jan
9087cc8af7
Merge pull request #1280 from Nexus633/master
Fix Left4Dead Dedicated Server Id and Modfolder: Fix (#1267)
2020-07-24 00:09:48 +02:00
Nexus633
77d6e0b9f2 Fix Left4Dead Dedicated Server Id and Modfolder: Fix (#1267) 2020-07-23 23:57:17 +02:00
Nexus633
31c1d326a0 Merge remote-tracking branch 'remotes/easy-wi/master' 2020-07-23 23:56:24 +02:00
Nexus633
8508334ada Fix Left4Dead Dedicated Server Id and Modfolder: Fix (#1267) 2020-07-23 23:53:09 +02:00
Jan
d690b341a5
Merge pull request #1279 from Nexus633/master
Fix Master Voiceserver TS3 update check
2020-07-23 22:22:10 +02:00
Nexus633
ffa4d2658d Fix Master Voiceserver TS3 update check 2020-07-23 22:17:27 +02:00
Jan
ee0b35834d
Merge pull request #1277 from Nexus633/master
Add option für colored Dashboard -> add $coloreddashboard = true; to stuff/config.php
2020-07-22 23:20:54 +02:00
Nexus633
7fb5a4ec01 Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-22 23:17:50 +02:00
Nexus633
60d3ac7e34 Add option für colored Dashboard -> add $coloreddashboard = true; to stuff/config.php 2020-07-22 23:14:59 +02:00
Jan
93546ef631
Merge pull request #1276 from Nexus633/master
Fix gameserver cfg editor (#1268)
2020-07-22 22:28:40 +02:00
Nexus633
4a99b1515f Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-22 22:22:00 +02:00
Nexus633
a91b786ddb Fix gameserver cfg editor (#1268) 2020-07-22 22:21:15 +02:00
Jan
09e5b26184
Merge pull request #1275 from Nexus633/master
Fix Teamspeak Import ( #1164 )
2020-07-22 19:44:46 +02:00
Nexus633
d6ec8dbc63 Fix Teamspeak Import (1164) 2020-07-22 19:41:54 +02:00
Jan
077f652d66
Merge pull request #1274 from Nexus633/master
Fix closecursor
6.1.7
2020-07-21 22:55:39 +02:00
Nexus633
202dd36c7b Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-21 22:53:31 +02:00
Nexus633
d42f15e081 Fix closecursor 2020-07-21 22:53:10 +02:00
Jan
1b2162e06d
Merge pull request #1273 from Nexus633/master
update 6.1.7
2020-07-21 22:32:42 +02:00
Nexus633
7682c821ce Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-21 22:30:30 +02:00
Nexus633
8e5afc8df2 update 2020-07-21 22:29:41 +02:00
Jan
79f19d4c62
Merge pull request #1272 from Nexus633/master
Fix Updater, Add easy-wi update email Template
2020-07-21 22:24:54 +02:00
Nexus633
17350e50aa Fix Updater, Add easy-wi update email Template 2020-07-21 22:22:50 +02:00
Jan
a8112b1c90
Merge pull request #1271 from Nexus633/patch-2
Change tranceID to transID
2020-07-21 16:07:29 +02:00
Andre Rohlf
1d08ff869b
Change tranceID to transID
Fix
2020-07-21 16:06:19 +02:00
Jan
fc16a75188
Merge pull request #1270 from Nexus633/patch-1
Change SELECT id to tranceID
2020-07-21 12:46:51 +02:00
Andre Rohlf
963ef54e5f
Change SELECT id to tranceID
Fix Error column not found
2020-07-21 08:24:01 +02:00
AEon-Jan
bddbbae8f1 #1070 Dashboard "error-displays" stay blue until an issue occurred 2020-07-21 01:52:26 +02:00
Jan
45d0f2c2dd
Merge pull request #1269 from Nexus633/master
Fix Exemples Module, Add Exemple Module, Prepare update 6.1.7
2020-07-20 23:28:16 +02:00
Nexus633
ec58d4b7c9 Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-20 23:23:01 +02:00
Nexus633
1400e6e24a Fix exemple Module, Add Exemple Module, prepare to update 6.1.7 2020-07-20 23:22:16 +02:00
AEon-Jan
8bc924f296 Removed Useless Lines 2020-07-20 20:38:45 +02:00
Jan
14f90f666b
Merge pull request #1266 from Nexus633/master
Update PhpMailer (#1208), Fix Mailtransport, Fix a lot of bugs in Tickets
2020-07-19 10:37:10 +02:00
Nexus633
d3f5303577 Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-18 23:06:49 +02:00
Nexus633
fd4ee14b57 Update PhpMailer (#1208), Fix Mailtransport, Fix a lot of bugs in Tickets 2020-07-18 23:05:58 +02:00
Jan
804c4d9f15
Merge pull request #1264 from Nexus633/master
Add attribute target="_blank" for userswitch, Add Minecraft update Service, Fix gamelist -> mc
2020-07-18 00:19:25 +02:00
Nexus633
1b40c41b2f Add Minecraft update Service, Fix gamelist -> mc 2020-07-18 00:06:23 +02:00
Jan
21736dde6d
Merge pull request #1263 from Nexus633/master
FIX #1262
2020-07-15 22:30:58 +02:00
Nexus633
31fa98cdd0 FIX #1262 2020-07-15 22:13:58 +02:00
Jan
0f67c8ee7f
Merge pull request #1261 from Nexus633/master
Add DNS compatibility to App/Game master #1255
2020-07-14 23:36:41 +02:00
Nexus633
6d97fde6ae Add DNS compatibility to App/Game master #1255 2020-07-14 23:24:53 +02:00
Jan
5c53d612ae
Merge pull request #1260 from Nexus633/master
FIX #1225
2020-07-14 22:19:16 +02:00
Nexus633
78c2ab3b35 FIX #1225 2020-07-14 22:13:41 +02:00
Nexus633
41016653c1 Revert "Bump version (#1258)"
This reverts commit 36021ca3
2020-07-14 20:50:01 +02:00
Lacrimosa99
650a1719c1
Update table_settings.php (#1259) 2020-07-14 20:49:15 +02:00
Lacrimosa99
ef8e4ae6a6 Revert "Bump version (#1258)"
This reverts commit 36021ca3
2020-07-14 20:45:36 +02:00
Nexus633
a116fb0190 Merge branch 'master' of https://github.com/easy-wi/developer 2020-07-14 20:43:29 +02:00
Lacrimosa99
36021ca308
Bump version (#1258) 6.1.5 6.1.6 2020-07-14 19:50:33 +02:00
Lacrimosa99
247e1cb84d
Bump version (#1257) 2020-07-14 19:47:40 +02:00
Jan
42400aa377
Undo Changes 6.0.5 2020-07-14 18:52:10 +02:00