From cf634ca23c0f8955b2201efd0ddd11d81bc1b4b4 Mon Sep 17 00:00:00 2001 From: angristan Date: Thu, 9 May 2019 21:15:22 +0200 Subject: [PATCH 1/8] Use PHP 7.3 for CircleCI --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2257e72..1bec69a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # Specify the version you desire here - - image: circleci/php:7.2.3-cli-stretch-node + - image: circleci/php:7.3-cli-stretch-node # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images @@ -15,7 +15,7 @@ jobs: # Using the RAM variation mitigates I/O contention # for database intensive operations. # - image: circleci/mysql:5.7-ram - # + # # - image: redis:2.8.19 steps: @@ -51,4 +51,4 @@ jobs: - store_test_results: path: tests/_output - store_artifacts: - path: tests/_output \ No newline at end of file + path: tests/_output From 7a88f45ee0f6de6adbe6ae9906bc4ac027888246 Mon Sep 17 00:00:00 2001 From: Danyl Strype Date: Sun, 12 May 2019 14:15:36 +0000 Subject: [PATCH 2/8] clarify intro, link fediverse.party, add PeerTube * Clarified and strengthened the wording of the intro text * Linked the word 'fediverse' to the website fediverse.party, which aims to showcase the most newbie-friendly fediverse platforms in a visually engaging way * Added PeerTube to the list of fediverse platforms --- resources/views/site/fediverse.blade.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/views/site/fediverse.blade.php b/resources/views/site/fediverse.blade.php index b2a84fe0..98700f22 100644 --- a/resources/views/site/fediverse.blade.php +++ b/resources/views/site/fediverse.blade.php @@ -7,11 +7,12 @@
-

Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a somewhat broad federation of social network servers.

+

,a href="http://fediverse.party/">Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a federation of social network servers, specializing in different types of media.

Supported Fediverse Projects

-

This is a partial list of well known supported projects

+

