mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #3502 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2022-05-21 00:00:19 -06:00 committed by GitHub
parent 0b16a79fcc ba77c150fe
commit b3e363d287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 12372 additions and 10961 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -20,7 +20,7 @@ DB_PASSWORD=pixelfed
BROADCAST_DRIVER=log
CACHE_DRIVER=redis
SESSION_DRIVER=redis
SESSION_DRIVER=database
QUEUE_DRIVER=redis
HORIZON_PREFIX="horizon-"

2
app/Http/Controllers/InstallController.php
View File

@ -40,7 +40,7 @@ class InstallController extends Controller
$reqs['php'] = [
'version' => PHP_VERSION,
'supported' => (bool) version_compare(PHP_VERSION, 7.4),
'supported' => (bool) version_compare(PHP_VERSION, '7.4'),
'min_version' => '7.4',
'memory_limit' => [
'recommended' => '256M',

4
app/Http/Controllers/Settings/LabsSettings.php
View File

@ -36,7 +36,7 @@ trait LabsSettings {
$cookie = Cookie::forget('dark-mode');
if($request->has('dark_mode')) {
if($request->dark_mode == 'on') {
$cookie = Cookie::make('dark-mode', true, 43800);
$cookie = Cookie::make('dark-mode', 'true', 43800);
}
}
@ -93,4 +93,4 @@ trait LabsSettings {
'royal'
];
}
}
}

2
app/Http/Controllers/SettingsController.php
View File

@ -163,7 +163,7 @@ class SettingsController extends Controller
$mode = $request->input('mode');
if($mode == 'dark') {
$cookie = Cookie::make('dark-mode', true, 43800);
$cookie = Cookie::make('dark-mode', 'true', 43800);
} else {
$cookie = Cookie::forget('dark-mode');
}

8
app/Http/Controllers/SpaController.php
View File

