diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php index 8b8eded8e..70a7825bd 100644 --- a/app/Http/Controllers/CommentController.php +++ b/app/Http/Controllers/CommentController.php @@ -34,7 +34,7 @@ class CommentController extends Controller $reply = new Status(); $reply->profile_id = $profile->id; - $reply->caption = e(strip_tags($comment)); + $reply->caption = e($comment); $reply->rendered = $comment; $reply->in_reply_to_id = $status->id; $reply->in_reply_to_profile_id = $status->profile_id; @@ -44,7 +44,7 @@ class CommentController extends Controller CommentPipeline::dispatch($status, $reply); if($request->ajax()) { - $response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url()]; + $response = ['code' => 200, 'msg' => 'Comment saved', 'username' => $profile->username, 'url' => $reply->url(), 'profile' => $profile->url(), 'comment' => $reply->caption]; } else { $response = redirect($status->url()); } diff --git a/config/app.php b/config/app.php index 99e219a52..a281d980b 100644 --- a/config/app.php +++ b/config/app.php @@ -65,7 +65,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => env('APP_TIMEZONE', 'UTC'), /* |-------------------------------------------------------------------------- @@ -78,7 +78,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => env('APP_LOCALE', 'en'), /* |-------------------------------------------------------------------------- @@ -91,7 +91,7 @@ return [ | */ - 'fallback_locale' => 'en', + 'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'), /* |-------------------------------------------------------------------------- diff --git a/public/css/app.css b/public/css/app.css index d3c5687bc..bff19b1fa 100644 Binary files a/public/css/app.css and b/public/css/app.css differ diff --git a/public/img/pixelfed-icon-color.svg b/public/img/pixelfed-icon-color.svg new file mode 100644 index 000000000..c3a8625bd Binary files /dev/null and b/public/img/pixelfed-icon-color.svg differ diff --git a/public/js/app.js b/public/js/app.js index f24ff3550..1d03a7288 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index e132fcbe8..6eb24f257 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js index 6993240c7..a2aa50394 100644 --- a/resources/assets/js/components/commentform.js +++ b/resources/assets/js/components/commentform.js @@ -21,6 +21,7 @@ $(document).ready(function() { var username = res.data.username; var permalink = res.data.url; var profile = res.data.profile; + var reply = res.data.comment; if($('.status-container').length == 1) { var comments = el.parents().eq(3).find('.comments'); @@ -28,7 +29,7 @@ $(document).ready(function() { var comments = el.parents().eq(1).find('.comments'); } - var comment = '

' + username + ''+ commenttext + '1s

'; + var comment = '

' + username + ''+ reply + '1s

'; comments.prepend(comment); diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 419787e28..94c92f960 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -198,6 +198,10 @@ body, button, input, textarea { border-width: 0!important; border-radius: 0!important; } + .card-md-rounded-0 { + border-width: 1px 0; + border-radius:0 !important; + } } @keyframes loading-bar { @@ -242,6 +246,12 @@ body, button, input, textarea { background-position: 50%; } + +.status-photo img { + object-fit: contain; + max-height: calc(100vh - (6rem)); +} + @keyframes fadeInDown { 0% { opacity: 0; diff --git a/resources/lang/de/navmenu.php b/resources/lang/de/navmenu.php new file mode 100644 index 000000000..bfaf81d23 --- /dev/null +++ b/resources/lang/de/navmenu.php @@ -0,0 +1,13 @@ + 'Mein Profil anschauen', + 'myTimeline' => 'Meine Timeline', + 'publicTimeline' => 'Öffentliche Timeline', + 'remoteFollow' => 'Aus der Ferne folgen', + 'settings' => 'Einstellungen', + 'admin' => 'Administration', + 'logout' => 'Abmelden', + +]; \ No newline at end of file diff --git a/resources/lang/de/notification.php b/resources/lang/de/notification.php index d393089f2..4f2040552 100644 --- a/resources/lang/de/notification.php +++ b/resources/lang/de/notification.php @@ -5,5 +5,6 @@ return [ 'likedPhoto' => 'gefällt dein Foto.', 'startedFollowingYou' => 'folgt dir nun.', 'commented' => 'hat deinen Post kommentiert.', + 'mentionedYou' => 'hat dich erwähnt.' ]; \ No newline at end of file diff --git a/resources/lang/en/profile.php b/resources/lang/en/profile.php index 50b6f2429..01c79be62 100644 --- a/resources/lang/en/profile.php +++ b/resources/lang/en/profile.php @@ -4,5 +4,5 @@ return [ 'emptyTimeline' => 'This user has no posts yet!', 'emptyFollowers' => 'This user has no followers yet!', 'emptyFollowing' => 'This user is not following anyone yet!', - 'savedWarning' => 'Only you can see what you\'ve saved', -]; \ No newline at end of file + 'savedWarning' => 'Only you can see what you’ve saved', +]; diff --git a/resources/lang/he/navmenu.php b/resources/lang/he/navmenu.php new file mode 100644 index 000000000..32d78da75 --- /dev/null +++ b/resources/lang/he/navmenu.php @@ -0,0 +1,13 @@ + 'צפה בפרופיל שלי', + 'myTimeline' => 'ציר הזמן שלי', + 'publicTimeline' => 'ציר הזמן הציבורי', + 'remoteFollow' => 'עקיבה מרחוק', + 'settings' => 'הגדרות', + 'admin' => 'מנהל', + 'logout' => 'התנתק', + +]; diff --git a/resources/lang/he/notification.php b/resources/lang/he/notification.php index b529138df..40b51127d 100644 --- a/resources/lang/he/notification.php +++ b/resources/lang/he/notification.php @@ -5,5 +5,6 @@ return [ 'likedPhoto' => 'אהבו את התמונה שלך.', 'startedFollowingYou' => 'התחיל לעקוב אחריך.', 'commented' => 'הגיב על הפוסט שלך.', + 'mentionedYou' => 'הזכיר אותך.' ]; diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php index 8a7ecc329..26168b479 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -5,9 +5,9 @@
-

403 - Forbidden

+

403 – Forbidden

-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 9ab90868f..ff1024304 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -5,9 +5,9 @@
-

404 - Page Not Found

+

404 – Page Not Found

-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index e479008cf..ba0a94299 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -5,10 +5,10 @@
-

503 - Service Unavailable

+

503 – Service Unavailable

Our services are overloaded at the moment, please try again later.

-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 29e3e63c6..10e2bf068 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,8 +1,8 @@