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

682 commits

Author SHA1 Message Date
1day2die 5d7550b43f TinyMCE, MOTD, 2023-01-12 15:43:24 +01:00
1day2die 86d22b5e9a oops. wrong route 2023-01-12 10:35:57 +01:00
1day2die ca4309c131 close button on ticket index 2023-01-12 10:31:56 +01:00
1day2die 8bff4f857b fixes 2023-01-11 16:22:19 +01:00
1day2die 094393e7fb small fixes 2023-01-11 15:48:22 +01:00
1day2die 5bcfd40a34 fix default theme 2023-01-11 15:31:46 +01:00
1day2die 8e1812c1d6 admins shouldnt delete themselves 2023-01-11 11:46:29 +01:00
1day2die a0483865bd fix parent theme 2023-01-11 11:20:23 +01:00
1day2die 9b7ca02f00 add theme support 2023-01-11 11:08:22 +01:00
1day2die 94fe7d245c Alert on Homepage 2023-01-10 19:45:19 +01:00
1day2die 16a48cd2aa allow login via username 2023-01-10 19:12:07 +01:00
Dennis aacbd6780c
Merge branch 'development' into shift-77419 2023-01-06 00:13:50 +01:00
Dennis 7c717ec61c
Many Many small Fixes 
adding minimum credits field in settings (it was present only in the database)
added frontend checks for settings fields (numbers)
added close ticket button for non-admin users
fixed some datatable´s sorting, adding some field, removing dupes,... (etc. Payments table, Products table, Tickets tables)
TOS, imprint and privacy policy in footer - as default they are now disabled
Made partner discounts a little bit easier to understand
little changes to delete user popup (in their profile)
removed the hamburger menu from server cards and made only a single phpmyadmin button
 2023-01-06 00:09:48 +01:00
Dennis 81756c2587
Merge pull request #612 from ok236449/Partners-and-discounts 
Partners and discounts - finishing it up
 2023-01-06 00:09:33 +01:00
ok236449 7ca842e712 many many fixes 2023-01-06 00:01:23 +01:00
1day2die 2304b64d9a fixes 2023-01-05 19:33:46 +01:00
Shift 0e3f6c98aa
Shift cleanup 2023-01-05 17:03:38 +00:00
Shift e947abcab2
Convert deprecated $dates property to $casts 2023-01-05 17:02:42 +00:00
Shift 8f4908b1b7
Adopt class based routes 2023-01-05 17:02:41 +00:00
Shift a9d76b1cfd
Convert optional() to nullsafe operator 2023-01-05 17:02:33 +00:00
Shift 7ee787951b
Shift core files 2023-01-05 17:02:33 +00:00
Shift a57c063e6b
Replace deprecated HEADER_X_FORWARDED_ALL constant 2023-01-05 17:02:13 +00:00
Shift daff0fc566
Streamline $commands property 2023-01-05 17:02:12 +00:00
Shift 472dead0d6
Remove fruitcake/laravel-cors dependency 2023-01-05 17:02:11 +00:00
Shift e948472475
Shift registered middleware 2023-01-05 17:02:11 +00:00
Shift 70208d2157
Apply Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-12 coding style as a base with some minor additions.