@ -82,18 +82,18 @@ class SpaController extends Controller
return ['language' => $lang];
}
public function getPrivacy()
public function getPrivacy(Request $request)
{
abort_unless($req->user(), 404);
abort_unless($request->user(), 404);
$body = $this->markdownToHtml('views/page/privacy.md');
return [
'body' => $body
];
}
public function getTerms()
public function getTerms(Request $request)
{
abort_unless($req->user(), 404);
abort_unless($request->user(), 404);
$body = $this->markdownToHtml('views/page/terms.md');
return [
'body' => $body

4
app/Transformer/Api/MediaDraftTransformer.php
View File

@ -13,9 +13,9 @@ class MediaDraftTransformer extends Fractal\TransformerAbstract
return [
'id' => (string) $media->id,
'type' => $media->activityVerb(),
'url' => $url,
'url' => $media->url(),
'remote_url' => null,
'preview_url' => $url,
'preview_url' => $media->thumbnailUrl(),
'text_url' => null,
'meta' => null,
'description' => $media->caption,

2
app/Transformer/Api/ResultsTransformer.php
View File

@ -36,7 +36,7 @@ class ResultsTransformer extends Fractal\TransformerAbstract
public function includeTags($results)
{
$hashtags = $status->hashtags;
$hashtags = $results->hashtags;
return $this->collection($hashtags, new HashtagTransformer());
}
}

2
composer.json
View File

@ -14,7 +14,7 @@
"ext-mbstring": "*",
"ext-openssl": "*",
"bacon/bacon-qr-code": "^2.0.3",
"brick/math": "^0.8",
"brick/math": "^0.9.3",
"buzz/laravel-h-captcha": "1.0.2",
"doctrine/dbal": "^2.7",
"fideloper/proxy": "^4.0",

11684
composer.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

97
config/self-diagnosis.php
View File

@ -1,97 +0,0 @@
<?php
return [
/*
* A list of environment aliases mapped to the actual environment configuration.
*/
'environment_aliases' => [
'prod' => 'production',
'live' => 'production',
'local' => 'development',
],
/*
* Common checks that will be performed on all environments.
*/
'checks' => [
\BeyondCode\SelfDiagnosis\Checks\AppKeyIsSet::class,
\BeyondCode\SelfDiagnosis\Checks\CorrectPhpVersionIsInstalled::class,
\BeyondCode\SelfDiagnosis\Checks\DatabaseCanBeAccessed::class => [
'default_connection' => true,
'connections' => [],
],
\BeyondCode\SelfDiagnosis\Checks\DirectoriesHaveCorrectPermissions::class => [
'directories' => [
storage_path(),
base_path('bootstrap/cache'),
],
],
\BeyondCode\SelfDiagnosis\Checks\EnvFileExists::class,
\BeyondCode\SelfDiagnosis\Checks\MaintenanceModeNotEnabled::class,
\BeyondCode\SelfDiagnosis\Checks\MigrationsAreUpToDate::class,
\BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreInstalled::class => [
'extensions' => [
'openssl',
'PDO',
'mbstring',
'tokenizer',
'xml',
'ctype',
'json',
'redis',
'bcmath',
'curl',
'exif',
'iconv',
'intl',
'zip'
],
'include_composer_extensions' => true,
],
\BeyondCode\SelfDiagnosis\Checks\RedisCanBeAccessed::class => [
'default_connection' => false,
'connections' => [],
],
\BeyondCode\SelfDiagnosis\Checks\StorageDirectoryIsLinked::class,
],
/*
* Environment specific checks that will only be performed for the corresponding environment.
*/
'environment_checks' => [
'development' => [
\BeyondCode\SelfDiagnosis\Checks\ComposerWithDevDependenciesIsUpToDate::class,
\BeyondCode\SelfDiagnosis\Checks\ConfigurationIsNotCached::class,
\BeyondCode\SelfDiagnosis\Checks\RoutesAreNotCached::class,
\BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreUpToDate::class,
],
'production' => [
\BeyondCode\SelfDiagnosis\Checks\ComposerWithoutDevDependenciesIsUpToDate::class,
\BeyondCode\SelfDiagnosis\Checks\ConfigurationIsCached::class,
\BeyondCode\SelfDiagnosis\Checks\DebugModeIsNotEnabled::class,
\BeyondCode\SelfDiagnosis\Checks\PhpExtensionsAreDisabled::class => [
'extensions' => [
'xdebug',
],
],
\BeyondCode\SelfDiagnosis\Checks\RoutesAreCached::class,
//\BeyondCode\SelfDiagnosis\Checks\ServersArePingable::class => [
// 'servers' => [
// 'www.google.com',
// ['host' => 'www.google.com', 'port' => 8080],
// '8.8.8.8',
// ['host' => '8.8.8.8', 'port' => 8080, 'timeout' => 5],
// ],
//],
//\BeyondCode\SelfDiagnosis\Checks\SupervisorProgramsAreRunning::class => [
// 'programs' => [
// 'horizon',
// ],
// 'restarted_within' => 300,
//],
//\BeyondCode\SelfDiagnosis\Checks\HorizonIsRunning::class,
],
],
];

11506
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

20
package.json
View File

@ -9,7 +9,7 @@
"production": "mix --production"
},
"devDependencies": {
"acorn": "^8.0.0",
"acorn": "^8.7.1",
"axios": "^0.21.1",
"bootstrap": "^4.5.2",
"cross-env": "^5.2.1",
@ -17,34 +17,36 @@
"lodash": "^4.17.21",
"popper.js": "^1.16.1",
"resolve-url-loader": "^5.0.0",
"sass": "^1.49.8",
"sass": "^1.52.1",
"sass-loader": "^7.3.1",
"vue": "^2.6.14",
"vue-loader": "^15.9.8",
"vue-masonry-css": "^1.0.3",
"vue-router": "^3.5.1",
"vue-router": "^3.5.4",
"vue-template-compiler": "^2.6.11",
"vuex": "^3.6.2",
"vuex-router-sync": "^5.0.0",
"webpack": "^5.69.1",
"webpack": "^5.72.1",
"webpack-cli": "^4.9.2"
},
"dependencies": {
"@fancyapps/fancybox": "^3.5.7",
"@trevoreyre/autocomplete-vue": "^2.2.0",
"animate.css": "^4.1.0",
"bigpicture": "^2.6.1",
"bigpicture": "^2.6.2",
"blurhash": "^1.1.3",
"bootstrap-vue": "^2.16.0",
"bootstrap-vue": "^2.22.0",
"chart.js": "^2.7.2",
"filesize": "^3.6.1",
"hls.js": "^1.1.5",
"howler": "^2.2.0",
"infinite-scroll": "^3.0.6",
"jquery-scroll-lock": "^3.1.3",
"jquery.scrollbar": "^0.2.11",
"js-cookie": "^2.2.0",
"laravel-echo": "^1.8.1",
"laravel-mix": "^6.0.42",
"laravel-echo": "^1.11.7",
"laravel-mix": "^6.0.43",
"plyr": "^3.7.2",
"promise-polyfill": "8.1.0",
"readmore-js": "^2.2.1",
"sweetalert": "^2.1.2",
@ -54,7 +56,7 @@
"vue-carousel": "^0.18.0",
"vue-content-loader": "^0.2.3",
"vue-cropperjs": "^4.1.0",
"vue-i18n": "^8.26.7",
"vue-i18n": "^8.27.1",
"vue-infinite-loading": "^2.4.5",
"vue-intersect": "^1.1.6",
"vue-loading-overlay": "^3.3.3",