Commit graph

445 commits

Author SHA1 Message Date
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
BitSec 87e067d49c
Update LICENSE 2021-09-30 05:01:29 +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
AVMG ab9407baa7
Merge pull request #199 from j122j/fix-out-of-credits
Fix division by zero
2021-09-25 10:36:54 +02:00
Jovan Jovanovic 6bcc5d8f29 Fix division by zero 2021-09-25 04:03:14 +02:00
AVMG 01175eeb54
Merge pull request #101 from anondev-sudo/patch-4
Email formatting
2021-09-23 18:08:34 +02:00
AVMG aa3819ef8e
Merge pull request #195 from nickdevnl/patch-1
Disabled button after button push.
2021-09-23 18:07:56 +02:00
AVMG 7af898dbe8
Merge pull request #198 from 1day2die/main
Show Server price per Hour / per Month
2021-09-23 18:07:17 +02:00
AVMG 18e9e78f84
Merge pull request #197 from 1day2die/patch-1
Show Days left till servers get suspended in Dashboard
2021-09-23 18:03:08 +02:00
Dennis e3e2a6593b
Using {{CREDITS_DISPLAY_NAME}} 2021-09-22 18:22:05 +02:00
Dennis daf0bee8be
Change to Days/Hours and color changes
It now changes to x hours left when its less than 1 Day left.

Also changes color ranging from
more than 14 Days = Green
Between 14 and 7 Days = Yellow
less than 7 days = red


Im sure theres a way better way to code this but it works
2021-09-22 18:07:19 +02:00
Dennis 75f86614e9
Correct intendation and table Setup as requested 2021-09-22 17:17:44 +02:00
Dennis 6d435122b7
Cleaned a minor mistake 2021-09-22 16:06:29 +02:00
Dennis 15c6bdce9b
Show Server price per Hour / per Month 2021-09-22 16:04:21 +02:00