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 e1dbbb21ee [FIX] Paypal Checkout disabled even if keys are set 2023-01-30 11:19:50 +01:00
1day2die 65f777baae [Fix] Themes || [Feature] Add blue-ish theme for case study 2023-01-30 10:47:32 +01:00
Dennis 6263f163f9
[FEATURE] wysiwyg editor for imprint/Tos/privacy (#669) 2023-01-29 23:15:35 +01:00
IceToast 5ae631ee4f
refactor: ♻️ Move referral_code generation to trait 2023-01-29 23:12:34 +01:00
1day2die 2c16379ec1 [FIX] User creation command referral code 2023-01-29 21:01:14 +01:00
Dennis 0919202599
Merge branch 'development' into development 2023-01-29 20:31:10 +01:00
Dennis ca26da77c7
Fix the theme selector. (#666) 2023-01-29 20:29:46 +01:00
Ferks-FK bc2d5088c5 Fix the theme selector. 2023-01-29 18:32:13 +00:00
1day2die 8b4477bc8d finish usefullinks, fix vite 2023-01-26 23:26:00 +01:00
Dennis 0cfa02b4ce
[Feature] Add useful links in top menubar (#662) 2023-01-26 16:08:57 +01:00
1day2die de1c2e7b57 fix Themes Settings Tab 2023-01-26 15:56:54 +01:00
1day2die d8dcad4991 better query 2023-01-26 15:29:38 +01:00
1day2die b343134c01 using enums, adding more positions 2023-01-26 15:22:42 +01:00
1day2die f923eef868 Useful Links in Topbar 2023-01-25 22:32:59 +01:00
Ferks 8eb92ef7c6
Merge branch 'ControlPanel-gg:development' into development 2023-01-25 13:30:10 -04:00
IceToast a3ba6257ba feat: 🔊 Add error logger on registration 2023-01-23 21:34:22 +01:00
IceToast 9260b967b3 fix: 🚑️ Enable/Disable Payment Gateways TODO: Integrate into settings! 2023-01-23 16:57:28 +01:00
Ferks-FK 977d2ddd18 Simple fix of a checkbox 2023-01-22 19:58:28 +00:00
IceToast d11bb52038 feat: ✨ Support csrf ignoring routes for extensions & moved extension config to own file 2023-01-21 01:04:23 +01:00
IceToast 3909202958 feat: ✨ Added several functions to the ExtensionHelper 2023-01-21 01:03:47 +01:00
IceToast e795b65df1 refactor: ♻️ Less DB Calls & PartnerDiscount bug at invoice make() 2023-01-20 23:44:49 +01:00
IceToast dba8e2ebb8 refactor: ♻️ So stupid function calls... 2023-01-20 23:43:23 +01:00
IceToast 6216892594 fix: 🐛 PartnerDiscount expected auth login -> not possible on webhooks 2023-01-20 23:42:53 +01:00
IceToast 5289567773 fix: 🚑️ Remove queueable from Eventhandler to fix execution 2023-01-19 16:05:56 +01:00
Dennis e978cb9914
[FEATURE] Server owner transfer 
[FEATURE] Server owner transfer
 2023-01-19 11:29:42 +01:00
IceToast c468e53fad Merge branch 'development' into feature/extendable_payment_gateways 2023-01-19 11:28:51 +01:00
IceToast 7d81fa6247 feat: ✨ Added Server owner transfer 2023-01-19 11:18:51 +01:00
IceToast 64cd6ac98c feat: ✨ Added API-Route support for extensions 2023-01-18 18:05:32 +01:00
IceToast 41f8fd9550 fix: 🐛 PayPalSuccess payment status "paid" & Require auth on payment routes 2023-01-17 15:35:58 +01:00
1day2die a088b81366 remove unused imports 2023-01-16 18:53:09 +01:00
IceToast c0ae772981 chore: ⚰️ Remove dead "use" 2023-01-15 02:24:16 +01:00
IceToast 314d4de816 fix: 🐛 TypeError 2023-01-15 02:22:03 +01:00
IceToast 11a8e50d2e fix: 🐛 Only update user credits etc. when paid 2023-01-15 01:41:42 +01:00
IceToast a34825a692 feat: ✨ Moved Stripe functions to extension 2023-01-15 01:41:16 +01:00
IceToast e6ef07139d feat: ✨ Moved Stripe routes to extension 2023-01-15 01:40:25 +01:00
IceToast eb122a99f2 fix: 🐛 Give Config Method the extension name 2023-01-15 01:39:38 +01:00
IceToast 45aaac4189 refactor: ♻️ Extracted Payment logic to events 2023-01-15 00:43:13 +01:00
IceToast f00a11da0e refactor: 🔥 Remove activtiylog from payment model -> no spam 2023-01-15 00:42:20 +01:00
IceToast b72d142a81 chore: 🔥 Remove Paypal Code from payment controller 2023-01-15 00:41:57 +01:00
IceToast 0257bf4e85 feat: ✨ Added new events to extract payment logic 2023-01-15 00:41:31 +01:00
IceToast 59f8e8c696 fix: 🐛 Payment Creation and use paymentEvent instead of manual invoice creation 2023-01-14 23:34:54 +01:00
IceToast 69dd7a6855 fix: 🐛 Removed PayPal Routes -> to own extension 2023-01-14 23:33:30 +01:00
IceToast 8a03a7b16b feat: ✨ Create Invoiceable Trait & Fix routing Extension 2023-01-14 22:38:13 +01:00
IceToast 10f7e2688e feat: ✨ Create PaymentEvent / Listener 2023-01-14 22:37:23 +01:00
IceToast 3cb42a8b60 Merge branch 'development' into feature/extendable_payment_gateways 
# Conflicts:
#	app/Http/Controllers/Admin/PaymentController.php
 2023-01-14 21:51:20 +01:00
1day2die ac1ca07e64 Update Misc.php 2023-01-13 19:34:37 +01:00
1day2die a0800509cb ticket notify 2023-01-13 19:32:32 +01:00
1day2die e6b2afa1dc possible ticket fix 2023-01-13 19:18:50 +01:00
1day2die bfa24facf9 Update Notification on Overview 2023-01-13 18:57:35 +01:00
1day2die 540bb95291 SEO 2023-01-13 18:41:32 +01:00
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