From 0dad6ab0ddab34df46fd7a066e6a3e422187dc3d Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 30 Jun 2018 04:33:55 +0200 Subject: [PATCH 01/13] Make followers list flush on mobile --- resources/views/profile/following.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php index 5489785d3..57e1e740a 100644 --- a/resources/views/profile/following.blade.php +++ b/resources/views/profile/following.blade.php @@ -5,11 +5,11 @@ @include('profile.partial.user-info')
-
+
@if($following->count() !== 0) -
    +
      @foreach($following as $user) -
    • +
    • From 1ec14f3983b59bc895c76309da71c0f3b4f333d7 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Sat, 30 Jun 2018 04:35:02 +0200 Subject: [PATCH 02/13] Make followers list flush on mobile --- resources/views/profile/followers.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php index 4a5d2cd10..1e940fb2d 100644 --- a/resources/views/profile/followers.blade.php +++ b/resources/views/profile/followers.blade.php @@ -5,11 +5,11 @@ @include('profile.partial.user-info')
      -
      +
      @if($followers->count() !== 0) -
        +
          @foreach($followers as $user) -
        • +
        • From 25b48358b5cb03de26090cd6a0b6ec7cb09a6ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Mon, 13 Aug 2018 10:59:33 +0200 Subject: [PATCH 03/13] Add message for no saved posts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- resources/lang/en/profile.php | 1 + resources/lang/pl/navmenu.php | 1 + resources/lang/pl/notification.php | 8 ++++---- resources/lang/pl/profile.php | 3 ++- resources/views/profile/show.blade.php | 6 +++++- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/resources/lang/en/profile.php b/resources/lang/en/profile.php index 01c79be62..9fb9d10db 100644 --- a/resources/lang/en/profile.php +++ b/resources/lang/en/profile.php @@ -4,5 +4,6 @@ return [ 'emptyTimeline' => 'This user has no posts yet!', 'emptyFollowers' => 'This user has no followers yet!', 'emptyFollowing' => 'This user is not following anyone yet!', + 'emptySaved' => 'You haven’t saved any post yet!', 'savedWarning' => 'Only you can see what you’ve saved', ]; diff --git a/resources/lang/pl/navmenu.php b/resources/lang/pl/navmenu.php index 07a94950d..dda1fbdd9 100644 --- a/resources/lang/pl/navmenu.php +++ b/resources/lang/pl/navmenu.php @@ -9,5 +9,6 @@ return [ 'settings' => 'Ustawienia', 'admin' => 'Administrator', 'logout' => 'Wyloguj się', + 'directMessages' => 'Wiadomości bezpośrednie', ]; diff --git a/resources/lang/pl/notification.php b/resources/lang/pl/notification.php index 7e453397f..d24e0b9e0 100644 --- a/resources/lang/pl/notification.php +++ b/resources/lang/pl/notification.php @@ -2,9 +2,9 @@ return [ - 'likedPhoto' => 'polubił Twoje zdjęcie.', - 'startedFollowingYou' => 'zaczął Cię obserwować.', - 'commented' => 'skomentował Twój wpis', - 'mentionedYou' => 'wspomniał o Tobie.' + 'likedPhoto' => 'polubił(a) Twoje zdjęcie.', + 'startedFollowingYou' => 'zaczął(-ęła) Cię obserwować.', + 'commented' => 'skomentował(a) Twój wpis', + 'mentionedYou' => 'wspomniał(a) o Tobie.' ]; diff --git a/resources/lang/pl/profile.php b/resources/lang/pl/profile.php index cdd0d56ae..74dd75da0 100644 --- a/resources/lang/pl/profile.php +++ b/resources/lang/pl/profile.php @@ -4,5 +4,6 @@ return [ 'emptyTimeline' => 'Ten użytkownik nie opublikował jeszcze niczego!', 'emptyFollowers' => 'Nikt nie obserwuje tego użytkownika!', 'emptyFollowing' => 'Ten użytkownik nie obserwuje nikogo!', - 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś', + 'emptySaved' => 'Nie zapisałeś(-aś) jeszcze niczego!', + 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś(-aś)', ]; diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index 8c402e094..fa502ae1a 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -56,7 +56,11 @@
          -

          {{ __('profile.emptyTimeline') }}

          + @if($owner && request()->is('*/saved')) +

          {{ __('profile.emptySaved') }}

          + @else +

          {{ __('profile.emptyTimeline') }}

          + @endif
          From f2172aca710808772151f43bf59780aa3948f2e9 Mon Sep 17 00:00:00 2001 From: Jeroen Smeets Date: Mon, 13 Aug 2018 14:42:39 +0200 Subject: [PATCH 04/13] add MySQL version req to README.md --- .env.example | 55 ---------------------------------------------------- README.md | 2 +- 2 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index bbad988d2..000000000 --- a/.env.example +++ /dev/null @@ -1,55 +0,0 @@ -APP_NAME="PixelFed Test" -APP_ENV=local -APP_KEY= -APP_DEBUG=true -APP_URL=http://localhost - -ADMIN_DOMAIN="localhost" -APP_DOMAIN="localhost" - -LOG_CHANNEL=stack - -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE= -DB_USERNAME= -DB_PASSWORD= - -BROADCAST_DRIVER=log -CACHE_DRIVER=redis -SESSION_DRIVER=redis -SESSION_LIFETIME=120 -QUEUE_DRIVER=redis - -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_DRIVER=log -MAIL_HOST=smtp.mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS="pixelfed@example.com" -MAIL_FROM_NAME="Pixelfed" - -SESSION_DOMAIN="${APP_DOMAIN}" -SESSION_SECURE_COOKIE=true -API_BASE="/api/1/" -API_SEARCH="/api/search" - -OPEN_REGISTRATION=true -RECAPTCHA_ENABLED=false -ENFORCE_EMAIL_VERIFICATION=true - -MAX_PHOTO_SIZE=15000 -MAX_CAPTION_LENGTH=150 -MAX_ALBUM_LENGTH=4 - -MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" -MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" -MIX_APP_URL="${APP_URL}" -MIX_API_BASE="${API_BASE}" -MIX_API_SEARCH="${API_SEARCH}" diff --git a/README.md b/README.md index fe8ad87a8..561d0e15b 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ testing and development. ## Requirements - PHP >= 7.1.3 (7.2+ recommended for stable version) - - MySQL, Postgres (MariaDB and sqlite are not supported yet) + - MySQL, Postgres (MySQL >= 5.7, MariaDB and sqlite are not supported yet) - Redis - Composer - GD or ImageMagick From e7a5be75263acc24c14a18a6617125846a39a189 Mon Sep 17 00:00:00 2001 From: Jeroen Smeets Date: Mon, 13 Aug 2018 14:50:32 +0200 Subject: [PATCH 05/13] adding back example file, deleted accidentally --- .env.example | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 000000000..9911a4951 --- /dev/null +++ b/.env.example @@ -0,0 +1,56 @@ +APP_NAME="PixelFed Test" +APP_ENV=local +APP_KEY= +APP_DEBUG=true +APP_URL=http://localhost + +ADMIN_DOMAIN="localhost" +APP_DOMAIN="localhost" + +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE= +DB_USERNAME= +DB_PASSWORD= + +BROADCAST_DRIVER=log +CACHE_DRIVER=redis +SESSION_DRIVER=redis +SESSION_LIFETIME=120 +QUEUE_DRIVER=redis + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=log +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS="pixelfed@example.com" +MAIL_FROM_NAME="Pixelfed" + +SESSION_DOMAIN="${APP_DOMAIN}" +SESSION_SECURE_COOKIE=true +API_BASE="/api/1/" +API_SEARCH="/api/search" + +OPEN_REGISTRATION=true +RECAPTCHA_ENABLED=false +ENFORCE_EMAIL_VERIFICATION=true + +MAX_PHOTO_SIZE=15000 +MAX_CAPTION_LENGTH=150 +MAX_ALBUM_LENGTH=4 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" +MIX_APP_URL="${APP_URL}" +MIX_API_BASE="${API_BASE}" +MIX_API_SEARCH="${API_SEARCH}" + From 4ae18a3b27a20fccecf00e4bfbb91982dc7c91be Mon Sep 17 00:00:00 2001 From: Jeroen Smeets Date: Mon, 13 Aug 2018 14:52:34 +0200 Subject: [PATCH 06/13] and remove extra empty line, no need to cause a change in the repo --- .env.example | 1 - 1 file changed, 1 deletion(-) diff --git a/.env.example b/.env.example index 9911a4951..bbad988d2 100644 --- a/.env.example +++ b/.env.example @@ -53,4 +53,3 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_APP_URL="${APP_URL}" MIX_API_BASE="${API_BASE}" MIX_API_SEARCH="${API_SEARCH}" - From 9fba7017fc99fbd67eec395efbf5fc222952dfc4 Mon Sep 17 00:00:00 2001 From: Jeroen Smeets Date: Mon, 13 Aug 2018 16:17:38 +0200 Subject: [PATCH 07/13] make clear which version of MySQL is supported --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 561d0e15b..d2679abce 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ testing and development. ## Requirements - PHP >= 7.1.3 (7.2+ recommended for stable version) - - MySQL, Postgres (MySQL >= 5.7, MariaDB and sqlite are not supported yet) + - MySQL >= 5.7, Postgres (MariaDB and sqlite are not supported yet) - Redis - Composer - GD or ImageMagick From 3445d91b6fc5fec65d7e271d7941dc02c2fb62ac Mon Sep 17 00:00:00 2001 From: trwnh Date: Tue, 14 Aug 2018 01:58:07 -0500 Subject: [PATCH 08/13] Unsquish tag-page avatars Fix #374 --- resources/assets/sass/custom.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index cb6394607..5aa67fb47 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -294,3 +294,7 @@ details summary::-webkit-details-marker { .details-animated[open] > summary { display: none!important; } + +.profile-avatar img { + object-fit: cover; +} From 3b60ab45ac15ae37bbe634bfd9719db91dddf24c Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Tue, 14 Aug 2018 11:45:42 +0200 Subject: [PATCH 09/13] Fix usernames escaping div and make images link to users --- resources/views/status/show.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index cf9b9db55..a6068a9ae 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -6,14 +6,14 @@
          -
          +
          - +
          - {{$user->username}} + {{$user->username}}
          -
          +
          @if($status->is_nsfw && $status->media_count == 1) @@ -61,14 +61,14 @@
          -
          +
          - +
          - {{$user->username}} + {{$user->username}}
          -
          +