You may customize the code style applied by configuring [Pint](https://laravel.com/docs/pint), [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer), or [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) for your project root.

For more information on customizing the code style applied by Shift, [watch this short video](https://laravelshift.com/videos/shift-code-style).
 2023-01-05 17:01:42 +00:00
ok236449 ed5a968d11 finishing up of Partner checkout 
support for 100% discount
 2023-01-04 18:59:52 +01:00
ok236449 b6e45c443c fix admin overview year conditions 
sort currencies
 2023-01-04 18:57:57 +01:00
1day2die 6516f7047a recaptcha on password reset 2023-01-04 12:04:44 +01:00
1day2die 81662b8e17 TOS on register site 2023-01-04 11:51:35 +01:00
IceToast 23cb226196 feat: ✨ Added payment.pay route and enhanced checkOut route controller to serve gateways to view 2023-01-03 21:17:25 +01:00
IceToast 16a7391372 feat: ✨ Fixed extension routes & Added PayPal Extension Routes 2023-01-03 18:31:21 +01:00
1day2die bd2eec9a28 user allowed to delete himself 2023-01-02 15:00:57 +01:00
1day2die d02d6e78ae added TOS 2023-01-02 13:46:21 +01:00
Dennis 8b8d73c3b2
Merge pull request #575 from ok236449/Partners-and-discounts 
Partners and discounts
 2023-01-02 13:09:18 +01:00
IceToast 5d18b36083 feat: added new settings 2022-12-22 22:28:52 +01:00
1day2die c15d0f4ef6 Fix Ticket System 2022-11-29 09:20:24 +01:00
Dennis 6c581ae52a
Merge pull request #595 from Ferks-FK/features-#299 
New Options
 2022-11-07 09:28:39 +01:00
Ferks-FK 8a2d7b67f1 Add a warning of blocked server creation for adm's 2022-11-04 19:15:48 +00:00
Ferks-FK 98045d8896 General fixes 2022-11-04 17:15:16 +00:00
Ferks-FK 566383ccd5 Initial commits to the new options 2022-11-03 22:15:06 +00:00
Dennis 7e7e454ad6
Merge pull request #594 from Ferks-FK/dev 
Fixes user email verification
 2022-11-03 20:43:54 +01:00
Ferks-FK 4709667fe3 Do not send email confirmation if is not changed 2022-11-03 19:42:33 +00:00
Ferks-FK db5074652c Revert "Closes #581" 2022-11-03 19:32:06 +00:00
Ferks-FK 9215f0bc91 Update only when the e-mail address changes. 2022-11-02 17:46:43 +00:00
Ferks-FK 9390f6f4d6 Closes #581 2022-11-02 16:53:52 +00:00
Dennis e1803366b6
Merge pull request #588 from ok236449/development-3 
Fix admin overview error when node got deleted
 2022-10-27 08:53:35 +02:00
Dennis 50bd760b42
fix Moderator API 2022-10-27 08:52:08 +02:00
ok236449 3e99461a70 Fix admin overview error when node got deleted 
on pterodactyl
 2022-10-26 19:13:56 +02:00
ok236449 17e2d284af rename temporary price variable 2022-10-23 10:46:02 +02:00
ok236449 c7ec586157 sync servers button - deleted on ptero + names 2022-10-21 21:12:07 +02:00
ok236449 86cf2981c1 commission from first/every purchase 2022-10-18 23:33:33 +02:00
ok236449 825198fb5a Show referral system on homepage, partnerships 2022-10-18 17:35:10 +02:00
ok236449 63a30a1e57 Yearly tax overview, stop caching ticket overview 2022-10-14 22:59:02 +02:00
ok236449 7537286d3a actually fixing it... 2022-10-14 21:30:07 +02:00
ok236449 8dbd4be6ce fix discount returning null and error 500 2022-10-14 21:05:19 +02:00
ok236449 d41a68c63e add discount to invoices 2022-08-27 20:35:17 +02:00
ok236449 12372b5071 add commission to index view 2022-08-27 19:53:14 +02:00
ok236449 dc0737e803 fix users table sorting and add users to payments 2022-08-27 19:44:27 +02:00
ok236449 3a53ddbc59 partner discounts and their referrals 2022-08-27 18:59:07 +02:00
ok236449 3da23fdc7e Merge branch 'Admin-overview-fixed-counters' 2022-08-24 22:23:49 +02:00
ok236449 c763dac689 Stop caching nodes and counters - hotfix 2022-08-24 22:18:29 +02:00
Dennis 1c389c85c0
Merge pull request #574 from ok236449/development-2 
Resource checks on server creation and upgrade
 2022-08-24 20:11:32 +02:00
ok236449 df0d37bb81 Check for resources when upgrading server 2022-08-24 17:52:51 +02:00
ok236449 30d29cdd62 Check for overallocation for every package 2022-08-24 17:52:05 +02:00
Dennis 5996a4cd8d
Merge pull request #573 from ok236449/Delete-server-on-404 
Some fixes that shouldn´t have been necessary
 2022-08-23 21:10:37 +02:00
ok236449 da9bd9d547 fix division by zero 2022-08-23 20:09:42 +02:00
ok236449 dfc3d0bd42 fix division by zero 2022-08-23 20:08:49 +02:00
Dennis b58002f5f8
Merge pull request #572 from ok236449/Delete-server-on-404 
Delete server on 404 instead of giving error 500 to the user
 2022-08-20 22:54:01 +02:00
ok236449 4871272670 Added latest tickets to admin overview 2022-08-20 21:19:27 +02:00
ok236449 c26a47a982 Delete server on 404 instead of giving 500 2022-08-20 18:49:33 +02:00
ok236449 5fc4103a7c Latest payments section 2022-08-20 17:07:54 +02:00
Dennis 6edc923e3d
Merge pull request #570 from ok236449/small-fixes 
Small fixes
 2022-08-19 22:58:05 +02:00
ok236449 16067c6cc8 sync renamed servers on Pterodactyl 2022-08-19 21:50:04 +02:00
ok236449 c929fd7ddd fix overallocation 2022-08-19 20:14:30 +02:00
ok236449 67ab374f07 merge to v0.8.2 2022-08-19 19:37:37 +02:00
ok236449 043edf9a9b Show individual node status on admin overview 2022-08-19 19:18:44 +02:00
Dennis 1180f531d7
BRANCHNAME uppercase 2022-08-18 15:32:35 +02:00
Dennis 04ed457570
Update last_seen when logging in 
Update last_seen when logging in
 2022-08-18 08:27:48 +02:00
1Day 7b3ae4c787 Update last_seen when logging in 2022-08-18 08:27:00 +02:00
Dennis c8099e9eab
Merge pull request #565 from 1day2die/development 
min required credits per product when upgrading
 2022-08-17 19:32:20 +02:00
1day2die 07a2ebfccc min required credits per product when upgrading 2022-08-17 19:31:14 +02:00
Dennis db6967a7e7
Update AppServiceProvider.php 2022-08-16 23:07:25 +02:00
Dennis daa0b53c37
Merge pull request #560 from 1day2die/development 
show branchname in footer
 2022-08-16 23:03:12 +02:00
1day2die c94c386d85 show branchname in footer 2022-08-16 23:02:22 +02:00
IceToast ff5ad1e2bd feat: ✨ Added validation on enable upgrade system & disabled upgrade route if not enabled 2022-08-16 22:33:59 +02:00
IceToast 5bf5abfda7 feat: ✨ Added Enable Upgrade setting 2022-08-16 22:25:35 +02:00
1day2die 11c29739c7 Revert "Update ServerController.php" 
This reverts commit a443ae854f.
 2022-08-15 16:22:38 +02:00
1day2die 09dba51fa6 Revert "g" 
This reverts commit 5dff5e56fd.
 2022-08-15 16:22:31 +02:00
1day2die 5dff5e56fd g 2022-08-15 16:17:44 +02:00
1day2die a443ae854f Update ServerController.php 2022-08-15 16:14:18 +02:00
SahrulGnwn 3f47fa5e9f Fix Bypass node limit when upgrade 2022-08-15 20:36:14 +07:00
IceToast 5e71c624c7 Merge branch 'development' of https://github.com/ControlPanel-gg/dashboard into development 2022-08-15 14:49:09 +02:00
IceToast a9373cc18f fix: 🐛 Fix Type Error at serverUpdate return phpdoc 2022-08-15 14:49:02 +02:00
1day2die ad6142a986 Update RouteServiceProvider.php 2022-08-15 12:39:54 +02:00
1day2die 569489f175 Update RouteServiceProvider.php 2022-08-15 12:38:29 +02:00
1day2die 199666259b Update HomeController.php 2022-08-15 02:10:53 +02:00
1day2die 9be016982d Update HomeController.php 2022-08-15 02:10:31 +02:00
1day2die 4c2b0dd005 Update HomeController.php 2022-08-15 02:08:42 +02:00
Dennis be932acb78
Merge branch 'development' into development 2022-08-13 23:24:09 +02:00
1day2die 1ca4cea5a4 globally limit post requests 2022-08-13 22:29:57 +02:00
1day2die 66e81ebfcf Fix User-> Server edit bug 2022-08-13 22:21:55 +02:00
SahrulGnwn a9f7de3f45 Update ServerController.php 2022-08-12 20:55:22 +07:00
SahrulGnwn ffb31ac0ad Some Change and Fix 
Fix upgrade button & Fix Blacklist Check & Change how users search on the blacklist
 2022-08-12 18:42:24 +07:00
1Day 877241d699 test client api key button 2022-08-12 13:30:15 +02:00
1Day 88538ab391 Update UserController.php 2022-08-12 12:44:15 +02:00
SahrulGnwn bc5a17157d Fix Delete/Switch Broken 2022-08-12 17:36:08 +07:00
1Day 8cfb069f60 change to paginate 2022-08-12 12:12:58 +02:00
1Day 7e822be443 spelling. Reason updating. 2022-08-12 11:59:20 +02:00
Dennis ce927744a2
Merge pull request #528 from SahrulGnwn/development 
Ticket Blacklist
 2022-08-12 11:27:53 +02:00
SahrulGnwn 9b3fce2808 Ticket Blacklist 2022-08-12 16:01:51 +07:00
Dennis 66de5f6474
Merge pull request #526 from SahrulGnwn/development 
Fix checking free resource node
 2022-08-11 17:27:45 +02:00
SahrulGnwn 7bb3caa494 Fix checking free resource node 2022-08-11 21:55:24 +07:00
IceToast 08b3bd4dc0 fix: 🐛 Typo in clientAdmin 2022-08-11 16:19:12 +02:00
SahrulGnwn 69d9fe5fb0 Restart After Upgrade 2022-08-11 20:50:33 +07:00
Dennis 5f006ce042
Client API Key 
Development
 2022-08-11 15:15:31 +02:00
1Day 602e953ab9 Admin user API key on settings 2022-08-11 14:49:53 +02:00
SahrulGnwn 278ebb4130 Merge branch 'development' of https://github.com/SahrulGnwn/controlpanel into development 2022-08-11 18:48:08 +07:00
SahrulGnwn c1f765af01 Add Throttle Rate Limit 2022-08-11 18:45:27 +07:00
Sahrul Gunawan fe4779d6bf
Merge pull request #1 from SahrulGnwn/dev---upgradesystem 
Dev   upgradesystem
 2022-08-11 18:40:58 +07:00
Dennis 1f9301ef0e
Merge pull request #520 from ControlPanel-gg/dev---upgradesystem 
Dev   upgradesystem
 2022-08-11 12:07:56 +02:00
SahrulGnwn 7ad56dad8d Fix Delete 2022-08-11 16:59:04 +07:00
Dennis c32d6f5e2e
Check for Node allocations 2022-08-11 08:10:24 +02:00
Dennis 6bbbfa041e
GetNodeInfo 2022-08-11 08:06:40 +02:00
Dennis 487dd09f3e
Merge pull request #517 from jozefbonnar/email 
Allows admins to force verify a users email
 2022-08-10 20:25:42 +02:00
Jozef Bonnar 62700a91f6
fixed formatting 2022-08-10 19:14:07 +01:00
Jozef Bonnar 266057b666
Add forced email verify for admins 2022-08-10 19:11:02 +01:00
SahrulGnwn ae25b79f92 Change index table to DataTable 2022-08-10 23:53:13 +07:00
Dennis 915d5e9854
OrderTickets 2022-08-09 07:42:15 +02:00
IceToast 40e927db97 feat: ✨ Added Validation rules for recaptcha credentials 2022-08-06 16:48:50 +02:00
IceToast 935bc05880 fix: 🐛 Recaptcha credentials must not be null even if disabled 2022-08-06 16:39:31 +02:00
IceToast e9348eca52 fix: 🐛 Check if product supports the exact egg as server installed on 2022-08-03 16:43:41 +02:00
Dennis 80390846ad
Merge pull request #504 from SahrulGnwn/main 
Upgrade / Downgrade
 2022-08-03 14:41:19 +02:00
SahrulGnwn 6b5986881d Upgrade / Downgrade 2022-08-03 19:34:00 +07:00
1day2die 20f9331fda enable/disable Ticketsystem 2022-08-03 11:32:38 +02:00
1day2die c823a03466 cleaning up some stuff. changing routes. making it work actually... 2022-08-02 17:37:59 +02:00
SahrulGnwn 94bbea2690 Ticket System 2022-08-01 23:52:16 +07:00
Jens 97f766db27
Update UserController.php 
Fixes an issue when you update a user, it's impossible to update it, the check for referral_code is invalid.

Fixed:
- Deletes the custom check and uses laravel's check to ensure it's valid.
 2022-07-19 20:27:16 +02:00
1Day 0c77046c93 Experimental Server Edit 2022-07-19 10:36:40 +02:00
Dennis 10dcc4233a
Merge pull request #482 from 1day2die/logo-on-login-page 
Logo on Loginpage
 2022-07-12 08:00:28 +02:00
1Day ca481829c5 Logo on Loginpage 2022-07-12 07:57:16 +02:00
Dennis 743753574a
Merge pull request #481 from 1day2die/referral_changes 
Custom Ref ID
 2022-07-12 07:34:42 +02:00
1Day d197a2e251 Custom Ref ID 2022-07-12 07:33:48 +02:00
1Day d21c5f39fa Add GUI Option 2022-07-12 06:53:04 +02:00
Dennis 4af88ade8c
Merge pull request #442 from 1day2die/development 
click to copy Ref URL // Badge Color on Profile
 2022-06-08 11:04:00 +02:00
1Day 0071c2218b click to copy Ref URL // Badge Color on Profile 2022-06-08 11:01:28 +02:00
Dennis 6d4e0addbe
small rewrite of activity log // log refs 
small rewrite of activity log // log refs
 2022-06-08 10:14:22 +02:00
1Day 2bc5e91c25 small rewrite of activity log // log refs 2022-06-08 10:11:55 +02:00
Dennis 681ccd842c
Merge pull request #439 from 1day2die/development 
Development
 2022-06-07 21:58:28 +02:00
1day2die ad8c8b5ebe fixed the worst error ive ever experienced 2022-06-07 21:58:04 +02:00
Dennis 3d1cf9116b
Merge pull request #434 from Tobiletsmc/development 
Increase Controlpanel performance with fetch servers with product to reduce SQL-Queries
 2022-06-07 16:55:11 +02:00
1day2die 5d53353521 fix ) 2022-06-07 16:21:03 +02:00
1day2die ef6a655ce0 Add referral to API i guess? 2022-06-07 16:19:14 +02:00
1day2die d2608c995c Add "both" mode to referrals 2022-06-07 16:04:41 +02:00
Dennis 7eacc4863b
Merge pull request #433 from 1day2die/referral_codes 
Full Referral System
 2022-06-07 10:10:47 +02:00
1Day 33a39fccd9 Switch Modes / Commission - Sign-Up 2022-06-07 10:05:19 +02:00
Tobiletsmc 7ff3540ad8 Undo change in suspend Method 2022-06-05 12:49:53 +02:00
Tobiletsmc 204629539f Clean code and fetch servers with product in unSuspend method 2022-06-05 12:22:26 +02:00
Dennis ce159e9cd6
Merge pull request #432 from 1day2die/readall_button_notifications 
Added read all Button for Notifications
 2022-06-04 15:54:37 +02:00
BuildTools f6eab834fc Fetch servers with product to reduce SQL-Queries 2022-06-04 11:39:23 +02:00
1day2die 7ed402a227 choose who can see their referral URL 2022-06-02 18:41:08 +02:00
1Day 378187aea0 Referal System 2022-06-02 16:11:24 +02:00
1Day 2e17cab295 On NavBar aswell 2022-06-02 08:50:44 +02:00
1Day c97b1fa186 Added Readall Button 2022-06-02 08:44:54 +02:00
1Day 272c75a071 Update SocialiteController.php 2022-05-31 08:39:45 +02:00
1Day 8908f4af8f Fix User order on admin/user 2022-05-30 13:33:24 +02:00
1Day 60a8fa1056 Delete Nests and Nodes Controller 2022-05-30 11:13:37 +02:00
1Day e19ca05723 Refactoring 2022-05-30 11:07:10 +02:00
1Day 8e052572f7 Remove Discord button if not set || translation strings on welcome || total credits no admins 2022-05-30 09:53:11 +02:00
1Day a7b199c01a Add the ability to sell server slots 2022-05-30 09:23:35 +02:00
1day2die 4d3b88e59b Fixed Javascript exploit 2022-04-20 12:12:48 +02:00
IceToast f44641389a feat: 🥅 Updated non "Invoice does not exist" error message 2022-02-15 12:23:05 +01:00
Dennis 87f47b9a74
Hotfix Typo 2022-02-15 10:14:19 +01:00
IceToast 5bca37bc4c feat: ✨ Added Error-logging to laravel.log 2022-02-08 09:46:33 +01:00
IceToast 21485a6175 feat: ✨ Try to get settings - error_log on error 2022-02-08 09:37:29 +01:00
IceToast d81bd44253 fix: 🐛 changed error log to be more generic 2022-02-08 09:30:42 +01:00
IceToast 313fcf87a4 feat: ✨ Added more debug logging for pterodactyl request errors 2022-02-07 18:15:17 +01:00
IceToast e9e539c8c5 fix: 🚑️ Icon uploading 2022-02-07 15:30:47 +01:00
IceToast cebc026d25 fix: 🚑️ Shoud fix 500 on server overview 2022-02-07 15:04:57 +01:00
IceToast 53f6e0586c feat: ✨ Added basic currency support for invoices 2022-02-06 21:10:05 +01:00
1Day 3d9e463b72 change location of install.lock, change strings 2022-01-26 12:48:32 +01:00
IceToast 128b10bbb1 fix: ✨ replaced Settings::getValueByKey with config() 2022-01-25 22:52:19 +01:00
Dennis 95bd093979
Merge branch 'development' into installer_script 2022-01-24 12:40:55 +01:00
1Day 3f3bb79fea warning if installer isnt locked 2022-01-24 12:39:01 +01:00
1Day 2274013221 Updates, fixes, etc 2022-01-24 12:12:50 +01:00
IceToast e79e38ee27 feat: 🔒️ readded missing configurations migration & fixed old paypal_products migration & added seeder descriptions 2022-01-23 23:52:46 +01:00
IceToast 9b797cf779
Merge branch 'development' into settings_rewrite 2022-01-23 15:00:23 +01:00
IceToast 99dff634b0 feat: ✨ Added Mail Settings & Fixed ReCaptcha bug on DB Change (reload config correctly) 2022-01-21 17:20:23 +01:00
IceToast 9193e08180 fix: 🚑️ recaptcha enable/disable button in settings validation 2022-01-21 13:32:31 +01:00
IceToast 046a34c1ee fix: 🚑️ eloquent query crashes composer install if no DB-Data is set. 2022-01-19 23:31:24 +01:00
IceToast 9b11e16ed6 refactor: ♻️ changed Settings::getValueByKey to config() 2022-01-15 18:16:51 +01:00
IceToast c059e9946c feat: 🚑️ Added Pterodactyl Data to Settings 2022-01-15 18:16:22 +01:00
IceToast 8e739ccf74 fix: 🚑️ Fixed Config Variable Name 2022-01-15 17:53:47 +01:00
IceToast c8071b64d9 feat: ✨ Added Enable/Disable Invoices 2022-01-15 17:52:19 +01:00
IceToast 010ddfe3b6 fix: 🥅 fixed validation -> checkboxes return "true" as string 2022-01-15 01:48:40 +01:00
IceToast 7ca6438f35 fix: 🚑️ Added more improved validation & Fixed Language Settings 2022-01-15 01:25:27 +01:00
IceToast 4621547c01 feat: ✨ Allow value column in table to be nullable -> can store "0" values 2022-01-15 00:49:33 +01:00
IceToast 1e085982af feat: ✨ Added improved validation in systemSettings Class 2022-01-15 00:49:07 +01:00
IceToast cb7a757a3a feat: ✨ Added ReCaptcha Settings in Class 2022-01-15 00:48:38 +01:00
IceToast a8c19ffe2c feat: ✨ Added ReCaptcha to Settings & Added option to dis/enable 2022-01-14 21:17:36 +01:00