beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
439 commits 7 branches 34 tags 24 MiB
Commit graph

233 commits

Author SHA1 Message Date
AnonDev 574dd24871
Update ServerController.php 2021-11-07 18:04:56 +01:00
1day2die 487040f06a DocBlocks 2021-11-07 18:02:53 +01:00
AnonDev 84a214aedd
Update ProductController.php 2021-11-07 18:01:23 +01:00
AnonDev 5b8ca6e9c5
Update ProfileController.php 2021-11-07 18:00:29 +01:00
AnonDev 23424d4ed4
Update ServerController.php 2021-11-07 17:58:01 +01:00
AVMG 7d36d3b1a4
Merge pull request #270 from ControlPanel-gg/product_linking 
added node location in node select
 2021-11-07 16:30:03 +01:00
AVMG20 88f2c22804 added node location in node select 2021-11-07 16:29:18 +01:00
AVMG20 2eb4d6ba74 updated side nav bar 2021-11-07 12:16:46 +01:00
AVMG 0039950a01
Merge pull request #267 from ControlPanel-gg/configuration_options_caching 
Caching configuration options
 2021-11-07 12:12:21 +01:00
AVMG20 bf5c36b232 cleanup 2021-11-07 12:10:46 +01:00
AVMG20 8c7c938c6a fine tuning :) 2021-11-07 12:07:30 +01:00
AVMG20 5cb91ea767 Caching configuration options 2021-11-07 02:13:36 +01:00
AVMG20 24e6d48496 removed pterodactyl pages, added overview page, made server create work 2021-11-07 01:47:16 +01:00
AVMG20 16a7d174e9 new server create page w.i.p 2021-11-06 01:56:57 +01:00
Jovan Jovanovic 9ac391d75b fix(tax): formatCurrency -> formatToCurrency 2021-11-06 01:32:51 +01:00
AVMG20 75622d3958 Merge remote-tracking branch 'origin/product_links' into development 2021-11-05 19:46:50 +01:00
1day2die 9e8abe314b Refactor as J22j suggested 2021-11-05 17:38:05 +01:00
WBLKLeipe 3f67ac5f21 Fixing FormatCurrency 2021-11-05 09:00:18 +01:00
WBLKLeipe 93d8dfcf0b EVERYTHING WORKING - Safing 2021-11-05 08:45:29 +01:00
WBLKLeipe c69c28bd89 Brackets! 2021-11-05 07:59:25 +01:00
WBLKLeipe 6797410cb4 Adding Tax, beautify 2021-11-05 07:43:57 +01:00
1day2die bff97e836d basically added tax 2021-11-04 21:42:17 +01:00
AVMG20 79b1be655c Syntax error and changing notification text 2021-11-03 20:35:07 +01:00
AVMG fbfbbda8f3
Merge pull request #243 from 1day2die/Fix_HomeView_CreditsLeft 
Credits-Left box from View to Controller
 2021-11-03 20:10:06 +01:00
Dennis 5ad0899516
:: to -> 2021-11-03 13:46:53 +01:00
1day2die 1056e1db8b let magic make this even better 
Right DataTypes, Removed unnessecary function
 2021-10-27 19:09:09 +02:00
WBLKLeipe aca06b5441 Fixing OUT_OF_CREDITS Text 2021-10-27 09:13:52 +02:00
WBLKLeipe 85c188182d PSR12 2021-10-27 08:41:07 +02:00
WBLKLeipe d2705cb838 Space space space enter 2021-10-27 07:48:41 +02:00
WBLKLeipe 46173d7bfb Beautify 2021-10-27 07:48:00 +02:00
Dennis 1edb4eb583
pass credits 2021-10-26 19:26:41 +02:00
Dennis 72165b0d95
fix strings to int 2021-10-26 19:24:08 +02:00
1day2die a2e4798b3d PSR12 2021-10-26 17:55:55 +02:00
1day2die fe588c5069 more variables 2021-10-26 17:51:15 +02:00
WBLKLeipe c92b435f65 Comments 2021-10-26 16:54:51 +02:00
WBLKLeipe 903ca36b7b The ways supposed to be 2021-10-26 16:53:53 +02:00
WBLKLeipe 3055c2f550 Fixed Redundant code 2021-10-26 16:24:57 +02:00
WBLKLeipe 70b937324e formatting? 2021-10-26 16:18:16 +02:00
WBLKLeipe ed3edd181b Fix 2021-10-26 16:12:47 +02:00
Jozef 015f735a4f Added to it shows the currency of your coins in the notification 2021-10-26 14:53:11 +01: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
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
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
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
Jovan Jovanovic 76595aa7bb Change input type based on configuration type 2021-10-03 23:47:06 +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
Johannes 241014134f Fix formatting 2021-09-27 20:27:06 +02:00
Johannes b1ca573dd1 User server gets suspended / unsuspended if an user accounts get suspended / unsuspended 2021-09-27 18:43:07 +02:00
Johannes 4c060fd270 Add the ability to Suspend Users 2021-09-26 17:50:13 +02:00
AVMG20 f4237b2e88 Charges the first hour worth of credits upon creating a server. 2021-09-15 08:37:43 +02:00
AVMG20 822d3b9540 fixed admin delete server, when server couldn't be found 
when you try to delete a server which has already been deleted in pterodactyl, the delete will trow an error.
 2021-09-15 08:30:15 +02:00
