diff --git a/.env.example b/.env.example index 877fddbd..b21ae890 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,6 @@ APP_URL=http://localhost APP_DOMAIN="localhost" ADMIN_DOMAIN="localhost" SESSION_DOMAIN="localhost" -SESSION_SECURE_COOKIE=true TRUST_PROXIES="*" LOG_CHANNEL=stack diff --git a/.env.example.docker b/.env.example.docker index f102446a..9e34cb85 100644 --- a/.env.example.docker +++ b/.env.example.docker @@ -7,7 +7,6 @@ APP_URL=http://localhost APP_DOMAIN="localhost" ADMIN_DOMAIN="localhost" SESSION_DOMAIN="localhost" -SESSION_SECURE_COOKIE=true TRUST_PROXIES="*" LOG_CHANNEL=stack diff --git a/.env.testing b/.env.testing index 5ea92d17..96911503 100644 --- a/.env.testing +++ b/.env.testing @@ -7,7 +7,6 @@ APP_URL=https://pixelfed.dev APP_DOMAIN="pixelfed.dev" ADMIN_DOMAIN="pixelfed.dev" SESSION_DOMAIN="pixelfed.dev" -SESSION_SECURE_COOKIE=true TRUST_PROXIES="*" LOG_CHANNEL=stack diff --git a/app/Transformer/ActivityPub/ProfileTransformer.php b/app/Transformer/ActivityPub/ProfileTransformer.php index 8172e377..dcfb0870 100644 --- a/app/Transformer/ActivityPub/ProfileTransformer.php +++ b/app/Transformer/ActivityPub/ProfileTransformer.php @@ -39,10 +39,6 @@ class ProfileTransformer extends Fractal\TransformerAbstract 'owner' => $profile->permalink(), 'publicKeyPem' => $profile->public_key, ], - // remove shared inbox support until proper support - // 'endpoints' => [ - // 'sharedInbox' => config('routes.api.sharedInbox'), - // ], 'icon' => [ 'type' => 'Image', 'mediaType' => 'image/jpeg', diff --git a/config/exp.php b/config/exp.php index 1c4bf45c..44099761 100644 --- a/config/exp.php +++ b/config/exp.php @@ -4,7 +4,5 @@ return [ 'lc' => env('EXP_LC', false), 'rec' => env('EXP_REC', false), - 'ns' => env('EXP_NS', false), - 'loops' => env('EXP_LOOPS', false) - -]; \ No newline at end of file + 'loops' => env('EXP_LOOPS', false), +]; diff --git a/config/filesystems.php b/config/filesystems.php index 1f8d84cc..e48490f0 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -63,6 +63,7 @@ return [ 'bucket' => env('AWS_BUCKET'), 'url' => env('AWS_URL'), 'endpoint' => env('AWS_ENDPOINT'), + 'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false), ], 'spaces' => [ diff --git a/config/instance.php b/config/instance.php index de58147f..70fd6c26 100644 --- a/config/instance.php +++ b/config/instance.php @@ -10,9 +10,6 @@ return [ ], 'discover' => [ - 'loops' => [ - 'enabled' => env('EXP_LOOPS', false), - ], 'tags' => [ 'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false) ], @@ -53,4 +50,4 @@ return [ 'enabled' => env('RESTRICTED_INSTANCE', false), 'level' => 1 ] -]; \ No newline at end of file +]; diff --git a/config/media.php b/config/media.php index 21ce50a5..bd392998 100644 --- a/config/media.php +++ b/config/media.php @@ -3,13 +3,5 @@ return [ 'exif' => [ 'database' => env('MEDIA_EXIF_DATABASE', false), - 'strip' => true ], - 'types' => env('MEDIA_TYPES', 'image/jpeg,image/png,image/gif'), - 'photo' => [ - 'optimize' => env('PF_OPTIMIZE_IMAGES', true), - 'quality' => (int) env('IMAGE_QUALITY', 80), - 'max_size' => env('MAX_PHOTO_SIZE', 15000), - 'max_album_length' => env('MAX_ALBUM_LENGTH', 4), - ], -]; \ No newline at end of file +]; diff --git a/config/pixelfed.php b/config/pixelfed.php index a091d6cd..215cc7a1 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -34,7 +34,7 @@ return [ | */ 'nodeinfo' => [ - 'url' => config('app.url').'/'.'api/nodeinfo/2.0.json', + 'url' => config('app.url').'/api/nodeinfo/2.0.json', ], /* @@ -58,17 +58,6 @@ return [ */ 'open_registration' => env('OPEN_REGISTRATION', true), - /* - |-------------------------------------------------------------------------- - | ActivityPub - |-------------------------------------------------------------------------- - | - */ - 'activitypub_enabled' => env('ACTIVITY_PUB', false), - 'ap_delivery_timeout' => env('ACTIVITYPUB_DELIVERY_TIMEOUT', 2.0), - 'ap_delivery_concurrency' => env('ACTIVITYPUB_DELIVERY_CONCURRENCY', 10), - 'remote_follow_enabled' => false, - /* |-------------------------------------------------------------------------- | Account file size limit @@ -257,13 +246,7 @@ return [ 'oauth_enabled' => env('OAUTH_ENABLED', false), - 'sanitizer' => [ - 'restrict_html_types' => env('RESTRICT_HTML_TYPES', true) - ], - 'admin' => [ 'env_editor' => env('ADMIN_ENV_EDITOR', false) ], - - 'links_per_post' => env('MAX_LINKS_PER_POST', 0) ]; diff --git a/config/routes.php b/config/routes.php index ab355cf2..ce206794 100644 --- a/config/routes.php +++ b/config/routes.php @@ -1,16 +1,8 @@ [ - 'base' => config('app.url').'/api/1/', - 'sharedInbox' => config('app.url').'/api/sharedInbox', - 'search' => config('app.url').env('MIX_API_SEARCH'), - ], - 'hashtag' => [ 'base' => config('app.url').'/discover/tags/', 'search' => config('app.url').'/discover/tags/', ], - ]; diff --git a/resources/assets/sass/custom.scss b/resources/assets/sass/custom.scss index 51fa67fb..629f2370 100644 --- a/resources/assets/sass/custom.scss +++ b/resources/assets/sass/custom.scss @@ -46,9 +46,6 @@ body, button, input, textarea { opacity: .4; } -.card.status-container { -} - .card-img-top { height: auto; } @@ -240,7 +237,6 @@ body, button, input, textarea { 100% { transform:rotate(1turn); top: 2.5rem; - left: 0em; font-size:0; left: 0.9rem } @@ -528,7 +524,7 @@ details summary::-webkit-details-marker { .text-lighter { color:#B8C2CC !important; -} +} .btn-outline-lighter { color: #B8C2CC !important; @@ -565,4 +561,4 @@ details summary::-webkit-details-marker { .status-content > p:first-child { display: inline; -} \ No newline at end of file +} diff --git a/resources/assets/sass/landing/carousel.scss b/resources/assets/sass/landing/carousel.scss index 13e3bb4d..eb1df13e 100644 --- a/resources/assets/sass/landing/carousel.scss +++ b/resources/assets/sass/landing/carousel.scss @@ -77,9 +77,7 @@ #iosDevice img { position:absolute; left:0; -} -#iosDevice img { -webkit-animation-name: iosDeviceCarousel; -webkit-animation-timing-function: ease-in-out; -webkit-animation-iteration-count: infinite; @@ -123,4 +121,4 @@ -moz-animation-delay: 0; -o-animation-delay: 0; animation-delay: 0; -} \ No newline at end of file +} diff --git a/resources/assets/sass/moment.scss b/resources/assets/sass/moment.scss index 0d642d1f..95c6adcb 100644 --- a/resources/assets/sass/moment.scss +++ b/resources/assets/sass/moment.scss @@ -1,4 +1,4 @@ -/* +/* red */ .bg-moment-passion { @@ -7,7 +7,7 @@ background: linear-gradient(to left, #e35d5b, #e53935); } -/* +/* teal/purple */ .bg-moment-azure { @@ -79,7 +79,7 @@ background: linear-gradient(to left, #734b6d, #42275a); } -/* +/* purple */ .bg-moment-argon { @@ -95,4 +95,4 @@ background: #141E30; background: -webkit-linear-gradient(to left, #243B55, #141E30); background: linear-gradient(to left, #243B55, #141E30); -} \ No newline at end of file +} diff --git a/resources/lang/ca/passwords.php b/resources/lang/ca/passwords.php index d8d75f76..eb8aac15 100644 --- a/resources/lang/ca/passwords.php +++ b/resources/lang/ca/passwords.php @@ -11,7 +11,7 @@ return [ | */ 'password' => 'Cal que la contrasenya sigui d\'un mínim de sis caràcters i que coincideixi amb la confirmació.', - 'reset' => 'S'ha reinicialitzat la vostra contrasenya!', + 'reset' => 'S\'ha reinicialitzat la vostra contrasenya!', 'sent' => 'Si la vostra adreça electrònica existeix a la nostra base de dades, en breus minuts rebreu un enllaç de recuperació a la vostra bústia. Si us plau, si no rebeu el missatge, comproveu la bústia de correu brossa.', 'token' => 'Aquest testimoni (token) de reinicialització de la contrasenya no és vàlid.', 'user' => 'Si la vostra adreça electrònica existeix a la nostra base de dades, en breus minuts rebreu un enllaç de recuperació a la vostra bústia. Si us plau, si no rebeu el missatge, comproveu la bústia de correu brossa.',