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

506 commits

Author SHA1 Message Date
IceToast a9373cc18f fix: 🐛 Fix Type Error at serverUpdate return phpdoc 2022-08-15 14:49:02 +02:00
IceToast 7365cdee18 Merge branch 'main' into billing_system 
# Conflicts:
#	app/Http/Controllers/ServerController.php
#	composer.lock
#	resources/lang/de.json
#	resources/lang/en.json
#	resources/views/servers/index.blade.php
 2022-08-15 12:39:58 +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
IceToast e3e7329d31 fix: 🐛 See last commit 2022-07-28 23:33:04 +02:00
IceToast b80a8640de fix: 🐛 Server creation fail when server.price = user.credits 2022-07-28 23:20:39 +02:00
IceToast de96d6d6d3 fix: 🚑️ Fixed credits check at server creation & formatted prices nicely 2022-07-27 23:26:03 +02:00
IceToast 1fb855a684 feat: ✨ Added Quartely billing period 2022-07-22 05:31:05 +02:00
IceToast f3856c88ba fix: 🐛 Credt usage at dashboard 2022-07-22 04:54:33 +02:00
IceToast dbbdfaa623 fix: 📝 Undo Naming 2022-07-22 04:15:40 +02:00
IceToast 7369e8a643 refactor: 🚚 Rename Yearly -> Annually 2022-07-22 04:09:34 +02:00
IceToast 08208cab72 feat: ✨ Added yearly and half-yearly billing periods 2022-07-22 04:00:23 +02:00
IceToast 78a6787607 feat: ✨ Added Server Cancelation route method and charging 2022-07-22 03:52:49 +02:00
IceToast 16eb9eeca6 Merge branch 'main' of https://github.com/ControlPanel-gg/dashboard into billing_system 2022-07-20 23:16:41 +02: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
IceToast 570b0b014f fix: 🚑️ ChargeServer Command 2022-06-16 19:03:59 +02:00
IceToast cad41ffb0a feat: ✨ Update last_billed to current time on unsuspend server 2022-06-16 16:18:27 +02:00
IceToast a26f6dd137 feat: ✨ Added last_billed to server model & always charge first & fixed Charge Server command 2022-06-16 16:15:57 +02:00
IceToast fb23f43f88 feat: ✨ Added ChargeServers command & updated laravel schedule command 2022-06-16 14:54:42 +02:00
IceToast 9e8bd0a2d3 feat: ✨ Added weekly to billing_period options 2022-06-16 14:54:06 +02:00
IceToast 87bca5c52b feat: ✨ Added billing_period to validation 2022-06-16 12:04:52 +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