Commit graph

1118 commits

Author SHA1 Message Date
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
Dennis
d55a6b1944
Merge branch 'ControlPanel-gg:development' into development 2023-01-05 17:54:11 +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
Dennis
4aa2f65ec3
Merge pull request #611 from einsz/fixed-nests-description
change nest description from string to text
2023-01-04 06:48:42 +01:00
einsz
e08d173e78 change migration down to the old state 2023-01-04 06:47:37 +01:00
einsz
4645427403 change nest description to text
fixes error 500 on long nest description
2023-01-03 19:19:07 +01:00
1day2die
ab26a20dde update language 2023-01-03 16:12:07 +01:00
Dennis
3c210d388d
self delete user, TOS
self delete user, TOS
2023-01-02 19:27:02 +01:00
1day2die
f8ab81e27d revert 2023-01-02 15:28:59 +01:00
1day2die
70677e3a3a Update create.blade.php 2023-01-02 15:15:59 +01:00
1day2die
5053daedb5 Update create.blade.php 2023-01-02 15:14:22 +01:00
1day2die
e909feb693 Update create.blade.php 2023-01-02 15:11:04 +01:00
1day2die
27f29fc0fa fix spam create 2023-01-02 15:07:50 +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
Dennis
ffd2aefc26
Merge pull request #606 from IceToast/terms_of_service
Imprint and Privacy Policy Page
2022-12-27 00:02:41 +01:00
IceToast
1149497e56 docs: 📝 Add info where to edit the file (info at settings) 2022-12-22 22:42:45 +01:00
IceToast
a2743376f8 refactor: 🚚 Move imprint/privacy to own directory 2022-12-22 22:36:28 +01:00
IceToast
84cce98110 chore: Localization 2022-12-22 22:30:16 +01:00
IceToast
3edff8f6fc feat: Added Imprint and Privacy Page & Links 2022-12-22 22:30:09 +01:00
IceToast
5d18b36083 feat: added new settings 2022-12-22 22:28:52 +01:00
Dennis
70f4ff13c1
Fix Ticket System
Fix Ticket System
2022-11-29 00:57:44 -08:00
1day2die
1c3f45d1dc Update app.php 2022-11-29 09:32:06 +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
726cc00c3c Add info for new user option 2022-11-04 17:27:34 +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
c520edd2f3 Trying to Reverse 2022-11-03 19:33:41 +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
bb41c345be
Merge pull request #593 from Ferks-FK/main
This PR fixes some incorrect CSS views
2022-11-01 22:47:08 +01:00
Ferks
5548c02698 Fix some incorrect views 2022-11-01 12:22:51 -04:00
Dennis
fbbbd20a62
Update app.php 2022-10-27 10:00:45 +02:00
Dennis
eb09082aa0
Update app.php 2022-10-27 09:56:45 +02:00
Dennis
8b57f91777
Update index.blade.php 2022-10-27 08:56:31 +02: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
Dennis
263d70971c
Merge pull request #584 from ok236449/development-3
Perpage limit fix - sync servers button
2022-10-25 12:53:24 +02:00
ok236449
17e2d284af rename temporary price variable 2022-10-23 10:46:02 +02:00
ok236449
e4b2c2ad6b fix second single underscore 2022-10-21 22:15:07 +02:00
ok236449
34eed0cb79 fix single underscore 2022-10-21 22:10:34 +02:00
ok236449
0b8d133197 Merge branch 'Delete-server-on-404' of https://github.com/ok236449/dashboard into development-3 2022-10-21 21:19:57 +02:00