chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2002 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2020-02-11 21:39:04 -07:00 committed by GitHub
parent a87c236c00 157379cb0e
commit 310de84599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 87 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/docker/Dockerfile.apache
View File

@ -43,7 +43,9 @@ COPY . /var/www/
WORKDIR /var/www/
RUN cp -r storage storage.skel \
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
&& composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \
&& composer install --prefer-dist --no-interaction \
&& composer global remove hirak/prestissimo \
&& rm -rf html && ln -s public html
VOLUME /var/www/storage /var/www/bootstrap

23
contrib/docker/Dockerfile.fpm
View File

@ -1,7 +1,6 @@
FROM php:7.3-fpm-buster
ARG COMPOSER_VERSION="1.8.5"
ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17"
FROM php:7.4-fpm-buster
ARG COMPOSER_VERSION="1.9.1"
ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111"
RUN apt-get update \
&& apt-get install -y --no-install-recommends apt-utils \
@ -13,13 +12,12 @@ RUN apt-get update \
&& locale-gen && update-locale \
&& docker-php-source extract \
&& docker-php-ext-configure gd \
--enable-freetype \
--with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \
--with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \
--with-webp-dir=/usr/lib/x86_64-linux-gnu/ \
--with-freetype \
--with-jpeg \
--with-webp \
--with-xpm \
&& docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \
&& pecl install imagick \
&& docker-php-ext-enable imagick pcntl imagick gd exif zip curl \
&& docker-php-ext-enable pcntl gd exif zip curl \
&& curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /usr/bin/composer \
&& echo "${COMPOSER_CHECKSUM} /usr/bin/composer" | sha256sum -c - \
&& chmod 755 /usr/bin/composer \
@ -33,9 +31,11 @@ ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
COPY . /var/www/
WORKDIR /var/www/
RUN mkdir public.ext && cp -r storage storage.skel \
RUN cp -r storage storage.skel \
&& cp contrib/docker/php.ini /usr/local/etc/php/conf.d/pixelfed.ini \
&& composer global require hirak/prestissimo --no-interaction --no-suggest --prefer-dist \
&& composer install --prefer-dist --no-interaction \
&& composer global remove hirak/prestissimo \
&& rm -rf html && ln -s public html
VOLUME /var/www/storage /var/www/bootstrap
@ -59,7 +59,6 @@ ENV APP_ENV=production \
ACTIVITY_PUB=false
CMD cp -r storage.skel/* storage/ \
&& cp -r public/* public.ext/ \
&& chown -R www-data:www-data storage/ \
&& php artisan storage:link \
&& php artisan migrate --force \

2
public/js/status.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -22,7 +22,7 @@
"/js/profile-directory.js": "/js/profile-directory.js?id=7160b00d9beda164f1bc",
"/js/quill.js": "/js/quill.js?id=9b15ab0ae830e7293390",
"/js/search.js": "/js/search.js?id=22e8bccee621e57963d9",
"/js/status.js": "/js/status.js?id=14240dabd093541f39b5",
"/js/status.js": "/js/status.js?id=74c9fa63d167b9921cd0",
"/js/story-compose.js": "/js/story-compose.js?id=d0e4923e743ace0f5144",
"/js/theme-monokai.js": "/js/theme-monokai.js?id=39b089458f249e8717ad",
"/js/timeline.js": "/js/timeline.js?id=cf2d4040b15130537379"

2
resources/assets/js/components/PostComponent.vue
View File

@ -300,7 +300,7 @@
<div class="media align-items-center mt-3">
<div class="media-body">
<h2 class="font-weight-bold">
{{status.content.length < 100 ? status.content.slice(0,100) : 'Untitled Post'}}
{{status.content.length > 100 ? status.content.slice(0,100) : 'Untitled Post'}}
</h2>
<p class="lead mb-0">
by <a :href="statusProfileUrl">{{statusUsername}}</a>

11
resources/lang/it/exception.php Normal file
View File

@ -0,0 +1,11 @@
<?php
return [
'compose' => [
'invalid' => [
'album' => 'Deve contenere una singola foto o video oppure più foto.',
],
],
];

26
resources/lang/it/helpcenter.php Normal file
View File

@ -0,0 +1,26 @@
<?php
return [
'helpcenter' => 'Centro Assistenza',
'whatsnew' => 'Novità',
'gettingStarted' => 'Per iniziare',
'sharingMedia' => 'Condivisione dei Media',
'profile' => 'Profili',
'stories' => 'Stories',
'hashtags' => 'Hashtags',
'discover' => 'Esplora',
'directMessages' => 'Messaggi Diretti',
'timelines' => 'Timeline',
'embed' => 'Includi',
'communityGuidelines' => 'Linee Guida della Comunità',
'whatIsTheFediverse' => 'Cos\'è il Fediverso',
'controllingVisibility' => 'Controllare la Visibilità',
'blockingAccounts' => 'Bloccare gli Account',
'safetyTips' => 'Suggerimenti per la Sicurezza',
'reportSomething' => 'Segnala Qualcosa',
'dataPolicy' => 'Politica sui Dati'
];

25
resources/lang/it/navmenu.php
View File

@ -1,14 +1,19 @@
<?php
return [
'viewMyProfile' => 'Guarda il mio profilo',
'myTimeline' => 'La mia Timeline',
'publicTimeline' => 'Timeline Pubblica',
'remoteFollow' => 'Segui da Remoto',
'settings' => 'Impostazioni',
'admin' => 'Amministra',
'logout' => 'Esci',
'directMessages' => 'Messaggi Diretti',
'search' => 'Cerca',
'home' => 'Home',
'local' => 'Locale',
'network' => 'Rete',
'discover' => 'Esplora',
'viewMyProfile' => 'Guarda il mio profilo',
'myProfile' => 'Il mio profilo',
'myTimeline' => 'La mia Timeline',
'publicTimeline' => 'Timeline Pubblica',
'remoteFollow' => 'Segui da Remoto',
'settings' => 'Impostazioni',
'admin' => 'Amministra',
'logout' => 'Esci',
'directMessages' => 'Messaggi Diretti',
'composePost' => 'Compose Post',
];

2
resources/lang/it/notification.php
View File

@ -3,8 +3,10 @@
return [
'likedPhoto' => 'ha messo mi piace alla tua foto.',
'likedComment' => 'ha messo mi piace al tuo commento.',
'startedFollowingYou' => 'ha iniziato a seguirti.',
'commented' => 'ha commentato il tuo post.',
'mentionedYou' => 'ti ha menzionato.',
'shared' => 'ha condiviso il tuo post.',
];

4
resources/lang/it/profile.php
View File

@ -10,6 +10,6 @@ return [
'alreadyFollow' => 'Segui già :username?',
'loginToSeeProfile' => 'per vedere le sue foto e video.',
'status.disabled.header' => 'Profilo Non Disponibile',
'status.disabled.body' => 'Scusa, questo profilo non è disponibile al momento. Per favore riprova più tardi.',
'status.disabled.header' => 'Profilo Non Disponibile',
'status.disabled.body' => 'Scusa, questo profilo non è disponibile al momento. Per favore riprova più tardi.',
];

26
resources/lang/it/site.php
View File

@ -2,15 +2,19 @@
return [
'about' => 'A Proposito',
'help' => 'Aiuto',
'language' => 'Lingua',
'fediverse' => 'Fediverso',
'opensource' => 'Open Source',
'terms' => 'Termini',
'privacy' => 'Privacy',
'l10nWip' => 'Stiamo ancora lavorando sul supporto per la traduzione',
'currentLocale' => 'Lingua attuale',
'selectLocale' => 'Seleziona una tra le lingue supportate',
'about' => 'Informazioni',
'help' => 'Aiuto',
'language' => 'Lingua',
'fediverse' => 'Fediverso',
'opensource' => 'Open Source',
'terms' => 'Termini',
'privacy' => 'Privacy',
'l10nWip' => 'Stiamo ancora lavorando sul supporto per la traduzione',
'currentLocale' => 'Lingua attuale',
'selectLocale' => 'Seleziona una tra le lingue supportate',
'contact' => 'Contatti',
'contact-us' => 'Contattaci',
'places' => 'Luoghi',
'profiles' => 'Profili',
];
];