diff --git a/.circleci/config.yml b/.circleci/config.yml index 1bec69a40..83f9340a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,8 @@ jobs: paths: - vendor - - run: cp .env.example .env + - run: cp .env.testing .env + - run: php artisan route:clear - run: php artisan storage:link - run: php artisan key:generate - run: php artisan config:clear diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f5b7c1b..e4b6a051c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,10 @@ - Updated StatusHashtagService, reduce cached hashtag count ttl from 6 hours to 5 minutes ([126886e8](https://github.com/pixelfed/pixelfed/commit/126886e8)) - Updated Hashtag.vue component, added formatted posts count ([c71f3dd1](https://github.com/pixelfed/pixelfed/commit/c71f3dd1)) - Updated FixLikes command, fix postgres support ([771f9c46](https://github.com/pixelfed/pixelfed/commit/771f9c46)) +- Updated Settings, hide sponsors feature until re-implemented in Profile UI ([c4dd8449](https://github.com/pixelfed/pixelfed/commit/c4dd8449)) +- Updated Status view, added ```video``` open graph tag support ([#1799](https://github.com/pixelfed/pixelfed/pull/1799)) +- Updated AccountTransformer, added ```local``` attribute ([d2a90f11](https://github.com/pixelfed/pixelfed/commit/d2a90f11)) +- Updated Laravel framework from v5.8 to v6.x ([3aff6de33](https://github.com/pixelfed/pixelfed/commit/3aff6de33)) ## Deprecated diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e8b7d9827..f9d2304cb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,8 +10,13 @@ Remember, bug reports are created in the hope that others with the same problem ## Core Development Discussion Informal discussion regarding bugs, new features, and implementation of existing features takes place in the ```#pixelfed-dev``` channel on the Freenode IRC network. +## Branches +If you want to contribute to this repository, please file your pull request against the `staging` branch. + +Pixelfed Beta currently uses the `dev` branch for deployable code. When v1.0 is released, the stable branch will be changed to `master`, with `dev` branch being used for development and testing. + ## Compiled Assets If you are submitting a change that will affect a compiled file, such as most of the files in ```resources/assets/sass``` or ```resources/assets/js``` of the pixelfed/pixelfed repository, do not commit the compiled files. Due to their large size, they cannot realistically be reviewed by a maintainer. This could be exploited as a way to inject malicious code into Pixelfed. In order to defensively prevent this, all compiled files will be generated and committed by Pixelfed maintainers. ## Security Vulnerabilities -If you discover a security vulnerability within Pixelfed, please send an email to Daniel Supernault at hello@pixelfed.org. All security vulnerabilities will be promptly addressed. \ No newline at end of file +If you discover a security vulnerability within Pixelfed, please send an email to Daniel Supernault at hello@pixelfed.org. All security vulnerabilities will be promptly addressed. diff --git a/Dockerfile b/Dockerfile deleted file mode 120000 index 2f722aa37..000000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -contrib/docker/Dockerfile.apache \ No newline at end of file diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 7de25b357..3448b3005 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -27,7 +27,7 @@ class AuthServiceProvider extends ServiceProvider $this->registerPolicies(); if(config('pixelfed.oauth_enabled')) { - Passport::routes(null, ['middleware' => [ \Barryvdh\Cors\HandleCors::class ]]); + Passport::routes(null, ['middleware' => ['twofactor', \Barryvdh\Cors\HandleCors::class]]); Passport::tokensExpireIn(now()->addDays(15)); Passport::refreshTokensExpireIn(now()->addDays(30)); Passport::enableImplicitGrant(); diff --git a/app/Story.php b/app/Story.php index 314679b69..104f0e58f 100644 --- a/app/Story.php +++ b/app/Story.php @@ -4,9 +4,26 @@ namespace App; use Auth; use Illuminate\Database\Eloquent\Model; +use Pixelfed\Snowflake\HasSnowflakePrimary; class Story extends Model { + use HasSnowflakePrimary; + + /** + * Indicates if the IDs are auto-incrementing. + * + * @var bool + */ + public $incrementing = false; + + /** + * The attributes that should be mutated to dates. + * + * @var array + */ + protected $dates = ['published_at', 'expires_at']; + protected $visible = ['id']; public function profile() diff --git a/app/StoryItem.php b/app/StoryItem.php index 263605768..7a87d18ef 100644 --- a/app/StoryItem.php +++ b/app/StoryItem.php @@ -3,10 +3,29 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use Pixelfed\Snowflake\HasSnowflakePrimary; use Storage; class StoryItem extends Model { + use HasSnowflakePrimary; + + /** + * Indicates if the IDs are auto-incrementing. + * + * @var bool + */ + public $incrementing = false; + + /** + * The attributes that should be mutated to dates. + * + * @var array + */ + protected $dates = ['expires_at']; + + protected $visible = ['id']; + public function story() { return $this->belongsTo(Story::class); @@ -14,6 +33,6 @@ class StoryItem extends Model public function url() { - return Storage::url($this->media_path); + return url(Storage::url($this->media_path)); } } diff --git a/app/StoryView.php b/app/StoryView.php index a2674519d..6d370435b 100644 --- a/app/StoryView.php +++ b/app/StoryView.php @@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model; class StoryView extends Model { + public $fillable = ['story_id', 'profile_id']; + public function story() { return $this->belongsTo(Story::class); diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php index 564d653a6..d2db1adc4 100644 --- a/app/Transformer/Api/AccountTransformer.php +++ b/app/Transformer/Api/AccountTransformer.php @@ -31,6 +31,7 @@ class AccountTransformer extends Fractal\TransformerAbstract 'url' => $profile->url(), 'avatar' => $profile->avatarUrl(), 'website' => $profile->website, + 'local' => (bool) $local, 'is_admin' => (bool) $is_admin, ]; } diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php index 3e6c5351f..f80d68c26 100644 --- a/app/Util/Site/Config.php +++ b/app/Util/Site/Config.php @@ -36,6 +36,14 @@ class Config { 'site' => [ 'domain' => config('pixelfed.domain.app'), 'url' => config('app.url') + ], + + 'username' => [ + 'remote' => [ + 'formats' => config('instance.username.remote.formats'), + 'format' => config('instance.username.remote.format'), + 'custom' => config('instance.username.remote.custom') + ] ] ]; }); diff --git a/composer.json b/composer.json index 261891903..f8fd213cf 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "license": "AGPL-3.0-only", "type": "project", "require": { - "php": "^7.1.3", + "php": "^7.2", "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", @@ -19,7 +19,8 @@ "fideloper/proxy": "^4.0", "intervention/image": "^2.4", "jenssegers/agent": "^2.6", - "laravel/framework": "5.8.*", + "laravel/framework": "^6.0", + "laravel/helpers": "^1.1", "laravel/horizon": "^3.3", "laravel/passport": "^7.0", "laravel/tinker": "^1.0", @@ -27,10 +28,9 @@ "league/flysystem-cached-adapter": "~1.0", "league/iso3166": "^2.1", "moontoast/math": "^1.1", - "pbmedia/laravel-ffmpeg": "4.0.0", + "pbmedia/laravel-ffmpeg": "5.0.*", "phpseclib/phpseclib": "~2.0", "pixelfed/bacon-qr-code": "^3.0", - "pixelfed/dotenv-editor": "^2.0", "pixelfed/fractal": "^0.18.0", "pixelfed/google2fa": "^4.0", "pixelfed/laravel-snowflake": "^2.0", @@ -38,16 +38,16 @@ "predis/predis": "^1.1", "spatie/laravel-backup": "^6.0.0", "spatie/laravel-image-optimizer": "^1.1", - "stevebauman/purify": "2.0.*" + "stevebauman/purify": "3.0.*" }, "require-dev": { "barryvdh/laravel-debugbar": "dev-master", - "filp/whoops": "^2.0", + "facade/ignition": "^1.4", "fzaninotto/faker": "^1.4", "mockery/mockery": "^1.0", - "nunomaduro/collision": "^2.0", + "nunomaduro/collision": "^3.0", "nunomaduro/phpinsights": "^1.7", - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^8.0" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 1b4cfee67..fc22a8d2e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,71 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8479e14e8ce5995bb6dfca235b808685", + "content-hash": "c7a9294a17af4e5a594abf834ee6fd1b", "packages": [ - { - "name": "alchemy/binary-driver", - "version": "v2.0.0", - "source": { - "type": "git", - "url": "https://github.com/alchemy-fr/BinaryDriver.git", - "reference": "6ccde0e19e81e54da77b08da1a176d43e089f3a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/BinaryDriver/zipball/6ccde0e19e81e54da77b08da1a176d43e089f3a3", - "reference": "6ccde0e19e81e54da77b08da1a176d43e089f3a3", - "shasum": "" - }, - "require": { - "evenement/evenement": "^2.0|^1.0", - "monolog/monolog": "^1.3", - "php": ">=5.5", - "psr/log": "^1.0", - "symfony/process": "^2.3|^3.0|^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Alchemy": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Romain Neutron", - "email": "imprec@gmail.com", - "homepage": "http://www.lickmychip.com/" - }, - { - "name": "Phraseanet Team", - "email": "info@alchemy.fr", - "homepage": "http://www.phraseanet.com/" - }, - { - "name": "Nicolas Le Goff", - "email": "legoff.n@gmail.com" - }, - { - "name": "Jens Hausdorf", - "email": "mail@jens-hausdorf.de", - "homepage": "https://jens-hausdorf.de", - "role": "Maintainer" - } - ], - "description": "A set of tools to build binary drivers", - "keywords": [ - "binary", - "driver" - ], - "time": "2018-08-06T10:18:33+00:00" - }, { "name": "asm89/stack-cors", "version": "1.2.0", @@ -123,16 +60,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.112.12", + "version": "3.112.23", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "b8c1e71eaefe44342283ef7240efabcc87197dd4" + "reference": "11f8ebab922a8875f8a5b3927f946341eeae8ec2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b8c1e71eaefe44342283ef7240efabcc87197dd4", - "reference": "b8c1e71eaefe44342283ef7240efabcc87197dd4", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/11f8ebab922a8875f8a5b3927f946341eeae8ec2", + "reference": "11f8ebab922a8875f8a5b3927f946341eeae8ec2", "shasum": "" }, "require": { @@ -202,7 +139,7 @@ "s3", "sdk" ], - "time": "2019-10-01T18:07:57+00:00" + "time": "2019-10-16T18:13:31+00:00" }, { "name": "barryvdh/laravel-cors", @@ -1636,16 +1573,16 @@ }, { "name": "jaybizzle/crawler-detect", - "version": "v1.2.84", + "version": "v1.2.86", "source": { "type": "git", "url": "https://github.com/JayBizzle/Crawler-Detect.git", - "reference": "b7f35477a56609dd0d753c07ada912b66af3df01" + "reference": "1835311c4f458b2f59bbfec05ebfc64ac382b6ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/b7f35477a56609dd0d753c07ada912b66af3df01", - "reference": "b7f35477a56609dd0d753c07ada912b66af3df01", + "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/1835311c4f458b2f59bbfec05ebfc64ac382b6ee", + "reference": "1835311c4f458b2f59bbfec05ebfc64ac382b6ee", "shasum": "" }, "require": { @@ -1681,7 +1618,7 @@ "crawlerdetect", "php crawler detect" ], - "time": "2019-06-14T21:10:21+00:00" + "time": "2019-10-15T20:54:57+00:00" }, { "name": "jenssegers/agent", @@ -1754,43 +1691,43 @@ }, { "name": "laravel/framework", - "version": "v5.8.35", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197" + "reference": "80914c430fb5e49f492812d704ba6aeec03d80a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5a9e4d241a8b815e16c9d2151e908992c38db197", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197", + "url": "https://api.github.com/repos/laravel/framework/zipball/80914c430fb5e49f492812d704ba6aeec03d80a2", + "reference": "80914c430fb5e49f492812d704ba6aeec03d80a2", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.1.10", "erusev/parsedown": "^1.7", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "league/flysystem": "^1.0.8", - "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3 || ^2.0", + "monolog/monolog": "^1.12|^2.0", + "nesbot/carbon": "^2.0", "opis/closure": "^3.1", - "php": "^7.1.3", + "php": "^7.2", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.2", - "symfony/debug": "^4.2", - "symfony/finder": "^4.2", - "symfony/http-foundation": "^4.2", - "symfony/http-kernel": "^4.2", - "symfony/process": "^4.2", - "symfony/routing": "^4.2", - "symfony/var-dumper": "^4.2", + "symfony/console": "^4.3.4", + "symfony/debug": "^4.3.4", + "symfony/finder": "^4.3.4", + "symfony/http-foundation": "^4.3.4", + "symfony/http-kernel": "^4.3.4", + "symfony/process": "^4.3.4", + "symfony/routing": "^4.3.4", + "symfony/var-dumper": "^4.3.4", "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "^3.3" }, @@ -1830,47 +1767,45 @@ "require-dev": { "aws/aws-sdk-php": "^3.0", "doctrine/dbal": "^2.6", - "filp/whoops": "^2.1.4", + "filp/whoops": "^2.4", "guzzlehttp/guzzle": "^6.3", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "^1.0", + "mockery/mockery": "^1.2.3", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.8.*", + "orchestra/testbench-core": "^4.0", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5|^8.0", + "phpunit/phpunit": "^8.3", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.2", - "symfony/dom-crawler": "^4.2", + "symfony/cache": "^4.3", "true/punycode": "^2.1" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", + "ext-memcached": "Required to use the memcache cache driver.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "filp/whoops": "Required for friendly error pages in development (^2.1.4).", + "ext-redis": "Required to use the Redis cache and queue drivers.", + "filp/whoops": "Required for friendly error pages in development (^2.4).", "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0).", "laravel/tinker": "Required to use the tinker console command (^1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", - "nexmo/client": "Required to use the Nexmo transport (^1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -1898,20 +1833,73 @@ "framework", "laravel" ], - "time": "2019-09-03T16:44:30+00:00" + "time": "2019-10-15T13:38:24+00:00" }, { - "name": "laravel/horizon", - "version": "v3.4.0", + "name": "laravel/helpers", + "version": "v1.1.1", "source": { "type": "git", - "url": "https://github.com/laravel/horizon.git", - "reference": "26d2f35a990107eefd09f6baa4db250f54e5c470" + "url": "https://github.com/laravel/helpers.git", + "reference": "b8eae9ddd461e89d0296f74fd069c413bf83b6fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/26d2f35a990107eefd09f6baa4db250f54e5c470", - "reference": "26d2f35a990107eefd09f6baa4db250f54e5c470", + "url": "https://api.github.com/repos/laravel/helpers/zipball/b8eae9ddd461e89d0296f74fd069c413bf83b6fa", + "reference": "b8eae9ddd461e89d0296f74fd069c413bf83b6fa", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.8.0|^6.0", + "php": ">=7.1.3" + }, + "require-dev": { + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Dries Vints", + "email": "dries.vints@gmail.com" + } + ], + "description": "Provides backwards compatibility for helpers in the latest Laravel release.", + "keywords": [ + "helpers", + "laravel" + ], + "time": "2019-07-30T15:25:31+00:00" + }, + { + "name": "laravel/horizon", + "version": "v3.4.1", + "source": { + "type": "git", + "url": "https://github.com/laravel/horizon.git", + "reference": "6279319c0cc35aa9a87490f58ac59e4ca78d4112" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/horizon/zipball/6279319c0cc35aa9a87490f58ac59e4ca78d4112", + "reference": "6279319c0cc35aa9a87490f58ac59e4ca78d4112", "shasum": "" }, "require": { @@ -1967,20 +1955,20 @@ "laravel", "queue" ], - "time": "2019-10-01T17:38:43+00:00" + "time": "2019-10-08T16:18:52+00:00" }, { "name": "laravel/passport", - "version": "v7.5.0", + "version": "v7.5.1", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "663e720a6d15e8ec70bf5309f774439a110efc89" + "reference": "d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/663e720a6d15e8ec70bf5309f774439a110efc89", - "reference": "663e720a6d15e8ec70bf5309f774439a110efc89", + "url": "https://api.github.com/repos/laravel/passport/zipball/d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08", + "reference": "d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08", "shasum": "" }, "require": { @@ -2038,7 +2026,7 @@ "oauth", "passport" ], - "time": "2019-09-24T20:59:35+00:00" + "time": "2019-10-08T16:45:24+00:00" }, { "name": "laravel/tinker", @@ -2210,16 +2198,16 @@ }, { "name": "league/flysystem", - "version": "1.0.55", + "version": "1.0.57", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6" + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6", - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a", + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a", "shasum": "" }, "require": { @@ -2290,7 +2278,7 @@ "sftp", "storage" ], - "time": "2019-08-24T11:17:19+00:00" + "time": "2019-10-16T21:01:05+00:00" }, { "name": "league/flysystem-aws-s3-v3", @@ -2571,21 +2559,21 @@ }, { "name": "monolog/monolog", - "version": "1.25.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf" + "reference": "68545165e19249013afd1d6f7485aecff07a2d22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/70e65a5470a42cfec1a7da00d30edb6e617e8dcf", - "reference": "70e65a5470a42cfec1a7da00d30edb6e617e8dcf", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/68545165e19249013afd1d6f7485aecff07a2d22", + "reference": "68545165e19249013afd1d6f7485aecff07a2d22", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -2593,33 +2581,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2645,7 +2636,7 @@ "logging", "psr-3" ], - "time": "2019-09-06T13:49:17+00:00" + "time": "2019-08-30T09:56:44+00:00" }, { "name": "moontoast/math", @@ -2753,16 +2744,16 @@ }, { "name": "nesbot/carbon", - "version": "2.24.0", + "version": "2.25.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29" + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29", - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f", + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f", "shasum": "" }, "require": { @@ -2809,14 +2800,14 @@ "homepage": "http://github.com/kylekatarnls" } ], - "description": "A API extension for DateTime that supports 281 different languages.", + "description": "An API extension for DateTime that supports 281 different languages.", "homepage": "http://carbon.nesbot.com", "keywords": [ "date", "datetime", "time" ], - "time": "2019-08-31T16:37:55+00:00" + "time": "2019-10-14T14:18:59+00:00" }, { "name": "neutron/temporary-filesystem", @@ -3082,32 +3073,90 @@ "time": "2019-01-03T20:59:08+00:00" }, { - "name": "pbmedia/laravel-ffmpeg", - "version": "4.0.0", + "name": "pbmedia/binary-driver", + "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/pascalbaljetmedia/laravel-ffmpeg.git", - "reference": "6b7ac695b56c3847a736de614d4533245541cb6c" + "url": "https://github.com/pascalbaljetmedia/BinaryDriver.git", + "reference": "4a2cfa078d1a573a13b581583788bdff7083abb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pascalbaljetmedia/laravel-ffmpeg/zipball/6b7ac695b56c3847a736de614d4533245541cb6c", - "reference": "6b7ac695b56c3847a736de614d4533245541cb6c", + "url": "https://api.github.com/repos/pascalbaljetmedia/BinaryDriver/zipball/4a2cfa078d1a573a13b581583788bdff7083abb2", + "reference": "4a2cfa078d1a573a13b581583788bdff7083abb2", "shasum": "" }, "require": { - "illuminate/config": "5.8.*", - "illuminate/filesystem": "5.8.*", - "illuminate/log": "5.8.*", - "illuminate/support": "5.8.*", - "league/flysystem": "~1.0", - "php": "^7.1.3", - "php-ffmpeg/php-ffmpeg": "^0.13", - "symfony/process": "~4.0" + "evenement/evenement": "^2.0|^1.0", + "monolog/monolog": "^1.3|^2.0", + "php": ">=5.5", + "psr/log": "^1.0", + "symfony/process": "^4.0" }, "require-dev": { - "mockery/mockery": "^1.0", - "phpunit/phpunit": "7.5" + "phpunit/phpunit": "^4.0|^5.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Alchemy": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Le Goff", + "email": "legoff.n@gmail.com" + }, + { + "name": "Romain Neutron", + "email": "imprec@gmail.com", + "homepage": "http://www.lickmychip.com/" + }, + { + "name": "Phraseanet Team", + "email": "info@alchemy.fr", + "homepage": "http://www.phraseanet.com/" + } + ], + "description": "A set of tools to build binary drivers", + "keywords": [ + "binary", + "driver" + ], + "time": "2019-09-12T13:57:59+00:00" + }, + { + "name": "pbmedia/laravel-ffmpeg", + "version": "5.0.1", + "source": { + "type": "git", + "url": "https://github.com/pascalbaljetmedia/laravel-ffmpeg.git", + "reference": "9f2677fe4d9eb6b5b27f75fd233dc730d82ab089" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pascalbaljetmedia/laravel-ffmpeg/zipball/9f2677fe4d9eb6b5b27f75fd233dc730d82ab089", + "reference": "9f2677fe4d9eb6b5b27f75fd233dc730d82ab089", + "shasum": "" + }, + "require": { + "illuminate/config": "^6.0", + "illuminate/filesystem": "^6.0", + "illuminate/log": "^6.0", + "illuminate/support": "^6.0", + "league/flysystem": "^1.0.8", + "pbmedia/php-ffmpeg": "^0.14.1", + "php": "^7.2", + "symfony/process": "^4.3.4" + }, + "require-dev": { + "mockery/mockery": "^1.2.3", + "phpunit/phpunit": "^8.3", + "twistor/flysystem-http": "^0.2.0" }, "type": "library", "extra": { @@ -3143,28 +3192,28 @@ "laravel-ffmpeg", "pbmedia" ], - "time": "2019-02-27T17:33:08+00:00" + "time": "2019-09-12T14:14:49+00:00" }, { - "name": "php-ffmpeg/php-ffmpeg", - "version": "v0.13", + "name": "pbmedia/php-ffmpeg", + "version": "0.14.1", "source": { "type": "git", - "url": "https://github.com/PHP-FFMpeg/PHP-FFMpeg.git", - "reference": "c11b79ab5b0174aa1a56c54c67491169e78a4c17" + "url": "https://github.com/pascalbaljetmedia/PHP-FFMpeg.git", + "reference": "735a1ea471210420004afc21f8bbcf495c088260" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/c11b79ab5b0174aa1a56c54c67491169e78a4c17", - "reference": "c11b79ab5b0174aa1a56c54c67491169e78a4c17", + "url": "https://api.github.com/repos/pascalbaljetmedia/PHP-FFMpeg/zipball/735a1ea471210420004afc21f8bbcf495c088260", + "reference": "735a1ea471210420004afc21f8bbcf495c088260", "shasum": "" }, "require": { - "alchemy/binary-driver": "^1.5 || ~2.0.0", "doctrine/cache": "^1.0", - "evenement/evenement": "^2.0 || ^1.0", + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "neutron/temporary-filesystem": "^2.1.1", - "php": "^5.3.9 || ^7.0" + "pbmedia/binary-driver": "^3.0.1", + "php": "^5.6 || ^7.0" }, "require-dev": { "phpunit/phpunit": "^4.8.36", @@ -3227,7 +3276,7 @@ "video", "video processing" ], - "time": "2018-08-06T20:02:43+00:00" + "time": "2019-09-12T14:06:49+00:00" }, { "name": "phpoption/phpoption", @@ -3414,55 +3463,6 @@ "homepage": "https://github.com/pixelfed/BaconQrCode", "time": "2018-09-03T06:48:07+00:00" }, - { - "name": "pixelfed/dotenv-editor", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/pixelfed/Laravel-Dotenv-Editor.git", - "reference": "b53cb2707bb856e92cf1a282b4e5ee17a45ccb2c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pixelfed/Laravel-Dotenv-Editor/zipball/b53cb2707bb856e92cf1a282b4e5ee17a45ccb2c", - "reference": "b53cb2707bb856e92cf1a282b4e5ee17a45ccb2c", - "shasum": "" - }, - "require": { - "illuminate/config": ">=5.0", - "illuminate/container": ">=5.0", - "illuminate/support": ">=5.0", - "php": ">=5.4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Jackiedo\\DotenvEditor\\": "src/Jackiedo/DotenvEditor" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jackie Do", - "email": "anhvudo@gmail.com" - } - ], - "description": "The .env file editor tool for Laravel 5+", - "keywords": [ - "dotenv", - "dotenv-editor", - "laravel" - ], - "time": "2018-07-17T19:38:26+00:00" - }, { "name": "pixelfed/fractal", "version": "0.18.0", @@ -4330,25 +4330,25 @@ }, { "name": "spatie/laravel-backup", - "version": "6.4.2", + "version": "6.7.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "451bc7c685a239108e33d3665336e4ffefb80989" + "reference": "f5b7078a3bfe983900c393fb51eeed4fc0b6b6d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/451bc7c685a239108e33d3665336e4ffefb80989", - "reference": "451bc7c685a239108e33d3665336e4ffefb80989", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/f5b7078a3bfe983900c393fb51eeed4fc0b6b6d1", + "reference": "f5b7078a3bfe983900c393fb51eeed4fc0b6b6d1", "shasum": "" }, "require": { - "illuminate/console": "~5.8.0|^6.0", - "illuminate/contracts": "~5.8.0|^6.0", - "illuminate/events": "~5.8.0|^6.0", - "illuminate/filesystem": "~5.8.0|^6.0", - "illuminate/notifications": "~5.8.0|^6.0", - "illuminate/support": "~5.8.0|^6.0", + "illuminate/console": "^5.8.15|^6.0", + "illuminate/contracts": "^5.8.15|^6.0", + "illuminate/events": "^5.8.15|^6.0", + "illuminate/filesystem": "^5.8.15|^6.0", + "illuminate/notifications": "^5.8.15|^6.0", + "illuminate/support": "^5.8.15|^6.0", "league/flysystem": "^1.0.49", "php": "^7.2", "spatie/db-dumper": "^2.12", @@ -4359,7 +4359,7 @@ "laravel/slack-notification-channel": "^1.0", "league/flysystem-aws-s3-v3": "^1.0", "mockery/mockery": "^1.0", - "orchestra/testbench": "~3.8.0|^4.0", + "orchestra/testbench": "3.8.*|4.*", "phpunit/phpunit": "^8.0" }, "suggest": { @@ -4401,7 +4401,7 @@ "laravel-backup", "spatie" ], - "time": "2019-09-30T17:32:51+00:00" + "time": "2019-10-16T14:55:55+00:00" }, { "name": "spatie/laravel-image-optimizer", @@ -4510,25 +4510,26 @@ }, { "name": "stevebauman/purify", - "version": "v2.0.2", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/stevebauman/purify.git", - "reference": "d264520280042a745f4f75f5110bbcc21a0a083f" + "reference": "75447eb67edbbf5528a32964e78f155d344b1d0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stevebauman/purify/zipball/d264520280042a745f4f75f5110bbcc21a0a083f", - "reference": "d264520280042a745f4f75f5110bbcc21a0a083f", + "url": "https://api.github.com/repos/stevebauman/purify/zipball/75447eb67edbbf5528a32964e78f155d344b1d0e", + "reference": "75447eb67edbbf5528a32964e78f155d344b1d0e", "shasum": "" }, "require": { "ezyang/htmlpurifier": "^4.9.0", - "illuminate/support": "5.*", - "php": ">=5.4.0" + "illuminate/support": "~5.5|~6.0", + "php": ">=7.1" }, "require-dev": { - "orchestra/testbench": "~3.0" + "orchestra/testbench": "~3.7", + "phpunit/phpunit": "~7.0" }, "type": "library", "extra": { @@ -4566,7 +4567,7 @@ "purification", "purify" ], - "time": "2019-05-01T14:25:24+00:00" + "time": "2019-10-16T19:02:29+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -4632,16 +4633,16 @@ }, { "name": "symfony/console", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36" + "reference": "929ddf360d401b958f611d44e726094ab46a7369" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36", + "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369", + "reference": "929ddf360d401b958f611d44e726094ab46a7369", "shasum": "" }, "require": { @@ -4703,20 +4704,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-07T12:36:49+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03" + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03", - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", "shasum": "" }, "require": { @@ -4756,20 +4757,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:07:54+00:00" + "time": "2019-10-02T08:36:26+00:00" }, { "name": "symfony/debug", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced" + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced", - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced", + "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", "shasum": "" }, "require": { @@ -4812,20 +4813,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-09-19T15:51:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2" + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2", - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807", + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807", "shasum": "" }, "require": { @@ -4882,20 +4883,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-01T16:40:32+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.5", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c" + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c", - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "shasum": "" }, "require": { @@ -4940,11 +4941,11 @@ "interoperability", "standards" ], - "time": "2019-06-20T06:46:26+00:00" + "time": "2019-09-17T09:54:03+00:00" }, { "name": "symfony/filesystem", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -4994,16 +4995,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2" + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2", - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2", + "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1", + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1", "shasum": "" }, "require": { @@ -5039,20 +5040,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-08-14T12:26:46+00:00" + "time": "2019-09-16T11:29:48+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc" + "reference": "76590ced16d4674780863471bae10452b79210a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc", - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5", + "reference": "76590ced16d4674780863471bae10452b79210a5", "shasum": "" }, "require": { @@ -5094,20 +5095,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-04T19:48:13+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52" + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5e0fc71be03d52cd00c423061cfd300bd6f92a52", - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991", + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991", "shasum": "" }, "require": { @@ -5186,20 +5187,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-08-26T16:47:42+00:00" + "time": "2019-10-07T15:06:41+00:00" }, { "name": "symfony/mime", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "987a05df1c6ac259b34008b932551353f4f408df" + "reference": "32f71570547b91879fdbd9cf50317d556ae86916" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df", - "reference": "987a05df1c6ac259b34008b932551353f4f408df", + "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", + "reference": "32f71570547b91879fdbd9cf50317d556ae86916", "shasum": "" }, "require": { @@ -5245,7 +5246,7 @@ "mime", "mime-type" ], - "time": "2019-08-22T08:16:11+00:00" + "time": "2019-09-19T17:00:15+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5708,16 +5709,16 @@ }, { "name": "symfony/process", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a" + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a", - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a", + "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b", + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b", "shasum": "" }, "require": { @@ -5753,7 +5754,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-09-26T21:17:10+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -5822,16 +5823,16 @@ }, { "name": "symfony/routing", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f" + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", + "url": "https://api.github.com/repos/symfony/routing/zipball/3b174ef04fe66696524efad1e5f7a6c663d822ea", + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea", "shasum": "" }, "require": { @@ -5894,20 +5895,20 @@ "uri", "url" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T20:57:10+00:00" }, { "name": "symfony/service-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3" + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", "shasum": "" }, "require": { @@ -5952,20 +5953,20 @@ "interoperability", "standards" ], - "time": "2019-08-20T14:44:19+00:00" + "time": "2019-09-17T11:12:18+00:00" }, { "name": "symfony/translation", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "28498169dd334095fa981827992f3a24d50fed0f" + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f", - "reference": "28498169dd334095fa981827992f3a24d50fed0f", + "url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f", + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f", "shasum": "" }, "require": { @@ -6028,20 +6029,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-09-27T14:37:39+00:00" }, { "name": "symfony/translation-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a" + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6", + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6", "shasum": "" }, "require": { @@ -6085,20 +6086,20 @@ "interoperability", "standards" ], - "time": "2019-08-02T12:15:04+00:00" + "time": "2019-09-17T11:12:18+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6" + "reference": "bde8957fc415fdc6964f33916a3755737744ff05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6", - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05", + "reference": "bde8957fc415fdc6964f33916a3755737744ff05", "shasum": "" }, "require": { @@ -6161,7 +6162,7 @@ "debug", "dump" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T19:48:13+00:00" }, { "name": "tightenco/collect", @@ -6319,16 +6320,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "2.1.3", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1" + "reference": "6dcf9e760a6b476f3e9d80abbc9ce9c4aa921f9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/279723778c40164bcf984a2df12ff2c6ec5e61c1", - "reference": "279723778c40164bcf984a2df12ff2c6ec5e61c1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/6dcf9e760a6b476f3e9d80abbc9ce9c4aa921f9c", + "reference": "6dcf9e760a6b476f3e9d80abbc9ce9c4aa921f9c", "shasum": "" }, "require": { @@ -6341,6 +6342,7 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { + "ext-curl": "*", "ext-dom": "*", "ext-libxml": "*", "http-interop/http-factory-tests": "^0.5.0", @@ -6381,7 +6383,7 @@ "psr", "psr-7" ], - "time": "2019-07-10T16:13:25+00:00" + "time": "2019-10-10T17:38:20+00:00" } ], "packages-dev": [ @@ -6817,6 +6819,175 @@ ], "time": "2019-03-17T17:37:11+00:00" }, + { + "name": "facade/flare-client-php", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/facade/flare-client-php.git", + "reference": "608c2be3157b09f1868ca97ea4ddf3434ee83d63" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/608c2be3157b09f1868ca97ea4ddf3434ee83d63", + "reference": "608c2be3157b09f1868ca97ea4ddf3434ee83d63", + "shasum": "" + }, + "require": { + "facade/ignition-contracts": "~1.0", + "illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0", + "php": "^7.1", + "symfony/http-foundation": "~3.3|~4.1", + "symfony/var-dumper": "^3.4|^4.0" + }, + "require-dev": { + "larapack/dd": "^1.1", + "phpunit/phpunit": "^7.5.16", + "spatie/phpunit-snapshot-assertions": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Facade\\FlareClient\\": "src" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Send PHP errors to Flare", + "homepage": "https://github.com/facade/flare-client-php", + "keywords": [ + "exception", + "facade", + "flare", + "reporting" + ], + "time": "2019-10-07T19:15:46+00:00" + }, + { + "name": "facade/ignition", + "version": "1.11.2", + "source": { + "type": "git", + "url": "https://github.com/facade/ignition.git", + "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/ignition/zipball/862cbc2dfffa1fa28b47822a116e5b2e03b421db", + "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "facade/flare-client-php": "^1.1", + "facade/ignition-contracts": "^1.0", + "filp/whoops": "^2.4", + "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0", + "monolog/monolog": "^1.12 || ^2.0", + "php": "^7.1", + "scrivo/highlight.php": "^9.15", + "symfony/console": "^3.4 || ^4.0", + "symfony/var-dumper": "^3.4 || ^4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", + "mockery/mockery": "^1.2", + "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0" + }, + "suggest": { + "laravel/telescope": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "Facade\\Ignition\\IgnitionServiceProvider" + ], + "aliases": { + "Flare": "Facade\\Ignition\\Facades\\Flare" + } + } + }, + "autoload": { + "psr-4": { + "Facade\\Ignition\\": "src" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A beautiful error page for Laravel applications.", + "homepage": "https://github.com/facade/ignition", + "keywords": [ + "error", + "flare", + "laravel", + "page" + ], + "time": "2019-10-13T10:42:06+00:00" + }, + { + "name": "facade/ignition-contracts", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/facade/ignition-contracts.git", + "reference": "f445db0fb86f48e205787b2592840dd9c80ded28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28", + "reference": "f445db0fb86f48e205787b2592840dd9c80ded28", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Facade\\IgnitionContracts\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://flareapp.io", + "role": "Developer" + } + ], + "description": "Solution contracts for Ignition", + "homepage": "https://github.com/facade/ignition-contracts", + "keywords": [ + "contracts", + "flare", + "ignition" + ], + "time": "2019-08-30T14:06:08+00:00" + }, { "name": "filp/whoops", "version": "2.5.0", @@ -7118,23 +7289,23 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.8", + "version": "5.2.9", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4" + "reference": "44c6787311242a979fa15c704327c20e7221a0e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4", + "reference": "44c6787311242a979fa15c704327c20e7221a0e4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20", + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, @@ -7180,7 +7351,7 @@ "json", "schema" ], - "time": "2019-01-14T23:55:14+00:00" + "time": "2019-09-25T14:49:45+00:00" }, { "name": "league/container", @@ -7250,25 +7421,25 @@ }, { "name": "maximebf/debugbar", - "version": "v1.15.0", + "version": "v1.15.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07" + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07", - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e", + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=5.6", "psr/log": "^1.0", - "symfony/var-dumper": "^2.6|^3.0|^4.0" + "symfony/var-dumper": "^2.6|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" + "phpunit/phpunit": "^5" }, "suggest": { "kriswallsmith/assetic": "The best way to manage assets", @@ -7278,7 +7449,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -7307,7 +7478,7 @@ "debug", "debugbar" ], - "time": "2017-12-15T11:13:46+00:00" + "time": "2019-09-24T14:55:42+00:00" }, { "name": "mockery/mockery", @@ -7624,16 +7795,16 @@ }, { "name": "nunomaduro/collision", - "version": "v2.1.1", + "version": "v3.0.1", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63" + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/b5feb0c0d92978ec7169232ce5d70d6da6b29f63", - "reference": "b5feb0c0d92978ec7169232ce5d70d6da6b29f63", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/af42d339fe2742295a54f6fdd42aaa6f8c4aca68", + "reference": "af42d339fe2742295a54f6fdd42aaa6f8c4aca68", "shasum": "" }, "require": { @@ -7643,10 +7814,10 @@ "symfony/console": "~2.8|~3.3|~4.0" }, "require-dev": { - "laravel/framework": "5.7.*", + "laravel/framework": "5.8.*", "nunomaduro/larastan": "^0.3.0", - "phpstan/phpstan": "^0.10", - "phpunit/phpunit": "~7.3" + "phpstan/phpstan": "^0.11", + "phpunit/phpunit": "~8.0" }, "type": "library", "extra": { @@ -7684,7 +7855,7 @@ "php", "symfony" ], - "time": "2018-11-21T21:40:54+00:00" + "time": "2019-03-07T21:35:13+00:00" }, { "name": "nunomaduro/phpinsights", @@ -8215,22 +8386,22 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.1", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -8274,7 +8445,7 @@ "spy", "stub" ], - "time": "2019-06-13T12:50:23+00:00" + "time": "2019-10-03T11:07:50+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -8325,40 +8496,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "7.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa0d179a13284c7420fc281fc32750e6cc7c9e2f", + "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", + "php": "^7.2", + "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", + "phpunit/php-token-stream": "^3.1.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", + "sebastian/environment": "^4.2.2", "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "theseer/tokenizer": "^1.1.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^8.2.2" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-xdebug": "^2.7.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -8384,7 +8555,7 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "time": "2019-09-17T06:24:36+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8577,53 +8748,52 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.16", + "version": "8.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661" + "reference": "366a4a0f2b971fd43b7c351d621e8dd7d7131869" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661", - "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/366a4a0f2b971fd43b7c351d621e8dd7d7131869", + "reference": "366a4a0f2b971fd43b7c351d621e8dd7d7131869", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.2.0", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.9.1", + "phar-io/manifest": "^1.0.3", + "phar-io/version": "^2.0.1", + "php": "^7.2", + "phpspec/prophecy": "^1.8.1", + "phpunit/php-code-coverage": "^7.0.7", + "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", + "phpunit/php-timer": "^2.1.2", + "sebastian/comparator": "^3.0.2", + "sebastian/diff": "^3.0.2", + "sebastian/environment": "^4.2.2", + "sebastian/exporter": "^3.1.1", + "sebastian/global-state": "^3.0.0", "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", + "sebastian/resource-operations": "^2.0.1", + "sebastian/type": "^1.1.3", "sebastian/version": "^2.0.1" }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" - }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-soap": "*", "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "phpunit/php-invoker": "^2.0.0" }, "bin": [ "phpunit" @@ -8631,7 +8801,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "8.4-dev" } }, "autoload": { @@ -8657,7 +8827,74 @@ "testing", "xunit" ], - "time": "2019-09-14T09:08:39+00:00" + "time": "2019-10-07T12:57:41+00:00" + }, + { + "name": "scrivo/highlight.php", + "version": "v9.15.10.0", + "source": { + "type": "git", + "url": "https://github.com/scrivo/highlight.php.git", + "reference": "9ad3adb4456dc91196327498dbbce6aa1ba1239e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/9ad3adb4456dc91196327498dbbce6aa1ba1239e", + "reference": "9ad3adb4456dc91196327498dbbce6aa1ba1239e", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "^4.8|^5.7", + "symfony/finder": "^2.8" + }, + "suggest": { + "ext-dom": "Needed to make use of the features in the utilities namespace" + }, + "type": "library", + "autoload": { + "psr-0": { + "Highlight\\": "", + "HighlightUtilities\\": "" + }, + "files": [ + "HighlightUtilities/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Geert Bergman", + "homepage": "http://www.scrivo.org/", + "role": "Project Author" + }, + { + "name": "Vladimir Jimenez", + "homepage": "https://allejo.io", + "role": "Contributor" + }, + { + "name": "Martin Folkers", + "homepage": "https://twobrain.io", + "role": "Contributor" + } + ], + "description": "Server side syntax highlighter that supports 185 languages. It's a PHP port of highlight.js", + "keywords": [ + "code", + "highlight", + "highlight.js", + "highlight.php", + "syntax" + ], + "time": "2019-08-27T04:27:48+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -8985,23 +9222,26 @@ }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.2", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^8.0" }, "suggest": { "ext-uopz": "*" @@ -9009,7 +9249,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -9032,7 +9272,7 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2019-02-01T05:30:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -9221,6 +9461,52 @@ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "time": "2018-10-04T04:07:39+00:00" }, + { + "name": "sebastian/type", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3", + "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3", + "shasum": "" + }, + "require": { + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "time": "2019-07-02T08:10:15+00:00" + }, { "name": "sebastian/version", "version": "2.0.1", @@ -9447,16 +9733,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.0", + "version": "3.5.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "0afebf16a2e7f1e434920fa976253576151effe9" + "reference": "82cd0f854ceca17731d6d019c7098e3755c45060" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0afebf16a2e7f1e434920fa976253576151effe9", - "reference": "0afebf16a2e7f1e434920fa976253576151effe9", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/82cd0f854ceca17731d6d019c7098e3755c45060", + "reference": "82cd0f854ceca17731d6d019c7098e3755c45060", "shasum": "" }, "require": { @@ -9494,20 +9780,20 @@ "phpcs", "standards" ], - "time": "2019-09-26T23:12:26+00:00" + "time": "2019-10-16T21:14:26+00:00" }, { "name": "symfony/cache", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "1d8f7fee990c586f275cde1a9fc883d6b1e2d43e" + "reference": "40c62600ebad1ed2defbf7d35523d918a73ab330" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/1d8f7fee990c586f275cde1a9fc883d6b1e2d43e", - "reference": "1d8f7fee990c586f275cde1a9fc883d6b1e2d43e", + "url": "https://api.github.com/repos/symfony/cache/zipball/40c62600ebad1ed2defbf7d35523d918a73ab330", + "reference": "40c62600ebad1ed2defbf7d35523d918a73ab330", "shasum": "" }, "require": { @@ -9572,20 +9858,20 @@ "caching", "psr6" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T10:57:53+00:00" }, { "name": "symfony/cache-contracts", - "version": "v1.1.5", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "ec5524b669744b5f1dc9c66d3c2b091eb7e7f0db" + "reference": "af50d14ada9e4e82cfabfabdc502d144f89be0a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ec5524b669744b5f1dc9c66d3c2b091eb7e7f0db", - "reference": "ec5524b669744b5f1dc9c66d3c2b091eb7e7f0db", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/af50d14ada9e4e82cfabfabdc502d144f89be0a1", + "reference": "af50d14ada9e4e82cfabfabdc502d144f89be0a1", "shasum": "" }, "require": { @@ -9630,20 +9916,20 @@ "interoperability", "standards" ], - "time": "2019-06-13T11:15:36+00:00" + "time": "2019-10-04T21:43:27+00:00" }, { "name": "symfony/config", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "07d49c0f823e0bc367c6d84e35b61419188a5ece" + "reference": "0acb26407a9e1a64a275142f0ae5e36436342720" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/07d49c0f823e0bc367c6d84e35b61419188a5ece", - "reference": "07d49c0f823e0bc367c6d84e35b61419188a5ece", + "url": "https://api.github.com/repos/symfony/config/zipball/0acb26407a9e1a64a275142f0ae5e36436342720", + "reference": "0acb26407a9e1a64a275142f0ae5e36436342720", "shasum": "" }, "require": { @@ -9694,20 +9980,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-09-19T15:51:53+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "d3ad14b66ac773ba6123622eb9b5b010165fe3d9" + "reference": "e1e0762a814b957a1092bff75a550db49724d05b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3ad14b66ac773ba6123622eb9b5b010165fe3d9", - "reference": "d3ad14b66ac773ba6123622eb9b5b010165fe3d9", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e1e0762a814b957a1092bff75a550db49724d05b", + "reference": "e1e0762a814b957a1092bff75a550db49724d05b", "shasum": "" }, "require": { @@ -9767,26 +10053,26 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2019-08-26T16:27:33+00:00" + "time": "2019-10-02T12:58:58+00:00" }, { "name": "symfony/http-client", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "9a4fa769269ed730196a5c52c742b30600cf1e87" + "reference": "69d438274718121e1166e7f65c290f891a4c8ddb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/9a4fa769269ed730196a5c52c742b30600cf1e87", - "reference": "9a4fa769269ed730196a5c52c742b30600cf1e87", + "url": "https://api.github.com/repos/symfony/http-client/zipball/69d438274718121e1166e7f65c290f891a4c8ddb", + "reference": "69d438274718121e1166e7f65c290f891a4c8ddb", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "^1.0", - "symfony/http-client-contracts": "^1.1.6", + "symfony/http-client-contracts": "^1.1.7", "symfony/polyfill-php73": "^1.11" }, "provide": { @@ -9829,20 +10115,20 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-10-07T10:52:41+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "6005fe61a33724405d56eb5b055d5d370192a1bd" + "reference": "353b2a3e907e5c34cf8f74827a4b21eb745aab1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/6005fe61a33724405d56eb5b055d5d370192a1bd", - "reference": "6005fe61a33724405d56eb5b055d5d370192a1bd", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/353b2a3e907e5c34cf8f74827a4b21eb745aab1d", + "reference": "353b2a3e907e5c34cf8f74827a4b21eb745aab1d", "shasum": "" }, "require": { @@ -9886,11 +10172,11 @@ "interoperability", "standards" ], - "time": "2019-08-08T10:05:21+00:00" + "time": "2019-09-26T22:09:58+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -10003,7 +10289,7 @@ }, { "name": "symfony/stopwatch", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -10053,7 +10339,7 @@ }, { "name": "symfony/var-exporter", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", @@ -10113,16 +10399,16 @@ }, { "name": "symfony/yaml", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686" + "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686", - "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686", + "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178", + "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178", "shasum": "" }, "require": { @@ -10168,7 +10454,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-09-11T15:41:19+00:00" }, { "name": "symplify/coding-standard", @@ -10468,7 +10754,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.1.3", + "php": "^7.2", "ext-bcmath": "*", "ext-ctype": "*", "ext-curl": "*", diff --git a/config/instance.php b/config/instance.php index b01b43c38..706d06274 100644 --- a/config/instance.php +++ b/config/instance.php @@ -39,5 +39,11 @@ return [ 'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.') ] ], - + 'username' => [ + 'remote' => [ + 'formats' => ['@', 'from', 'custom'], + 'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@', + 'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null) + ] + ], ]; \ No newline at end of file diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index 4e089faed..d6a364a51 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -8,7 +8,7 @@ RUN apt-get update \ && 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 \ + 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 \ diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm index a402726a3..2b4b94416 100644 --- a/contrib/docker/Dockerfile.fpm +++ b/contrib/docker/Dockerfile.fpm @@ -8,7 +8,7 @@ RUN apt-get update \ && 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 \ + 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 \ diff --git a/contrib/nginx.conf b/contrib/nginx.conf index d668ce090..ecb90e15f 100644 --- a/contrib/nginx.conf +++ b/contrib/nginx.conf @@ -30,6 +30,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; + try_files $fastcgi_script_name =404; fastcgi_pass unix:/run/php-fpm/php-fpm.sock; # make sure this is correct fastcgi_index index.php; include fastcgi_params; diff --git a/docker-compose.yml b/docker-compose.yml index 3d9cccc02..9dc61f205 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,10 @@ services: app: # Comment to use dockerhub image - build: . + build: + context: . + dockerfile: contrib/docker/Dockerfile.apache + #dockerfile: contrib/docker/Dockerfile.fpm image: pixelfed restart: unless-stopped ## If you have a traefik running, uncomment this to expose Pixelfed @@ -36,7 +39,10 @@ services: worker: # Comment this whole block if HORIZON_EMBED is true. # Comment to use dockerhub image - build: . + build: + context: . + dockerfile: contrib/docker/Dockerfile.apache + #dockerfile: contrib/docker/Dockerfile.fpm image: pixelfed restart: unless-stopped env_file: @@ -54,6 +60,7 @@ services: restart: unless-stopped networks: - internal + command: --default-authentication-plugin=mysql_native_password environment: - MYSQL_DATABASE=pixelfed - MYSQL_USER=${DB_USERNAME} diff --git a/package-lock.json b/package-lock.json index d4cc0df1a..efd5539a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10484,6 +10484,11 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=" + }, + "zuck.js": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/zuck.js/-/zuck.js-1.5.4.tgz", + "integrity": "sha512-vCNaP+mLHzslUJrIj3FakFfno9wKWJatlTKYCW7EjxN4xkodfEIcm5QrE+J9UdPSTn9TTaXrDRgaJZeG3Er7HA==" } } } diff --git a/package.json b/package.json index 70054c087..46d48743e 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,7 @@ "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "postinstall": "opencollective-postinstall" + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { "axios": "^0.18.1", @@ -28,21 +27,15 @@ "dependencies": { "@trevoreyre/autocomplete-vue": "^2.0.2", "bootstrap-vue": "^2.0.0-rc.26", - "emoji-mart-vue": "^2.6.6", "filesize": "^3.6.1", "howler": "^2.1.2", "infinite-scroll": "^3.0.6", "laravel-echo": "^1.5.4", "laravel-mix": "^4.1.2", "node-sass": "^4.12.0", - "opencollective": "^1.0.3", - "opencollective-postinstall": "^2.0.2", - "plyr": "^3.5.6", "promise-polyfill": "8.1.0", - "pusher-js": "^4.4.0", "quill": "^1.3.7", "readmore-js": "^2.2.1", - "socket.io-client": "^2.2.0", "sweetalert": "^2.1.2", "twitter-text": "^2.0.5", "vue-carousel": "^0.18.0", @@ -50,7 +43,8 @@ "vue-cropperjs": "^4.0.0", "vue-infinite-loading": "^2.4.4", "vue-loading-overlay": "^3.2.0", - "vue-timeago": "^5.1.2" + "vue-timeago": "^5.1.2", + "zuck.js": "^1.5.4" }, "collective": { "type": "opencollective", diff --git a/public/css/app.css b/public/css/app.css index f50d2c80d..d8cb58e50 100644 Binary files a/public/css/app.css and b/public/css/app.css differ diff --git a/public/css/appdark.css b/public/css/appdark.css index 01fc04b66..2f5350bd5 100644 Binary files a/public/css/appdark.css and b/public/css/appdark.css differ diff --git a/public/css/landing.css b/public/css/landing.css index 9890f0b63..07dfc72ad 100644 Binary files a/public/css/landing.css and b/public/css/landing.css differ diff --git a/public/js/app.js b/public/js/app.js index aba4fe8e2..2b3436667 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/public/js/collections.js b/public/js/collections.js index 28d14f1ce..73d16f07c 100644 Binary files a/public/js/collections.js and b/public/js/collections.js differ diff --git a/public/js/profile.js b/public/js/profile.js index 1481edf5f..c03d9d734 100644 Binary files a/public/js/profile.js and b/public/js/profile.js differ diff --git a/public/js/status.js b/public/js/status.js index 252b13789..13f973e69 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/js/timeline.js b/public/js/timeline.js index ddd56e1e1..7f93fbc3b 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1ea61b6e4..1f462b140 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 4593326a4..d3f7d4ecc 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -20,19 +20,18 @@ window.App.boot = function() { new Vue({ el: '#content'}); } + window.App.util = { time: (function() { return new Date; }), - version: (function() { - return 1; - }), + version: 1, format: { - count: (function(count = 0) { + count: (function(count = 0, locale = 'en-GB', notation = 'compact') { if(count < 1) { return 0; } - return new Intl.NumberFormat('en-GB', { notation: "compact" , compactDisplay: "short" }).format(count); + return new Intl.NumberFormat(locale, { notation: notation , compactDisplay: "short" }).format(count); }) }, filters: [ @@ -78,5 +77,6 @@ window.App.util = { ['Willow','filter-willow'], ['X-Pro II','filter-xpro-ii'] ], - emoji: ['๐Ÿ˜‚','๐Ÿ’ฏ','โค๏ธ','๐Ÿ™Œ','๐Ÿ‘','๐Ÿ‘Œ','๐Ÿ˜','๐Ÿ˜ฏ','๐Ÿ˜ข','๐Ÿ˜…','๐Ÿ˜','๐Ÿ™‚','๐Ÿ˜Ž','๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ'], + emoji: ['๐Ÿ˜‚','๐Ÿ’ฏ','โค๏ธ','๐Ÿ™Œ','๐Ÿ‘','๐Ÿ‘Œ','๐Ÿ˜','๐Ÿ˜ฏ','๐Ÿ˜ข','๐Ÿ˜…','๐Ÿ˜','๐Ÿ™‚','๐Ÿ˜Ž','๐Ÿ˜€','๐Ÿคฃ','๐Ÿ˜ƒ','๐Ÿ˜„','๐Ÿ˜†','๐Ÿ˜‰','๐Ÿ˜Š','๐Ÿ˜‹','๐Ÿ˜˜','๐Ÿ˜—','๐Ÿ˜™','๐Ÿ˜š','๐Ÿค—','๐Ÿคฉ','๐Ÿค”','๐Ÿคจ','๐Ÿ˜','๐Ÿ˜‘','๐Ÿ˜ถ','๐Ÿ™„','๐Ÿ˜','๐Ÿ˜ฃ','๐Ÿ˜ฅ','๐Ÿ˜ฎ','๐Ÿค','๐Ÿ˜ช','๐Ÿ˜ซ','๐Ÿ˜ด','๐Ÿ˜Œ','๐Ÿ˜›','๐Ÿ˜œ','๐Ÿ˜','๐Ÿคค','๐Ÿ˜’','๐Ÿ˜“','๐Ÿ˜”','๐Ÿ˜•','๐Ÿ™ƒ','๐Ÿค‘','๐Ÿ˜ฒ','๐Ÿ™','๐Ÿ˜–','๐Ÿ˜ž','๐Ÿ˜Ÿ','๐Ÿ˜ค','๐Ÿ˜ญ','๐Ÿ˜ฆ','๐Ÿ˜ง','๐Ÿ˜จ','๐Ÿ˜ฉ','๐Ÿคฏ','๐Ÿ˜ฌ','๐Ÿ˜ฐ','๐Ÿ˜ฑ','๐Ÿ˜ณ','๐Ÿคช','๐Ÿ˜ต','๐Ÿ˜ก','๐Ÿ˜ ','๐Ÿคฌ','๐Ÿ˜ท','๐Ÿค’','๐Ÿค•','๐Ÿคข','๐Ÿคฎ','๐Ÿคง','๐Ÿ˜‡','๐Ÿค ','๐Ÿคก','๐Ÿคฅ','๐Ÿคซ','๐Ÿคญ','๐Ÿง','๐Ÿค“','๐Ÿ˜ˆ','๐Ÿ‘ฟ','๐Ÿ‘น','๐Ÿ‘บ','๐Ÿ’€','๐Ÿ‘ป','๐Ÿ‘ฝ','๐Ÿค–','๐Ÿ’ฉ','๐Ÿ˜บ','๐Ÿ˜ธ','๐Ÿ˜น','๐Ÿ˜ป','๐Ÿ˜ผ','๐Ÿ˜ฝ','๐Ÿ™€','๐Ÿ˜ฟ','๐Ÿ˜พ','๐Ÿคฒ','๐Ÿ‘','๐Ÿค','๐Ÿ‘','๐Ÿ‘Ž','๐Ÿ‘Š','โœŠ','๐Ÿค›','๐Ÿคœ','๐Ÿคž','โœŒ๏ธ','๐ŸคŸ','๐Ÿค˜','๐Ÿ‘ˆ','๐Ÿ‘‰','๐Ÿ‘†','๐Ÿ‘‡','โ˜๏ธ','โœ‹','๐Ÿคš','๐Ÿ–','๐Ÿ––','๐Ÿ‘‹','๐Ÿค™','๐Ÿ’ช','๐Ÿ–•','โœ๏ธ','๐Ÿ™','๐Ÿ’','๐Ÿ’„','๐Ÿ’‹','๐Ÿ‘„','๐Ÿ‘…','๐Ÿ‘‚','๐Ÿ‘ƒ','๐Ÿ‘ฃ','๐Ÿ‘','๐Ÿ‘€','๐Ÿง ','๐Ÿ—ฃ','๐Ÿ‘ค','๐Ÿ‘ฅ' + ], }; \ No newline at end of file diff --git a/resources/assets/js/components/CollectionComponent.vue b/resources/assets/js/components/CollectionComponent.vue index 56dd8318f..bf7c4b58f 100644 --- a/resources/assets/js/components/CollectionComponent.vue +++ b/resources/assets/js/components/CollectionComponent.vue @@ -15,7 +15,14 @@

- +         @@ -62,7 +69,20 @@ - + +

+ +
+
+
+
+
+
+
+
+
+
+
@@ -105,12 +125,15 @@ export default { return { loaded: false, posts: [], + ids: [], currentUser: false, owner: false, title: this.collectionTitle, description: this.collectionDescription, visibility: this.collectionVisibility, - photoId: '' + photoId: '', + postsList: [], + loadingPostList: false } }, @@ -135,6 +158,9 @@ export default { axios.get('/api/local/collection/items/' + this.collectionId) .then(res => { this.posts = res.data; + this.ids = this.posts.map(p => { + return p.id; + }); this.loaded = true; }); }, @@ -149,11 +175,34 @@ export default { }, addToCollection() { - this.$refs.addPhotoModal.show(); + let self = this; + this.loadingPostList = true; + if(this.postsList.length == 0) { + axios.get('/api/pixelfed/v1/accounts/'+this.profileId+'/statuses', { + params: { + min_id: 1, + limit: 13 + } + }) + .then(res => { + self.postsList = res.data.filter(l => { + return self.ids.indexOf(l.id) == -1; + }).splice(0,9); + self.loadingPostList = false; + self.$refs.addPhotoModal.show(); + }).catch(err => { + self.loadingPostList = false; + swal('An Error Occured', 'We cannot process your request at this time, please try again later.', 'error'); + }) + } else { + this.$refs.addPhotoModal.show(); + this.loadingPostList = false; + } }, pushId() { let max = 18; + let self = this; if(this.posts.length >= max) { swal('Error', 'You can only add ' + max + ' posts per collection', 'error'); return; @@ -174,7 +223,7 @@ export default { collection_id: this.collectionId, post_id: split[5] }).then(res => { - location.reload(); + self.ids.push(...split[5]); }).catch(err => { swal('Invalid URL', 'The post you entered was invalid', 'error'); this.photoId = ''; diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index fb163fae2..7d7ea1efe 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -164,7 +164,7 @@
- +
@@ -329,7 +329,7 @@ :gutter="{default: '5px'}" > @@ -1080,6 +1080,22 @@ formatCount(count) { return App.util.format.count(count); + }, + + statusUrl(status) { + if(status.local == true) { + return status.url; + } + + return '/i/web/post/_/' + status.account.id + '/' + status.id; + }, + + profileUrl(status) { + if(status.local == true) { + return status.account.url; + } + + return '/i/web/profile/_/' + status.account.id; } } } diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 08ff05342..85c8b51c6 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -2,6 +2,7 @@
+
@@ -69,11 +70,11 @@
- + @@ -169,15 +170,15 @@

- + @@ -467,7 +468,6 @@ profile: {}, min_id: 0, max_id: 0, - stories: {}, suggestions: {}, loading: true, replies: [], @@ -579,7 +579,7 @@ axios.get(apiUrl, { params: { max_id: this.max_id, - limit: 5 + limit: 3 } }).then(res => { let data = res.data; @@ -596,6 +596,7 @@ if(this.hashtagPosts.length == 0) { this.fetchHashtagPosts(); } + // this.fetchStories(); }).catch(err => { swal( 'Oops, something went wrong', @@ -1159,14 +1160,14 @@ if(tags.length == 0) { return; } - let hashtag = tags[0]; + let hashtag = tags[Math.floor(Math.random(), tags.length)]; this.hashtagPostsName = hashtag; axios.get('/api/v2/discover/tag', { params: { hashtag: hashtag } }).then(res => { - if(res.data.tags.length) { + if(res.data.tags.length > 3) { this.showHashtagPosts = true; this.hashtagPosts = res.data.tags.splice(0,3); } @@ -1210,7 +1211,7 @@ ctxMenuGoToPost() { let status = this.ctxMenuStatus; - window.location.href = status.url; + window.location.href = this.statusUrl(status); this.closeCtxMenu(); return; }, @@ -1302,8 +1303,57 @@ formatCount(count) { return App.util.format.count(count); - } + }, + statusUrl(status) { + return status.url; + + // if(status.local == true) { + // return status.url; + // } + + // return '/i/web/post/_/' + status.account.id + '/' + status.id; + }, + + profileUrl(status) { + return status.account.url; + // if(status.local == true) { + // return status.account.url; + // } + + // return '/i/web/profile/_/' + status.account.id; + }, + + statusCardUsernameFormat(status) { + if(status.account.local == true) { + return status.account.username; + } + + let fmt = window.App.config.username.remote.format; + let txt = window.App.config.username.remote.custom; + let usr = status.account.username; + let dom = document.createElement('a'); + dom.href = status.account.url; + dom = dom.hostname; + + switch(fmt) { + case '@': + return usr + '@' + dom + ''; + break; + + case 'from': + return usr + ' from ' + dom + ''; + break; + + case 'custom': + return usr + ' ' + txt + ' ' + dom + ''; + break; + + default: + return usr + '@' + dom + ''; + break; + } + }, } } - + \ No newline at end of file diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue index c1b89dc0c..2771adb03 100644 --- a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue +++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue @@ -5,22 +5,6 @@

{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}

(click to show)

- @@ -29,22 +13,6 @@
- diff --git a/resources/assets/js/components/presenter/VideoPresenter.vue b/resources/assets/js/components/presenter/VideoPresenter.vue index 8e9f37f71..527d849a1 100644 --- a/resources/assets/js/components/presenter/VideoPresenter.vue +++ b/resources/assets/js/components/presenter/VideoPresenter.vue @@ -6,14 +6,14 @@

(click to show)

-
-
@@ -22,5 +22,18 @@ diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 3aa42e500..428351bfa 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -21,8 +21,4 @@ @import '~bootstrap-vue/dist/bootstrap-vue.css'; -@import '~plyr/dist/plyr.css'; - -@import '~vue-loading-overlay/dist/vue-loading.css'; - @import "moment"; \ No newline at end of file diff --git a/resources/assets/sass/appdark.scss b/resources/assets/sass/appdark.scss index 08d8c02d9..d88a375e5 100644 --- a/resources/assets/sass/appdark.scss +++ b/resources/assets/sass/appdark.scss @@ -72,10 +72,6 @@ textarea { @import '~bootstrap-vue/dist/bootstrap-vue.css'; -@import '~plyr/dist/plyr.css'; - -@import '~vue-loading-overlay/dist/vue-loading.css'; - @import "moment"; .border { diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index ecff04bb3..fb3c9aa17 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -565,4 +565,8 @@ details summary::-webkit-details-marker { .VueCarousel-dot:focus, .VueCarousel-dot--active:focus { outline: 0px !important; +} + +.status-content > p:first-child { + display: inline; } \ No newline at end of file diff --git a/resources/lang/de/auth.php b/resources/lang/de/auth.php index 4118bc202..053b045ad 100644 --- a/resources/lang/de/auth.php +++ b/resources/lang/de/auth.php @@ -14,6 +14,6 @@ return [ */ 'failed' => 'Diese Anmeldeinformationen stimmen nicht mit unseren Daten รผberein.', - 'throttle' => 'Zu viele Login-Versuche. Versuche es in :seconds Sekunden erneut.', + 'throttle' => 'Zu viele Anmeldeversuche. Versuche es in :seconds Sekunden erneut.', ]; diff --git a/resources/lang/de/helpcenter.php b/resources/lang/de/helpcenter.php index 953193239..b3953a663 100644 --- a/resources/lang/de/helpcenter.php +++ b/resources/lang/de/helpcenter.php @@ -15,7 +15,7 @@ return [ 'timelines' => 'Timelines', 'embed' => 'Einbetten', - 'communityGuidelines' => 'Community-Richtlinien', + 'communityGuidelines' => 'Gemeinschaftsrichtlinien', 'whatIsTheFediverse' => 'Was ist das Fediversum?', 'controllingVisibility' => 'Sichtbarkeit steuern', 'blockingAccounts' => 'Kontosperrung', diff --git a/resources/lang/de/notification.php b/resources/lang/de/notification.php index e08d6aea5..539881ec0 100644 --- a/resources/lang/de/notification.php +++ b/resources/lang/de/notification.php @@ -2,11 +2,11 @@ return [ - 'likedPhoto' => 'gefรคllt dein Foto.', + 'likedPhoto' => 'gefรคllt dein Beitrag.', 'likedComment' => 'gefรคllt dein Kommentar.', 'startedFollowingYou' => 'folgt dir nun.', - 'commented' => 'hat deinen Post kommentiert.', + 'commented' => 'hat deinen Beitrag kommentiert.', 'mentionedYou' => 'hat dich erwรคhnt.', - 'shared' => 'hat deinen Post teilen.', + 'shared' => 'hat deinen Beitrag geteilt.', ]; diff --git a/resources/lang/de/passwords.php b/resources/lang/de/passwords.php index b728ed830..da86a4511 100644 --- a/resources/lang/de/passwords.php +++ b/resources/lang/de/passwords.php @@ -15,8 +15,8 @@ return [ 'password' => 'Passwรถrter mรผssen mindestens 6 Zeichen lang sein und mit der Bestรคtigung รผbereinstimmen.', 'reset' => 'Dein Passwort wurde zurรผckgesetzt!', - 'sent' => 'Wir haben dir eine E-Mail zum Zurรผcksetzen deines Passworts gesendet!', - 'token' => 'Dieser Passwort-Reset-Code ist ungรผltig.', - 'user' => 'Wir konnten keinen Nutzer mit dieser E-Mail-Adresse finden.', + 'sent' => 'Wenn deine E-Mail-Adresse in unserer Datenbank existiert, wirst du in ein paar Minuten einen Link zum Zurรผcksetzen deines Passworts zugesendet bekommen. Bitte prรผfe deinen Spam-Ordner, wenn du diese E-Mail nicht bekommst.', + 'token' => 'Dieser Code zum Passwort zurรผcksetzen ist ungรผltig.', + 'user' => 'Wenn deine E-Mail-Adresse in unserer Datenbank existiert, wirst du in ein paar Minuten einen Link zum Zurรผcksetzen deines Passworts zugesendet bekommen. Bitte prรผfe deinen Spam-Ordner, wenn du diese E-Mail nicht bekommst.', ]; diff --git a/resources/lang/de/profile.php b/resources/lang/de/profile.php index 44aa5fa50..7bd312cc9 100644 --- a/resources/lang/de/profile.php +++ b/resources/lang/de/profile.php @@ -1,15 +1,15 @@ 'Dieser Benutzer hat noch nichts gepostet!', + 'emptyTimeline' => 'Dieser Benutzer hat noch nichts beigetragen!', 'emptyFollowers' => 'Diesem Benutzer folgt noch niemand!', 'emptyFollowing' => 'Dieser Benutzer folgt noch niemanden!', - 'emptySaved' => 'Du hast noch keinen Post gespeichert!', - 'savedWarning' => 'Nur du kannst sehen was du gespeichert hast', - 'privateProfileWarning' => 'Dieser Account ist privat', + 'emptySaved' => 'Du hast noch keinen Beitrag gespeichert!', + 'savedWarning' => 'Nur du kannst sehen, was du gespeichert hast', + 'privateProfileWarning' => 'Dieses Konto ist privat', 'alreadyFollow' => ':username bereits folgen?', 'loginToSeeProfile' => 'um deren Bilder und Videos zu sehen.', 'status.disabled.header' => 'Profil nicht verfรผgbar', - 'status.disabled.body' => 'Entschuldigung, dieses Profil ist im Moment nicht verfรผgbar. Bitte versuchen Sie es spรคter noch einmal.', + 'status.disabled.body' => 'Entschuldigung, dieses Profil ist im Moment nicht verfรผgbar. Bitte versuche es in Kรผrze noch einmal.', ]; diff --git a/resources/lang/de/site.php b/resources/lang/de/site.php index c91a1bb39..1197b5e51 100644 --- a/resources/lang/de/site.php +++ b/resources/lang/de/site.php @@ -8,12 +8,12 @@ return [ 'fediverse' => 'Fediverse', 'opensource' => 'Open Source', 'terms' => 'Nutzungshinweise', - 'privacy' => 'Privacy', + 'privacy' => 'Datenschutz', 'l10nWip' => 'Wir arbeiten noch an der Unterstรผtzung weiterer Sprachen', 'currentLocale' => 'Aktuelle Sprache', 'selectLocale' => 'Wรคhle eine der unterstรผtzten Sprachen aus', 'contact' => 'Kontakt', 'contact-us' => 'Kontaktiere uns', - 'places' => 'Plรคtze', + 'places' => 'Orte', ]; diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 7ae317b6b..bce7c31bf 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,4 +1,5 @@ +@auth @@ -8,7 +9,7 @@ - {{ $title ?? config('app.name', 'Laravel') }} + {{ $title ?? config('app.name', 'Pixelfed') }} @@ -36,11 +37,10 @@ - + @include('layouts.partial.nav')
@yield('content') - @if(Auth::check()) - @endif
@include('layouts.partial.footer') @@ -56,7 +55,6 @@ @stack('scripts') - @if(Auth::check())
@@ -79,6 +77,48 @@
- @endif +@endauth + +@guest + + + + + + + + {{ $title ?? config('app.name', 'Pixelfed') }} + + + + + + + @stack('meta') + + + + + + + + + + @stack('styles') + + + @include('layouts.partial.nav') +
+ @yield('content') +
+ @include('layouts.partial.footer') + + + + + @stack('scripts') + + +@endguest diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php index 43a47b41f..272e5934a 100644 --- a/resources/views/settings/partial/sidebar.blade.php +++ b/resources/views/settings/partial/sidebar.blade.php @@ -33,9 +33,9 @@
- + --}} diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php index b0d768c17..a68839d51 100644 --- a/resources/views/status/show.blade.php +++ b/resources/views/status/show.blade.php @@ -17,9 +17,12 @@ @push('meta') - + + @if($status->viewType() == "video" || $status->viewType() == "video:album") + + @endif @endpush @push('scripts') diff --git a/routes/api.php b/routes/api.php index d3317352e..944d7cafe 100644 --- a/routes/api.php +++ b/routes/api.php @@ -60,7 +60,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) { Route::post('statuses/{id}/unreblog', 'Api\ApiV1Controller@statusUnshare')->middleware($middleware); Route::delete('statuses/{id}', 'Api\ApiV1Controller@statusDelete')->middleware($middleware); Route::get('statuses/{id}', 'Api\ApiV1Controller@statusById')->middleware($middleware); - Route::post('statuses', 'Api\ApiV1Controller@statusCreate')->middleware($middleware); + Route::post('statuses', 'Api\ApiV1Controller@statusCreate')->middleware($middleware)->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440'); Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware); diff --git a/routes/web.php b/routes/web.php index 07dcb0e40..08593aa01 100644 --- a/routes/web.php +++ b/routes/web.php @@ -149,7 +149,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('exp/rec', 'ApiController@userRecommendations'); Route::post('discover/tag/subscribe', 'HashtagFollowController@store')->middleware('throttle:maxHashtagFollowsPerHour,60')->middleware('throttle:maxHashtagFollowsPerDay,1440');; Route::get('discover/tag/list', 'HashtagFollowController@getTags'); - Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get'); + // Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get'); Route::get('bookmarks', 'InternalApiController@bookmarks'); Route::get('collection/items/{id}', 'CollectionController@getItems'); Route::post('collection/item', 'CollectionController@storeId'); @@ -318,8 +318,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact Route::get('invites/create', 'UserInviteController@create')->name('settings.invites.create'); Route::post('invites/create', 'UserInviteController@store'); Route::get('invites', 'UserInviteController@show')->name('settings.invites'); - Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor'); - Route::post('sponsor', 'SettingsController@sponsorStore'); + // Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor'); + // Route::post('sponsor', 'SettingsController@sponsorStore'); }); Route::group(['prefix' => 'site'], function () { diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php index c076da008..b3f042b7e 100644 --- a/tests/Feature/LoginTest.php +++ b/tests/Feature/LoginTest.php @@ -5,6 +5,7 @@ namespace Tests\Feature; use Tests\TestCase; use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\WithoutMiddleware; +use App\User; class LoginTest extends TestCase { @@ -16,18 +17,4 @@ class LoginTest extends TestCase $response->assertSee('Forgot Password'); } - - /** @test */ - public function view_register_page() - { - if(true == config('pixelfed.open_registration')) { - $response = $this->get('register'); - - $response->assertSee('Register a new account'); - } else { - $response = $this->get('register'); - - $response->assertSee('Registration is closed'); - } - } } \ No newline at end of file