Some of the better known fediverse projects include:

  • Anfora – Self-hosted photo gallery social network.
    • +
  • PeerTube – A federated video streaming network.
  • Pleroma – A federated microblogging alternative.
  • Mastodon – A federated microblogging alternative.
  • Misskey – A federated microblogging alternative.
    • From b814ff283165c39cf2d43b39aed3889620c2b7cf Mon Sep 17 00:00:00 2001 From: Aditoo17 Date: Wed, 15 May 2019 18:06:31 +0200 Subject: [PATCH 3/8] L10n: Update Czech translation --- resources/lang/cs/notification.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/lang/cs/notification.php b/resources/lang/cs/notification.php index dda5bd39..6331eda9 100644 --- a/resources/lang/cs/notification.php +++ b/resources/lang/cs/notification.php @@ -2,7 +2,8 @@ return [ - 'likedPhoto' => 'dal/a vaší fotce To se mi líbí.', + 'likedPhoto' => 'dal/a vašemu příspěvku To se mi líbí.', + 'likedComment' => 'dal/a vašemu komentáři To se mi líbí.', 'startedFollowingYou' => 'vás začal/a sledovat.', 'commented' => 'okomentoval/a vaši fotku.', 'mentionedYou' => 'vás zmínil/a.', From 329d8d0811b26270f43a2dd7b3531c4027754d9b Mon Sep 17 00:00:00 2001 From: yoheizuho Date: Fri, 17 May 2019 00:00:22 +0900 Subject: [PATCH 4/8] japanese translation update --- resources/lang/ja/helpcenter.php | 26 ++++++++++++++++++++++++++ resources/lang/ja/navmenu.php.save | 19 +++++++++++++++++++ resources/lang/ja/notification.php | 3 ++- resources/lang/ja/profile.php | 2 +- 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 resources/lang/ja/helpcenter.php create mode 100644 resources/lang/ja/navmenu.php.save diff --git a/resources/lang/ja/helpcenter.php b/resources/lang/ja/helpcenter.php new file mode 100644 index 00000000..b4da31f7 --- /dev/null +++ b/resources/lang/ja/helpcenter.php @@ -0,0 +1,26 @@ + 'ヘルプセンター', + 'whatsnew' => 'What\'s New', + + 'gettingStarted' => 'はじめに', + 'sharingMedia' => 'メディアを共有する', + 'profile' => 'プロフィール', + 'stories' => 'ストーリー', + 'hashtags' => 'ハッシュダグ', + 'discover' => '見つける', + 'directMessages' => 'ダイレクトメッセージ', + 'timelines' => 'タイムライン', + + 'embed' => '埋め込む', + 'communityGuidelines' => 'コミュニティガイドライン', + 'whatIsTheFediverse' => 'fediverseとは?', + 'controllingVisibility' => '可視性制御', + 'blockingAccounts' => 'ブロックしたアカウント', + 'safetyTips' => '安全のためのヒント', + 'reportSomething' => '報告する', + 'dataPolicy' => 'データポリシー' + +]; diff --git a/resources/lang/ja/navmenu.php.save b/resources/lang/ja/navmenu.php.save new file mode 100644 index 00000000..7de4f5cc --- /dev/null +++ b/resources/lang/ja/navmenu.php.save @@ -0,0 +1,19 @@ + '検索', + 'home' => 'ホーム', + 'local' => 'ローカル', + 'network' => 'ネットワーク', + 'discover' => '見つける', + 'viewMyProfile' => '自分のプロフィールを見る', + 'myTimeline' => 'タイムライン', + 'publicTimeline' => 'パブリックタイムライン', + 'remoteFollow' => 'リモートフォロー', + 'settings' => '設定', + 'admin' => '管理者', + 'logout' => 'ログアウト', + 'directMessages' => 'ダイレクトメッセージ', + +]; diff --git a/resources/lang/ja/notification.php b/resources/lang/ja/notification.php index fdd4b425..5cdd9834 100644 --- a/resources/lang/ja/notification.php +++ b/resources/lang/ja/notification.php @@ -2,7 +2,8 @@ return [ - 'likedPhoto' => '写真がお気に入りされました。', + 'likedPhoto' => '写真がお気に入りに登録されました。', + 'likedComment' => 'コメントがお気に入りに登録されました。', 'startedFollowingYou' => 'フォローされました。', 'commented' => '投稿にコメントされました。', 'mentionedYou' => 'メンションされました。', diff --git a/resources/lang/ja/profile.php b/resources/lang/ja/profile.php index 517f77fc..58054a01 100644 --- a/resources/lang/ja/profile.php +++ b/resources/lang/ja/profile.php @@ -7,7 +7,7 @@ return [ 'savedWarning' => 'あなたが保存したものはあなただけが見ることが出来ます。', 'emptySaved' => 'あなたはまだ何も保存していません。', 'privateProfileWarning' => 'このアカウントはプライベートです。', - 'alreadyFollow' => 'もう既に :username をフォローしていますか?', + 'alreadyFollow' => 'もう既に :username さんをフォローしています。', 'loginToSeeProfile' => '写真とビデオを見る。', 'status.disabled.header' => 'プロフィールが無効です', From a1e5d58ed581545997c82c645233d472cc1c8afc Mon Sep 17 00:00:00 2001 From: YoheiZuho Date: Fri, 17 May 2019 00:07:48 +0900 Subject: [PATCH 5/8] Delete navmenu.php.save miss --- resources/lang/ja/navmenu.php.save | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 resources/lang/ja/navmenu.php.save diff --git a/resources/lang/ja/navmenu.php.save b/resources/lang/ja/navmenu.php.save deleted file mode 100644 index 7de4f5cc..00000000 --- a/resources/lang/ja/navmenu.php.save +++ /dev/null @@ -1,19 +0,0 @@ - '検索', - 'home' => 'ホーム', - 'local' => 'ローカル', - 'network' => 'ネットワーク', - 'discover' => '見つける', - 'viewMyProfile' => '自分のプロフィールを見る', - 'myTimeline' => 'タイムライン', - 'publicTimeline' => 'パブリックタイムライン', - 'remoteFollow' => 'リモートフォロー', - 'settings' => '設定', - 'admin' => '管理者', - 'logout' => 'ログアウト', - 'directMessages' => 'ダイレクトメッセージ', - -]; From dc6dccec15d60a95563a91fef6769e6dd1c3b62d Mon Sep 17 00:00:00 2001 From: Shlee Date: Wed, 22 May 2019 01:15:15 +0800 Subject: [PATCH 6/8] Update docker-compose.yml --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index cab45b55..9f727149 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: # Comment to use dockerhub image build: . image: pixelfed + restart: always ## If you have a traefik running, uncomment this to expose Pixelfed # labels: # - traefik.enable=true @@ -37,6 +38,7 @@ services: # Comment to use dockerhub image build: . image: pixelfed + restart: always env_file: - ./.env volumes: @@ -49,6 +51,7 @@ services: db: image: mysql:8.0 + restart: always networks: - internal environment: @@ -61,6 +64,7 @@ services: redis: image: redis:5-alpine + restart: always volumes: - "redis-data:/data" networks: From 04077c2ba1ccdb362932b71c47c39a151ae7768e Mon Sep 17 00:00:00 2001 From: Shlee Date: Mon, 3 Jun 2019 10:53:13 +0800 Subject: [PATCH 7/8] Update docker-compose.yml --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9f727149..3d9cccc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: # Comment to use dockerhub image build: . image: pixelfed - restart: always + restart: unless-stopped ## If you have a traefik running, uncomment this to expose Pixelfed # labels: # - traefik.enable=true @@ -38,7 +38,7 @@ services: # Comment to use dockerhub image build: . image: pixelfed - restart: always + restart: unless-stopped env_file: - ./.env volumes: @@ -51,7 +51,7 @@ services: db: image: mysql:8.0 - restart: always + restart: unless-stopped networks: - internal environment: @@ -64,7 +64,7 @@ services: redis: image: redis:5-alpine - restart: always + restart: unless-stopped volumes: - "redis-data:/data" networks: From 7c0a0c5a32200e7e89c7eb9c464c8cd63cf19aa3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 3 Jun 2019 18:06:09 -0600 Subject: [PATCH 8/8] Update Fediverse view --- resources/views/site/fediverse.blade.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/views/site/fediverse.blade.php b/resources/views/site/fediverse.blade.php index 98700f22..527bbbe5 100644 --- a/resources/views/site/fediverse.blade.php +++ b/resources/views/site/fediverse.blade.php @@ -7,12 +7,14 @@
    -

    ,a href="http://fediverse.party/">Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a federation of social network servers, specializing in different types of media.

    +

    Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a federation of social network servers, specializing in different types of media.

    Supported Fediverse Projects

    Some of the better known fediverse projects include:

    • Anfora – Self-hosted photo gallery social network.
      • + @if(\Illuminate\Support\Str::contains(config('pixelfed.media_types'), 'video/mp4'))
    • PeerTube – A federated video streaming network.
      • + @endif
    • Pleroma – A federated microblogging alternative.
    • Mastodon – A federated microblogging alternative.
    • Misskey – A federated microblogging alternative.
      • @@ -21,5 +23,5 @@ @endsection @push('meta') - + @endpush