AVMG20 5877ddbe81 update auto unsuspend servers to be server resource friendlier 2021-09-09 21:09:57 +02:00
AVMG20 b8c8cb7404 cleanup + auto unsuspend servers when credits update 2021-09-09 20:50:16 +02:00
Jovan Jovanovic 5333139204 Use product limmit instead of hardcoded one 2021-08-10 00:49:28 +02:00
Jovan Jovanovic e764327e32
Merge branch 'development' into custom-notifications 2021-08-04 23:15:04 +02:00
Jovan Jovanovic e58b8c2aad Add array separator 2021-08-04 22:17:50 +02:00
Jovan Jovanovic e97ae55725 Send notification to multiple users 2021-08-04 22:01:50 +02:00
Jovan Jovanovic a19cbb1575 Merge database and mail fields 2021-08-03 22:46:58 +02:00
Jovan Jovanovic 0597b4aabe Add admin ui 2021-08-03 04:03:02 +02:00
Jovan Jovanovic aa19844d8e Remove required_if 2021-08-03 00:25:55 +02:00
Jovan Jovanovic 2f92967a9c Add notifications api 2021-08-03 00:10:59 +02:00
AVMG20 e9bc2e8827 CREDITS_DISPLAY_NAME 2021-08-02 20:32:22 +02:00
AVMG20 3f78d7dd1d small addition to the delete 2021-08-02 19:44:14 +02:00
AVMG20 370c85585c added the option to change the credits display name 2021-08-02 19:25:33 +02:00
AVMG20 cd4a01db7b make user command, made password field invis 2021-08-02 17:52:26 +02:00
AVMG20 07454ddd78 500 | Server Error on Duplicate Voucher #133 
Fixed!
 2021-08-02 17:49:37 +02:00
AVMG20 a07749e04b fixed a bug: is ptero is down don't delete the server from our side 
if pterodactylpanel would be down and you would delete your server then it would be removed from controlpanel but not from pterodactyl, it now makes sure to delete on pterodactyl before deleting on controlpanel
 2021-08-02 16:47:22 +02:00
AVMG20 27028c9711 cleanup 2021-08-02 16:33:34 +02:00
AVMG a857aa488a
Merge pull request #152 from Hiekki4/development 
increment & decrement endpoints
 2021-08-02 16:20:52 +02:00
António Duarte f177ae53ce
Update UserController.php 2021-08-01 18:52:44 +01:00
AVMG 9abd00f97a
Merge pull request #156 from j122j/vouchers-add-time 
Vouchers add time
 2021-07-29 19:48:15 +02:00
Jovan Jovanovic f0a31fd4e2 Add support to add time for voucher expires_at 2021-07-28 18:22:12 +02:00
Jovan Jovanovic 916fbad8af Clean up some code 2021-07-28 16:56:02 +02:00
Hiekki adba5b1fdb Validation for negative values 2021-07-28 09:47:10 +01:00
AVMG20 a5d030e710 improved the make user command to give better feedback 2021-07-28 10:05:01 +02:00
Hiekki b12007aea3 decrement and increment endpoints 2021-07-27 13:20:31 +01:00
Hiekki 696ce64df3 [WIP] increment 2021-07-27 09:15:10 +01:00
Jovan Jovanovic bdc1981c36 Add DynamicNotification and notification api endpoints 2021-07-26 04:24:55 +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