1
0
Fork 0

Merge pull request #1338 from pixelfed/frontend-ui-refactor

Frontend ui refactor
This commit is contained in:
daniel 2019-06-03 18:48:40 -06:00 committed by GitHub
commit 4d77a09966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 9 deletions

View File

@ -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

View File

@ -16,6 +16,7 @@ services:
# Comment to use dockerhub image
build: .
image: pixelfed
restart: unless-stopped
## 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: unless-stopped
env_file:
- ./.env
volumes:
@ -49,6 +51,7 @@ services:
db:
image: mysql:8.0
restart: unless-stopped
networks:
- internal
environment:
@ -61,6 +64,7 @@ services:
redis:
image: redis:5-alpine
restart: unless-stopped
volumes:
- "redis-data:/data"
networks:

View File

@ -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.',

View File

@ -0,0 +1,26 @@
<?php
return [
'helpcenter' => 'ヘルプセンター',
'whatsnew' => 'What\'s New',
'gettingStarted' => 'はじめに',
'sharingMedia' => 'メディアを共有する',
'profile' => 'プロフィール',
'stories' => 'ストーリー',
'hashtags' => 'ハッシュダグ',
'discover' => '見つける',
'directMessages' => 'ダイレクトメッセージ',
'timelines' => 'タイムライン',
'embed' => '埋め込む',
'communityGuidelines' => 'コミュニティガイドライン',
'whatIsTheFediverse' => 'fediverseとは?',
'controllingVisibility' => '可視性制御',
'blockingAccounts' => 'ブロックしたアカウント',
'safetyTips' => '安全のためのヒント',
'reportSomething' => '報告する',
'dataPolicy' => 'データポリシー'
];

View File

@ -2,7 +2,8 @@
return [
'likedPhoto' => '写真がお気に入りされました。',
'likedPhoto' => '写真がお気に入りに登録されました。',
'likedComment' => 'コメントがお気に入りに登録されました。',
'startedFollowingYou' => 'フォローされました。',
'commented' => '投稿にコメントされました。',
'mentionedYou' => 'メンションされました。',

View File

@ -7,7 +7,7 @@ return [
'savedWarning' => 'あなたが保存したものはあなただけが見ることが出来ます。',
'emptySaved' => 'あなたはまだ何も保存していません。',
'privateProfileWarning' => 'このアカウントはプライベートです。',
'alreadyFollow' => 'もう既に :username をフォローしていますか?',
'alreadyFollow' => 'もう既に :username さんをフォローしています。',
'loginToSeeProfile' => '写真とビデオを見る。',
'status.disabled.header' => 'プロフィールが無効です',

View File

@ -7,11 +7,14 @@
</div>
<hr>
<section>
<p class="lead">Fediverse is a portmanteau of “federation” and “universe”. It is a common, informal name for a somewhat broad federation of social network servers.</p>
<p class="lead"><a href="http://fediverse.party/" rel="nofollow noopener">Fediverse</a> 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.</p>
<p class="lead font-weight-bold text-muted mt-4 mb-0">Supported Fediverse Projects</p>
<p class="small text-muted">This is a partial list of well known supported projects</p>
<p class="small text-muted">Some of the better known fediverse projects include:</p>
<ul class="lead pl-4">
<li><a href="https://anfora.app/" rel="nofollow noopener">Anfora</a> Self-hosted photo gallery social network.</li>
@if(\Illuminate\Support\Str::contains(config('pixelfed.media_types'), 'video/mp4'))
<li><a href="https://joinpeertube.org/" rel="nofollow noopener">PeerTube</a> A federated video streaming network.</li>
@endif
<li><a href="https://pleroma.social/" rel="nofollow noopener">Pleroma</a> A federated microblogging alternative.</li>
<li><a href="https://joinmastodon.org" rel="nofollow noopener">Mastodon</a> A federated microblogging alternative.</li>
<li><a href="https://github.com/syuilo/misskey" rel="nofollow noopener">Misskey</a> A federated microblogging alternative.</li>
@ -20,5 +23,5 @@
@endsection
@push('meta')
<meta property="og:description" content="What is the Fediverse">
<meta property="og:description" content="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.">
@endpush