Commit graph

1299 commits

Author SHA1 Message Date
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
Dennis
5ed1f6d958
Ticket notify
Ticket notify
2023-01-13 19:38:12 +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
Dennis
5e9cd13206
Merge pull request #626 from 1day2die/development
possible ticket fix
2023-01-13 19:19:40 +01:00
1day2die
e6b2afa1dc possible ticket fix 2023-01-13 19:18:50 +01:00
Dennis
c817b5d72d
SEO & Update Notification
Development
2023-01-13 18:58:06 +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
Dennis
925574e286
Update home.blade.php
Update home.blade.php
2023-01-12 16:03:21 +01:00
1day2die
4a79f3194e Update home.blade.php 2023-01-12 15:51:58 +01:00
Dennis
f41f54cc60
TinyMCE, MOTD
TinyMCE, MOTD,
2023-01-12 15:43:50 +01:00
1day2die
5d7550b43f TinyMCE, MOTD, 2023-01-12 15:43:24 +01:00
Dennis
3d20917710
Merge pull request #622 from 1day2die/development
oops. wrong route
2023-01-12 10:36:34 +01:00
1day2die
86d22b5e9a oops. wrong route 2023-01-12 10:35:57 +01:00
Dennis
91f1da67f0
Smaller fixes, basically typos
Development
2023-01-12 10:35:03 +01:00
1day2die
a74ade90ba get rid of the info label 2023-01-12 10:33:25 +01:00
1day2die
ca4309c131 close button on ticket index 2023-01-12 10:31:56 +01:00
1day2die
ae16fd6d6a change adress to address 2023-01-12 10:25:28 +01:00
1day2die
bdc99bd887 change "adress" to "address" 2023-01-12 10:25:14 +01:00
Dennis
974ef9f77e
Small Fixes
Development
2023-01-11 16:52:34 +01:00
1day2die
db2bae420f Merge branch 'development' of https://github.com/1day2die/dashboard into development 2023-01-11 16:51:25 +01:00
1day2die
c2d50c3b33 fix imprint 2023-01-11 16:51:18 +01:00
1day2die
b69cbcfe65 upgrade installer, fix TOS showing 2023-01-11 16:44:44 +01:00
Dennis
ecb99f8f66
Merge branch 'ControlPanel-gg:development' into development 2023-01-11 16:22:32 +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
831a38a317 Merge branch 'development' of https://github.com/1day2die/dashboard into development 2023-01-11 15:32:03 +01:00
1day2die
5bcfd40a34 fix default theme 2023-01-11 15:31:46 +01:00
Dennis
8e5a6db764
Merge pull request #619 from 1day2die/development
Development
2023-01-11 15:28:02 +01:00
Dennis
2a600e29ae
Merge branch 'ControlPanel-gg:development' into development 2023-01-11 15:27:44 +01:00
1day2die
8e1812c1d6 admins shouldnt delete themselves 2023-01-11 11:46:29 +01:00
Dennis
409255dd5c
Adding full theme Support
Adding full theme Support
2023-01-11 11:21:13 +01:00
1day2die
a0483865bd fix parent theme 2023-01-11 11:20:23 +01:00
1day2die
3cc927c0b5 delete 1day2die testtheme 2023-01-11 11:09:54 +01:00
Dennis
4a31504593
add theme support
add theme support
2023-01-11 11:08:51 +01:00
1day2die
9b7ca02f00 add theme support 2023-01-11 11:08:22 +01:00
Dennis
ee1526fa11
Fixed backtick
Fixed backtick
2023-01-10 20:33:12 +01:00
rrm4395
8e29ffc5a6 Fixed backtick 2023-01-10 19:28:18 +00:00
Dennis
18ec685902
Update versionnumber 2023-01-10 20:07:15 +01:00
Dennis
871bd680b8
Merge pull request #616 from 1day2die/development
Development
2023-01-10 19:51:15 +01:00
Dennis
a591f86636
Merge branch 'ControlPanel-gg:development' into development 2023-01-10 19:50:08 +01:00
1day2die
f12f95bce7 language fix 2023-01-10 19:48:46 +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
699a4bda95
Merge pull request #615 from 1day2die/development
Laravel 9.46
2023-01-10 19:03:59 +01:00
Dennis
9e8337efcb
Merge pull request #51 from 1day2die/shift-77419
Laravel 9.x Shift
2023-01-10 19:03:12 +01:00
Dennis
aacbd6780c
Merge branch 'development' into shift-77419 2023-01-06 00:13:50 +01:00
Dennis
eb0c77cea8
Merge branch 'ControlPanel-gg:main' into shift-77419 2023-01-06 00:10:14 +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