UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 08:44:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1881 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2019-12-06 23:24:53 -07:00 committed by GitHub
commit bda47ce397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/docker/Dockerfile.apache
View file

@ -1,7 +1,7 @@
FROM php:7.3-apache-buster FROM php:7.4-apache-buster
ARG COMPOSER_VERSION="1.8.5" ARG COMPOSER_VERSION="1.9.1"
ARG COMPOSER_CHECKSUM="4e4c1cd74b54a26618699f3190e6f5fc63bb308b13fa660f71f2a2df047c0e17" ARG COMPOSER_CHECKSUM="1f210b9037fcf82670d75892dfc44400f13fe9ada7af9e787f93e50e3b764111"
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends apt-utils \ && apt-get install -y --no-install-recommends apt-utils \
@ -13,10 +13,10 @@ RUN apt-get update \
&& locale-gen && update-locale \ && locale-gen && update-locale \
&& docker-php-source extract \ && docker-php-source extract \
&& docker-php-ext-configure gd \ && docker-php-ext-configure gd \
--enable-freetype \ --with-freetype \
--with-jpeg-dir=/usr/lib/x86_64-linux-gnu/ \ --with-jpeg \
--with-xpm-dir=/usr/lib/x86_64-linux-gnu/ \ --with-webp \
--with-webp-dir=/usr/lib/x86_64-linux-gnu/ \ --with-xpm \
&& docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \ && docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite pcntl gd exif bcmath intl zip curl \
&& pecl install imagick \ && pecl install imagick \
&& docker-php-ext-enable imagick pcntl imagick gd exif zip curl \ && docker-php-ext-enable imagick pcntl imagick gd exif zip curl \

2
resources/views/layouts/partial/nav.blade.php
View file

@ -70,10 +70,12 @@
<span class="far fa-bell pr-1"></span> <span class="far fa-bell pr-1"></span>
Notifications Notifications
</a> </a>
<div class="dropdown-divider"></div>
<a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}"> <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
<span class="far fa-map pr-1"></span> <span class="far fa-map pr-1"></span>
{{__('navmenu.publicTimeline')}} {{__('navmenu.publicTimeline')}}
</a> </a>
<div class="dropdown-divider"></div>
<a class="dropdown-item font-weight-bold" href="{{route('settings')}}"> <a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
<span class="fas fa-cog pr-1"></span> <span class="fas fa-cog pr-1"></span>
{{__('navmenu.settings')}} {{__('navmenu.settings')}}