Commit graph

739 commits

Author SHA1 Message Date
IceToast
55b67ea95b fix: 🎨 spacing between server cards 2021-12-24 00:03:32 +01:00
IceToast
c715479fa2 feat: Added Nodename to server card -> info icon popover 2021-12-23 14:48:04 +01:00
Dennis
ae3cb3fd7a
Merge pull request #343 from IceToast/development
style: 🚚 Renamed divided cpu by 100 and renamed unit to vCores -> more realistic naming
2021-12-23 09:55:32 +01:00
1Day
72b25e53c3 Option to disable certain languages completely 2021-12-23 09:09:39 +01:00
IceToast
840da10a38 fix: 💄 improved mobile design -> centering 2021-12-23 00:27:43 +01:00
IceToast
e4aabaec78 style: 🚚 Renamed divided cpu by 100 and renamed unit to vCores -> more realistic naming 2021-12-22 20:34:27 +01:00
IceToast
5a05c5f846 feat: Added Resource plan-/product-data to server card 2021-12-22 20:18:48 +01:00
IceToast
2bfe26247a Merge branch 'development' into servers-servercard 2021-12-22 15:14:21 +01:00
IceToast
d09004df17 feat: 🔒️ Added error handling on server attribute fetching 2021-12-22 15:11:13 +01:00
IceToast
48d5e59fda docs: 🌐 Added localized string default generation to contributing.md 2021-12-22 14:54:14 +01:00
IceToast
277d28df85 chore: 🐛 removed invoices::invoice.string localization -> no need to translate 2021-12-22 14:51:29 +01:00
IceToast
f0852498ed revert: 🎨 removed random formatting lol 2021-12-22 14:50:00 +01:00
IceToast
f10933104c feat: Added Localization generation 2021-12-22 14:31:09 +01:00
Dennis
a571b5a59d
Merge pull request #341 from 1day2die/payment_methode_on_invoice
Add payment methode to invoice
2021-12-22 13:53:30 +01:00
1Day
ae1fecef33 Add payment methode to invoice 2021-12-22 13:48:21 +01:00
Dennis
24d68a8bed
Merge pull request #340 from 1day2die/development
Remove translationmanager
2021-12-22 13:07:23 +01:00
Dennis
c614e03526
Merge pull request #328 from IceToast/stripe_integration
feature: Stripe integration
2021-12-22 13:06:46 +01:00
IceToast
5ed46a1640 chore: 🌐 added localization strings 2021-12-22 11:07:38 +01:00
IceToast
fe153fdc90 feat: Added Sweetalert confirmation over window.confirm 2021-12-22 11:04:35 +01:00
1Day
09fc130306 Remove translationmanager 2021-12-22 10:36:35 +01:00
IceToast
c436bdb4b9 fix: 🐛 removed magic string 2021-12-22 10:14:58 +01:00
IceToast
1e8732158b style: 💄 changed price credit display name & added max width to card container 2021-12-22 10:12:03 +01:00
IceToast
0cbae51666 feat: Added delete button and handler 2021-12-22 09:34:05 +01:00
IceToast
7a10021ab1 chore: ♻️ Removed unused import & code duplication 2021-12-21 19:52:30 +01:00
IceToast
174985244f chore: 🌐 Added localization strings 2021-12-21 19:44:31 +01:00
IceToast
48ebc8c09e feat: Added pterodactyl serverinfo integration 2021-12-21 19:41:04 +01:00
Dennis
7e19f77e4d
Merge pull request #336 from 1day2die/translate_nodes_eggs_view
Translate nodes+eggs adminview
2021-12-21 15:50:20 +01:00
1day2die
6531dd957f Update index.blade.php 2021-12-21 15:49:25 +01:00
1day2die
eef27ca8fe translation strings 2021-12-21 15:48:40 +01:00
IceToast
d485602140 style: 💄 changed servercard to display mock data in new format 2021-12-21 15:15:18 +01:00
IceToast
c332216e32 Merge branch 'development' into servers-servercard 2021-12-21 14:56:12 +01:00
Dennis
732d8548fb
Update en.json 2021-12-21 09:02:01 +01:00
Dennis
dce6aef535
Hotfix Quote-marks 2021-12-21 08:21:59 +01:00
Dennis
1858cf0db2
Merge pull request #315 from IceToast/servercreation_resouce_card
servers/create - updated UI
2021-12-20 22:56:49 +01:00
IceToast
67767ef860
Merge branch 'development' into servercreation_resouce_card 2021-12-20 22:15:03 +01:00
Dennis
88d460c661
Update confirmed.blade.php 2021-12-20 19:23:41 +01:00
IceToast
e306dd8104 chore: 🌐 changed payment method missing text 2021-12-20 18:56:25 +01:00
IceToast
b775ce6cc7 fix: 🚑️ changed the payment setup detection 2021-12-20 18:50:18 +01:00
IceToast
7989ff57b9 feat: Added Notification if Stripe isnt setup (like paypal) in store 2021-12-20 11:18:35 +01:00
IceToast
9d8361641b feat: Added conditional payment methods options 2021-12-20 11:05:51 +01:00
IceToast
a6f200ca55 refactor: ♻️ removed unused case in stripe webhook 2021-12-20 10:59:07 +01:00
IceToast
d33eef6523 fix: 🐛 translation strings 2021-12-20 09:20:43 +01:00
IceToast
ccefb51b32 Merge branch 'stripe_integration' of github.com:IceToast/dashboard into stripe_integration 2021-12-17 11:39:35 +01:00
IceToast
bbe95dcbc5 chore: 📝 updated .env.example 2021-12-17 11:39:31 +01:00
IceToast
d4ab798221 chore: 📝 updated .env.example 2021-12-17 11:38:40 +01:00
IceToast
84ec3e583c feat: Added invoice creation on stripe route & webhook 2021-12-17 11:22:37 +01:00
IceToast
97b01d9428 chore: ⬆️ updated composer packages 2021-12-17 10:45:00 +01:00
IceToast
754a3e38b8 Merge branch 'development' into stripe_integration
# Conflicts:
#	app/Http/Controllers/Admin/CreditProductController.php
#	app/Http/Controllers/Admin/PaymentController.php
#	composer.lock
#	resources/views/admin/payments/index.blade.php
#	resources/views/admin/store/edit.blade.php
#	resources/views/store/checkout.blade.php
#	resources/views/store/index.blade.php
2021-12-17 10:41:32 +01:00
IceToast
c679a257dc docs: 📝 Added Stripe Intergration to readme 2021-12-17 10:01:35 +01:00
IceToast
31efac93f0 feat: Added stripe webhook payment succeed handler 2021-12-17 10:00:33 +01:00