Commit graph

5497 commits

Author SHA1 Message Date
Daniel Supernault
b04c7170d7
Update DiscoverController, fixes #2009 2020-02-14 22:11:42 -07:00
daniel
4b2b6dfe45
Merge pull request #2012 from pixelfed/staging
Update self-diagnosis command
2020-02-14 21:41:55 -07:00
Daniel Supernault
e313f2735b
Update self-diagnosis command 2020-02-14 21:35:12 -07:00
daniel
bf0acc6b50
Merge pull request #2011 from pixelfed/staging
Staging
2020-02-14 21:26:52 -07:00
Daniel Supernault
b796bcc7a7
Update changelog 2020-02-14 20:49:32 -07:00
Daniel Supernault
03f808c744
Update self-diagnosis checks 2020-02-14 20:48:35 -07:00
Daniel Supernault
ebbbb4f9e6
Update mail blade views, fix markdown bug 2020-02-13 21:10:55 -07:00
Daniel Supernault
923dbcb660
Update changelog 2020-02-13 21:05:40 -07:00
Daniel Supernault
cbc63b048e
Update mail panel blade view, fix markdown bug 2020-02-13 21:04:40 -07:00
Shlee
06d60ac351
Update ProfileTransformer.php 2020-02-13 17:56:24 +08:00
Shlee
b629e4fd90
Update routes.php 2020-02-13 17:55:30 +08:00
Shlee
77bc605417
Update pixelfed.php 2020-02-13 17:52:33 +08:00
Shlee
438138b55c
Update instance.php 2020-02-13 17:51:53 +08:00
Shlee
03de0761ab
Update exp.php 2020-02-13 17:45:58 +08:00
Shlee
44c5494a0c
Update pixelfed.php 2020-02-13 17:44:28 +08:00
Shlee
2295bef877
Update pixelfed.php 2020-02-13 17:42:34 +08:00
Shlee
524d4370d2
Update media.php 2020-02-13 17:16:55 +08:00
Shlee
10211fe9cb
Update media.php 2020-02-13 17:15:56 +08:00
Shlee
76fd1c1efd
Update media.php 2020-02-13 17:13:29 +08:00
Shlee
f56c175b09
Update .env.testing 2020-02-13 17:06:45 +08:00
Shlee
9f1ca2cbc8
Update .env.example.docker 2020-02-13 17:06:35 +08:00
Shlee
b43c464fd3
Update .env.example 2020-02-13 17:06:26 +08:00
daniel
9f93a2e73c
Merge pull request #2006 from pixelfed/staging
Update app layout
2020-02-13 00:05:55 -07:00
Daniel Supernault
5eb11f435d
Update app layout 2020-02-13 00:05:27 -07:00
daniel
4bc79ee320
Merge pull request #2005 from pixelfed/staging
Staging
2020-02-12 19:35:49 -07:00
Daniel Supernault
382857ee94
Update app layout 2020-02-12 19:34:45 -07:00
Daniel Supernault
e0ab73c102
CS fix 2020-02-11 21:41:54 -07:00
Daniel Supernault
a34f38633c
Update Profile model, add reported relationship 2020-02-11 21:41:16 -07:00
daniel
e33fb88f71
Merge pull request #2000 from Johnny-Malizia/ffmpeg
Updated Dockerfiles to include ffmpeg
2020-02-11 21:39:22 -07:00
daniel
310de84599
Merge pull request #2002 from pixelfed/staging
Staging
2020-02-11 21:39:04 -07:00
Johnny Malizia
3ba77206b5 Updated Dockerfiles to include ffmpeg 2020-02-10 23:30:45 -08:00
Daniel Supernault
157379cb0e
Update compiled assets 2020-02-09 20:51:14 -07:00
Daniel Supernault
aa6d8c8f85
Update PostComponent.vue, fix MomentUI caption 2020-02-09 20:14:25 -07:00
daniel
c076e9a7b6 Merge pull request #1996 from dominikstraessle/patch-1
Fix breaking docker build & Optimize docker build time
2020-02-09 19:57:59 -07:00
daniel
3207536d5c Merge pull request #1995 from svalo/translation-it-updates
Updates italian translation and uniforms indentation
2020-02-09 19:56:06 -07:00
daniel
a87c236c00 Merge pull request #1989 from pixelfed/staging
Bug fixes
2020-02-09 19:54:41 -07:00
Dominik Strässle
cf5fc9c556 Fix invalid copy command 2020-02-09 18:43:56 +01:00
Dominik Strässle
aede31ea65 Parallel composer install in Dockerfile and Dockerfile.fpm fix 2020-02-09 18:07:42 +01:00
Dominik Strässle
8f93390a2e
Fix breaking docker build
The Dockerfile.apache has been updated recently, but Dockerfile.fpm not. Due to this, the docker build is failing with the following error:
```
configure: error: unrecognized options: --enable-freetype
The command '/bin/sh -c apt-get update  && apt-get install -y --no-install-recommends apt-utils  && apt-get install -y --no-install-recommends git gosu       optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev       libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6       libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client && sed -i '/en_US/s/^#//g' /etc/locale.gen  && 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/  && 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  && 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  && apt-get autoremove --purge -y        libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libvpx-dev libmagickwand-dev  && rm -rf /var/cache/apt  && docker-php-source delete' returned a non-zero code: 1
```

This change updates Dockerfile.fpm to equal the Dockerfile.apache variant. (Except the fpm or apache specific settings)
2020-02-09 17:49:12 +01:00
valo
4e4ae88c79 Updates italian translation and uniforms indentation 2020-02-08 12:53:16 +01:00
Daniel Supernault
555658ea19
Update changelog 2020-02-07 02:08:38 -07:00
Daniel Supernault
251019017c
Update robots.txt 2020-02-07 02:07:50 -07:00
Daniel Supernault
c66d120cb7
Update SearchApiV2Service, order statuses by timestamp 2020-02-07 01:33:03 -07:00
Daniel Supernault
d3cd0eea11
Update SearchApiV2Service 2020-02-07 01:28:13 -07:00
Daniel Supernault
4573fd850f
Update SearchApiV2Service 2020-02-07 01:27:05 -07:00
Daniel Supernault
1dac65fc10
Update SearchApiV2Service 2020-02-07 00:26:45 -07:00
Daniel Supernault
efa8b35877
Update SearchApiV2Service 2020-02-06 17:21:54 -07:00
Daniel Supernault
310f668814
Update ApiV1Controller 2020-02-06 17:20:55 -07:00
Daniel Supernault
75c8c58695
Update api routes 2020-02-06 17:16:59 -07:00
Daniel Supernault
5fe9e66dd0
Update api routes 2020-02-06 17:14:16 -07:00