Commit graph

199 commits

Author SHA1 Message Date
AVMG 9abd00f97a
Merge pull request #156 from j122j/vouchers-add-time
Vouchers add time
2021-07-29 19:48:15 +02:00
Jovan Jovanovic 98df07269f Add APP_TIMEZONE env variable 2021-07-28 18:29:06 +02:00
Jovan Jovanovic f0a31fd4e2 Add support to add time for voucher expires_at 2021-07-28 18:22:12 +02:00
AVMG 2293afaad2
Merge pull request #153 from ControlPanel-gg/improve_make_user_command
improved the make user command to give better feedback
2021-07-28 10:09:17 +02:00
AVMG20 a5d030e710 improved the make user command to give better feedback 2021-07-28 10:05:01 +02:00
AVMG 97e35b56bf
Merge pull request #150 from j122j/add-trusted-proxies
Add trusted proxies
2021-07-26 16:14:45 +02:00
AVMG f2fa61e277
Merge pull request #149 from Hiekki4/development
ControlPanel CopyRight & AddCredits endpoint
2021-07-26 16:08:28 +02:00
Jovan Jovanovic 07e4537e01 add trustedproxy config 2021-07-26 01:05:26 +02:00
Hiekki f331049ec0 AVMG 2021-07-25 23:38:12 +01:00
António Duarte 57edcd0b57
Update UserController.php 2021-07-25 19:20:43 +01:00
António Duarte dbf389e717
Update UserController.php 2021-07-25 19:19:59 +01:00
António Duarte 87f57af510
Update api.php 2021-07-25 19:04:44 +01:00
Hiekki 32f6fb5198 AddCredits endpoint is working 2021-07-25 17:07:03 +01:00
Hiekki 28ab548094 credits endpoint [WORK IN PROGRESS] 2021-07-23 20:41:49 +01:00
António Duarte bd77efe4b4
Update main.blade.php 2021-07-23 00:07:01 +01:00
AVMG a46f1c36a4
Update .env.example 2021-07-19 23:44:56 +02:00
AVMG 88b3120e79
Merge pull request #132 from ControlPanel-gg/development
Fixed 500 error when linking discord accounts
2021-07-16 09:23:09 +02:00
AVMG20 cb4ade5a5d Fixed 500 error when linking discord accounts 2021-07-16 09:21:30 +02:00
AVMG c7e6684582
Merge pull request #129 from ControlPanel-gg/development
added voucher API, removed a tiny bug regarding discord users not being deleted
2021-07-15 22:18:23 +02:00
AVMG20 4d0c9deab9 added voucher api 2021-07-15 22:16:26 +02:00
AVMG20 fc2d972183 Fixed a bug where deleting a user wouldn't delete the linked discord acc 2021-07-13 21:33:08 +02:00
AVMG 6290bac6b5
Update README.md 2021-07-12 14:31:18 +02:00
AVMG af508ded4b
Merge pull request #123 from ControlPanel-gg/development
Development
2021-07-12 14:11:16 +02:00
AVMG20 a4863075eb small error response change 2021-07-12 13:47:57 +02:00
AVMG20 735097d722 tested voucher controller 2021-07-12 13:44:26 +02:00
AVMG20 cfc61bebda automatically close redeem modal after successful redeem 2021-07-12 12:59:41 +02:00
AVMG20 78d298c119 added datetime picker and better date validation 2021-07-12 12:54:59 +02:00
AVMG 4a63591975
Merge pull request #120 from ControlPanel-gg/verify
improved force verify, added login recaptcha, removed store page when no valid paypal configs where found
2021-07-11 11:07:38 +02:00
AVMG20 1ddddf1806 added redeem voucher button to the store page aswel 2021-07-11 11:06:23 +02:00
AVMG20 4e9ba7866f improved force verify, added login recaptcha
+ removed store when paypal isn't set-up correctly
2021-07-11 11:03:35 +02:00
AVMG20 7c4fedfa93 added activity log to vouchers, added rate limits to voucher redeem form 2021-07-10 09:41:24 +02:00
AVMG20 348868d6bd detach all vouchers from the user when deleting the user 2021-07-10 09:24:14 +02:00
AVMG20 f50ba11340 updated the left menu 2021-07-10 09:20:44 +02:00
AVMG20 8b4ccaabc9 made voucher memo nullable 2021-07-10 09:15:47 +02:00
AVMG20 6895dd72cb removed button 2021-07-10 09:13:56 +02:00
AVMG 17e2bd1b01
Merge pull request #116 from ControlPanel-gg/vouchers
Added a voucher system
2021-07-10 09:11:18 +02:00
AVMG20 7aa6acb5d8 added the ability to edit vouchers 2021-07-10 09:10:42 +02:00
AVMG ae23c5cf3f
Merge pull request #115 from ControlPanel-gg/vouchers
Added a voucher system
2021-07-10 08:59:12 +02:00
AVMG20 55b2223435 Added Voucher system 2021-07-10 08:58:11 +02:00
AVMG20 a7f8d71f92 Added voucher system 2021-07-10 00:18:22 +02:00
AVMG20 ed553674b2 Added voucher system 2021-07-10 00:11:13 +02:00
AVMG 40ee71d61b
Merge pull request #110 from ControlPanel-gg/development
Development
2021-07-05 22:05:51 +02:00
AVMG20 77444496a2 cleanup 2021-07-05 21:49:28 +02:00
AVMG20 c0f9436ffd tiny validation fixes 2021-07-05 21:06:13 +02:00
AVMG20 6a431edd8b Allocation limit added 2021-07-05 20:47:29 +02:00
AVMG 6499941166
Merge pull request #103 from ControlPanel-gg/user_import
import script for pterodactyl users
2021-07-01 14:34:42 +02:00
AVMG20 2279cc492e import script for pterodactyl users 2021-07-01 14:33:52 +02:00
AVMG 42c4cea7ec
Merge pull request #102 from ControlPanel-gg/server_creation
Server creation
2021-07-01 13:11:32 +02:00
AVMG20 212313a47e beautify 2021-07-01 11:47:40 +02:00
AVMG20 2862c64979 added some more error logging to server creation 2021-06-30 23:53:28 +02:00