Commit Graph

4755 Commits (ca68cf78b7acfaa0779f93eae34e2fb8e1217e3c)
 

Author SHA1 Message Date
daniel 3b52f809f9
Merge pull request #1807 from pixelfed/staging
Staging
6 years ago
Daniel Supernault e0fead67d3
Update changelog 6 years ago
Daniel Supernault 216955c878
Update compiled assets 6 years ago
Daniel Supernault 16beb56d21
Remove test until upstream bug is fixed 6 years ago
Daniel Supernault 0c8327649c
Update .env.testing to fix upstream bug 6 years ago
Daniel Supernault aa969bf9ac
Update CI config 6 years ago
Daniel Supernault 8c2c19b8e9
Update .env.testing to fix upstream bug 6 years ago
Daniel Supernault 3aff6de335
Update composer 6 years ago
Daniel Supernault b478e3768c
Update npm deps 6 years ago
Daniel Supernault d37df62f72
Update Presenters 6 years ago
Daniel Supernault 3a9010ff65
Update master layout 6 years ago
Daniel Supernault bb929ac346
Update Timeline.vue component 6 years ago
Daniel Supernault 420131a1ad
Update CollectionComponent 6 years ago
Daniel Supernault 16631d3599
Update app.js 6 years ago
Daniel Supernault b73823b11a
Update StoryView model 6 years ago
Daniel Supernault 3b8fe9d574
Update StoryItem model 6 years ago
Daniel Supernault 6a81f161fa
Update Story model 6 years ago
Daniel Supernault 9ca8d88fdc
Update Profile component 6 years ago
Daniel Supernault b1ed4a2744
Update app sass 6 years ago
Daniel Supernault a890426466
Update custom sass 6 years ago
daniel f9b8a1bbd3
Merge pull request #1809 from Strubbl/remove-unecessary-docker-stuff
Remove unecessary docker stuff
6 years ago
Sven Fischer 63514075bd Revert "docker: provide .env to the redis container, too"
This reverts commit c864f4b222.
6 years ago
Sven Fischer d8a8c2d83d Revert "docker: expose redis port so the app can connect to it"
This reverts commit d4e1123ea7.
6 years ago
Daniel Supernault 6d40876ae8
Update Site Config 6 years ago
daniel 6fc0fe67ee
Merge pull request #1808 from Strubbl/patch-1
Update CONTRIBUTING.md
6 years ago
Strubbl 534385ed4e
Update CONTRIBUTING.md
add info about which branch is used for what
6 years ago
Daniel Supernault b825c35d85
Update changelog 6 years ago
daniel 1ff1d12d82
Merge pull request #1806 from Strubbl/docker-fixes
Docker fixes
6 years ago
daniel 2af29f57dd
Merge pull request #1805 from Strubbl/improve-german-translation
improve German translation
6 years ago
Sven Fischer c864f4b222 docker: provide .env to the redis container, too 6 years ago
Sven Fischer c62978e192 docker: install mysqldump for backup
This commit installs mysqldump via the package mariadb-client to make
use of `php artisan backup:run`. Without that package the command fails
with the following error:

```
$ docker-compose exec app php artisan backup:run
Starting backup...
Dumping database pixelfed...
Backup failed because The dump process failed with exitcode 127 : Command not found : sh: 1: mysqldump: not found
```
6 years ago
Sven Fischer d4e1123ea7 docker: expose redis port so the app can connect to it 6 years ago
Sven Fischer ffe5070778 docker db use native password as auth method
This commit changes the default auth plugin of mysql to
mysql_native_password, because otherwise the laravel app couldn't
connect to the mysql database. The following error was thrown:

`SQLSTATE[HY000] [2054] The server requested authentication method unknown to the client`
6 years ago
Sven Fischer 8de7de4588 use Dockerfile.apache by default
In docker-compose, using a symlink from ./Dockerfile
to contrib/docker/Dockerfile.apache does not work. Therefore the symlink
is deleted and the docker-compose.yml is instructed to use the file
Dockerfile.apache in contrib by default.
6 years ago
Sven Fischer 9c30c78727 improve German translation 6 years ago
Daniel Supernault d2a90f11a0
Update AccountTransformer 6 years ago
daniel d7455b8f95
Merge pull request #1799 from Whaxion/Whaxion-improve-ogp
Adding OpenGraph for videos
6 years ago
daniel 8b7963b30c
Merge pull request #1798 from okpierre/patch-6
Update nginx.conf
6 years ago
Nicolas Martinussen 02c5997eb2
Adding OpenGraph for videos 6 years ago
okpierre 5ff9d92830
Update nginx.conf
Updated to include code to prevent remote code execution on certain nginx/php-fpm configurations
6 years ago
Daniel Supernault 8b57a2cfe8
Update api routes 6 years ago
Daniel Supernault 43d4517f71
Update AuthServiceProvider 6 years ago
Daniel Supernault 4fa5ca4f82
Update AuthServiceProvider 6 years ago
Daniel Supernault 235790e04d
Update changelog 6 years ago
Daniel Supernault c4dd8449da
Update Settings, hide sponsors feature until re-implemented 6 years ago
daniel 3f41feab3a
Merge pull request #1795 from pixelfed/staging
Staging
6 years ago
Daniel Supernault 723d3562be
Update EmailService, fixes #1790 6 years ago
Daniel Supernault b89d793250
Update StatusDedupe command 6 years ago
daniel e34f222240
Merge pull request #1794 from pixelfed/staging
Staging
6 years ago
Daniel Supernault 09e406ec2d
Update changelog 6 years ago