Commit graph

1026 commits

Author SHA1 Message Date
IceToast fd21665493 fix: 💄 Styling of server buttons 2022-08-15 14:52:49 +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
Dennis 98bb3296e6
Merge pull request #547 from ControlPanel-gg/development
Hotfix Captcha
2022-08-15 12:16:07 +02:00
Dennis ff30fb4bcc
hotfix
hotfix
2022-08-15 12:15:42 +02:00
1day2die c1e809d0c6 hotfix 2022-08-15 12:14:47 +02:00
Dennis 5e507ef737
v0.8
v0.8
2022-08-15 11:43:16 +02:00
Dennis b473cf96b6
Merge pull request #543 from 1day2die/development
Development
2022-08-15 02:34:26 +02:00
1day2die 7ad6c3b53f Update README.md 2022-08-15 02:33:47 +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 130ef95158
Merge pull request #542 from 1day2die/development
Update index.blade.php
2022-08-14 20:49:12 +02:00
1day2die 63d2aad25e Update index.blade.php 2022-08-14 20:42:52 +02:00
Dennis 2b8e4e125b
Sync now button // Recaptcha on settings page
Development
2022-08-14 16:52:49 +02:00
1day2die 766a06a8d0 sync now buttom 2022-08-14 16:51:55 +02:00
1day2die 06fc0047b7 added recaptcha to settings page 2022-08-14 16:47:58 +02:00
Dennis 65e6dd3cfc
Merge pull request #540 from 1day2die/development
Development
2022-08-13 23:24:29 +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
Dennis 1add20ecb6
Merge pull request #539 from SahrulGnwn/development
Development
2022-08-13 10:09:23 +02:00
SahrulGnwn a9f7de3f45 Update ServerController.php 2022-08-12 20:55:22 +07:00
SahrulGnwn f15efd26bd Update blacklist.blade.php 2022-08-12 18:50:27 +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
Dennis 09138c17c7
Merge pull request #536 from 1day2die/development
test client api key button
2022-08-12 13:30:53 +02:00
1Day 877241d699 test client api key button 2022-08-12 13:30:15 +02:00
Dennis 42ff583288
Merge pull request #535 from 1day2die/development
im stoopid
2022-08-12 12:51:07 +02:00
1Day b9d44b589d im stoopid 2022-08-12 12:50:29 +02:00
Dennis c06b367896
Styling of Email Verify button
Update UserController.php
2022-08-12 12:44:52 +02:00
1Day 88538ab391 Update UserController.php 2022-08-12 12:44:15 +02:00
Dennis 151931269f
Merge pull request #532 from SahrulGnwn/development
Development
2022-08-12 12:39:16 +02:00
Sahrul Gunawan 933634d3fb
Merge branch 'ControlPanel-gg:development' into development 2022-08-12 17:37:42 +07:00
Dennis e27493bf01
Merge pull request #531 from 1day2die/development
fixes
2022-08-12 12:37:14 +02:00
SahrulGnwn bc5a17157d Fix Delete/Switch Broken 2022-08-12 17:36:08 +07:00
1Day 671867b78e fixes 2022-08-12 12:35:24 +02:00
Dennis a28e3030af
Merge pull request #530 from 1day2die/development
Development
2022-08-12 12:30:43 +02:00
Dennis d2646ae8f5
Merge branch 'ControlPanel-gg:development' into development 2022-08-12 12:29:53 +02:00
1Day 54fe21635d disable upgrade button when no key is set 2022-08-12 12:28:15 +02:00
Dennis 3143fab29e
Merge pull request #529 from 1day2die/development
Development
2022-08-12 12:14:06 +02: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 740f8262e3
Update app.php 2022-08-12 08:31:45 +02: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
Dennis 6331ea0b66
Merge pull request #525 from SahrulGnwn/development
Restart After Upgrade
2022-08-11 16:14:14 +02:00
SahrulGnwn f69b71d1d6 Update settings.blade.php 2022-08-11 21:12:00 +07:00
SahrulGnwn 69d9fe5fb0 Restart After Upgrade 2022-08-11 20:50:33 +07:00