Commit graph

304 commits

Author SHA1 Message Date
WBLKLeipe
70b937324e formatting? 2021-10-26 16:18:16 +02:00
WBLKLeipe
ed3edd181b Fix 2021-10-26 16:12:47 +02:00
Dennis
8ee876b30a
Fix for " redeclare"-error 2021-10-26 14:13:42 +02:00
AVMG
1e987bbbbc
Merge pull request #229 from 1day2die/fix_welcomemessage
Disable Discord/Email Credit WelcomeMessages if not set
2021-10-20 08:22:10 +02:00
AVMG
d71bc134fb
Merge pull request #230 from 1day2die/fix_SERVER_LIMIT_REWARD_
Fix server limit reward
2021-10-19 19:49:45 +02:00
AVMG20
deb4e89701 temp removed discord images 2021-10-14 20:32:44 +02:00
Dennis
e89c25cdcf
Hotfix HotFix to change Hard-Coded Server-limit-after-IRL-Purchase
This is absolutely not tested as i have no dev env right now
2021-10-14 09:08:20 +02:00
Dennis
c2dadbf996
Reverse changes 2021-10-14 09:03:59 +02:00
Dennis
306536206b
Update WelcomeMessage.php 2021-10-13 23:29:42 +02:00
Dennis
8b963f170c
Update WelcomeMessage.php 2021-10-13 23:26:18 +02:00
Dennis
c8c8ae753d
Disable Discord/Email Credit Messages if not set
This is a quick and dirty way I suppose? But it works and makes Companys that dont give away free servers not look that dumb
2021-10-13 23:21:53 +02:00
AVMG20
2249738446 Return value was placed in an array, this altered the response from the array which could break existing implementations 2021-10-13 22:34:05 +02:00
AVMG
e8a4f3d97f
Merge pull request #228 from 1day2die/discord_avatar
Fixed error with discord pics not loading
2021-10-13 22:07:02 +02:00
Dennis
73fe6a502a
space 2021-10-13 22:05:37 +02:00
Dennis
4f838d89bb
Fixed error with discord pics not loading 2021-10-13 19:24:40 +02:00
AVMG
6763f5e60c
Merge pull request #227 from 1day2die/discord_avatar
If discord is connected, use discord avatar instead of gravatar
2021-10-13 18:49:19 +02:00
Dennis
6325cd8f87
Beautify as AVMG wishes spacespacespaceenter 2021-10-13 18:47:45 +02:00
Dennis
228d55c389
If discord is connected, use discord avatar instead of gravatar 2021-10-13 18:39:51 +02:00
AVMG
5902819776
Merge pull request #225 from ControlPanel-gg/api_improvements
Api improvements
2021-10-13 08:04:45 +02:00
AVMG20
01b5ec80a6 cleanup 2021-10-12 21:37:11 +02:00
AVMG20
1f8b34e684 improved api endpoints
added includes and filters on most GET request routes
added discord id support for notifications
added register user endpoint
2021-10-12 21:36:13 +02:00
AVMG20
3665b9ff55 improved user controller 2021-10-11 23:46:06 +02:00
LogischJo
e53a055bc2
Merge pull request #211 from j122j/minimum-credits
Add minimal credits per product
2021-10-06 21:55:11 +02:00
Dennis
4f953474cd
Merge pull request #216 from j122j/config-types
Change input type based on configuration type
2021-10-04 13:34:10 +02:00
Dennis
0ddeadfd27
Merge pull request #214 from j122j/voucher-users
Shows who redeemed vouchers
2021-10-04 13:33:39 +02:00
Dennis
e58047d5fd
Merge pull request #218 from j122j/fix-servers-page
Fix servers page
2021-10-04 13:32:17 +02:00
Jovan Jovanovic
11135e14dd Fix servers page 2021-10-04 08:51:51 +02:00
Jovan Jovanovic
76595aa7bb Change input type based on configuration type 2021-10-03 23:47:06 +02:00
Jovan Jovanovic
4bc9d4cdce Fix tooltips 2021-10-03 21:28:34 +02:00
AVMG
7ca7e1273b
Merge pull request #213 from j122j/form-data-casts
Add form data casts for numbers
2021-10-03 19:18:03 +02:00
Jovan Jovanovic
4d3c6c7a13 Fix select if using global limit 2021-10-03 15:18:08 +02:00
Jovan Jovanovic
7d229ec25b Remove the global check for minimum required credits 2021-10-03 14:47:51 +02:00
Jovan Jovanovic
6be22c0eea Add voucher users 2021-10-03 00:55:10 +02:00
Jovan Jovanovic
76d7710d0e Add form data casts for numbers 2021-10-02 18:29:32 +02:00
Jovan Jovanovic
28af0c0530 Add minimal credits per product 2021-10-01 23:21:49 +02:00
AVMG
991bd17528
Merge pull request #205 from LogischJo/feature/SuspendUsers
Add the ability to Suspend Users
2021-09-27 21:46:04 +02:00
Johannes
241014134f Fix formatting 2021-09-27 20:27:06 +02:00
AVMG
3c3d6e5dad
Merge pull request #210 from 1day2die/development
Added "ran out of Credits"
2021-09-27 18:55:52 +02:00
Dennis
df3efe8b0a
Merge branch 'ControlPanel-gg:development' into development 2021-09-27 18:48:05 +02:00
Johannes
b1ca573dd1 User server gets suspended / unsuspended if an user accounts get suspended / unsuspended 2021-09-27 18:43:07 +02:00
Dennis
e708e2fc24
Update home.blade.php
This will add the "Out of credits in..." Box when you have and never had Credits.

It will show the box and the text "You ran out of Credits" if you purchased Credits and your servers got Suspended
2021-09-27 18:42:55 +02:00
AVMG
b24428d8bf
Merge pull request #209 from 1day2die/better_loggin
Better loggin
2021-09-27 18:11:00 +02:00
Dennis
8bdeed08af
Added "ran out of Credits" 2021-09-27 17:21:17 +02:00
Dennis
2d21d2d2ca
Added better Logs 2021-09-27 15:32:27 +02:00
Dennis
20e14bb3e7
Fixed Spacing 2021-09-27 10:12:13 +02:00
Dennis
2ece359140
fixed placeholders 2021-09-27 10:11:13 +02:00
Dennis
82006f24af Added re-sync Discord and Discord Card to Profile 2021-09-27 10:08:44 +02:00
AVMG
4ea4a6910c
Merge pull request #202 from GeckoBoy84/patch-1
Update checkout.blade.php
2021-09-26 21:54:41 +02:00
Johannes
4c060fd270 Add the ability to Suspend Users 2021-09-26 17:50:13 +02:00
GeckoBoy84
e43339cca6
Update checkout.blade.php
Fix checkout details being the wrong way round.
2021-09-25 13:37:11 +01:00