Merge pull request #2979 from pixelfed/staging

Staging

SECURITY.md

@@ -0,0 +1,3 @@
+## Reporting a Vulnerability
+
+If you discover any security related issues, please email hello@pixelfed.org instead of using the issue tracker.

app/Console/Commands/ImportCities.php

@@ -65,7 +65,6 @@ class ImportCities extends Command
     public function __construct()
     {
         parent::__construct();
-        ini_set('memory_limit', '256M');
     }
 
     /**
@@ -75,6 +74,8 @@ class ImportCities extends Command
      */
     public function handle()
     {
+        $old_memory_limit = ini_get('memory_limit');
+        ini_set('memory_limit', '256M');
         $path = storage_path('app/cities.json');
 
         if(hash_file('sha512', $path) !== self::CHECKSUM) {
@@ -136,6 +137,7 @@ class ImportCities extends Command
         $this->line('');
         $this->info('Successfully imported ' . $cityCount . ' entries!');
         $this->line('');
+        ini_set('memory_limit', $old_memory_limit);
         return;
     }
 

app/Http/Controllers/Auth/RegisterController.php

@@ -76,7 +76,7 @@ class RegisterController extends Controller
 					return $fail('Username is invalid. Can only contain one dash (-), period (.) or underscore (_).');
 				}
 
-				if (!ctype_alpha($value[0])) {
+				if (!ctype_alnum($value[0])) {
 					return $fail('Username is invalid. Must start with a letter or number.');
 				}
 

docker-compose.yml

@@ -24,6 +24,7 @@ services:
     volumes:
       - app-storage:/var/www/storage
       - app-bootstrap:/var/www/bootstrap
+      - "./.env.docker:/var/www/.env"
     networks:
       - external
       - internal

resources/assets/js/components/Timeline.vue

@@ -321,7 +321,7 @@
 									<a href="/site/terms" class="text-lighter pr-2">Terms</a>
 								</p>
 								<p class="mb-0 text-uppercase text-muted small">
-									<a href="http://pixelfed.org" class="text-lighter" rel="noopener" title="" data-toggle="tooltip">Powered by Pixelfed</a>
+									<a href="https://pixelfed.org" class="text-lighter" rel="noopener" title="" data-toggle="tooltip">Powered by Pixelfed</a>
 								</p>
 							</div>
 						</footer>

resources/lang/cs/exception.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+	'compose' => [
+		'invalid' => [
+			'album' => 'Musí obsahovat samostatnou fotografii, video nebo více fotografií.',
+		],
+	],
+
+];

resources/lang/cs/helpcenter.php

@@ -23,4 +23,6 @@ return [
 	'reportSomething' => 'Nahlašování',
 	'dataPolicy' => 'Politika dat'
 
+	'taggingPeople' => 'Označování lidí'
+
 ];

resources/lang/cs/navmenu.php

@@ -1,13 +1,13 @@
 <?php
 
 return [
-
 	'search'			=> 'Hledat',
 	'home'				=> 'Domů',
 	'local'				=> 'Místní',
 	'network'			=> 'Síť',
 	'discover'			=> 'Objevovat',
 	'viewMyProfile'		=> 'Zobrazit můj profil',
+	'myProfile'			=> 'Můj profil',
 	'myTimeline'		=> 'Moje časová osa',
 	'publicTimeline'	=> 'Veřejná časová osa',
 	'remoteFollow'		=> 'Vzdálené sledování',
@@ -15,5 +15,5 @@ return [
 	'admin'				=> 'Administrace',
 	'logout'			=> 'Odhlásit',
 	'directMessages'	=> 'Přímé zprávy',
-
+	'composePost'		=> 'Vytvořit příspěvek',
 ];

resources/views/site/index.blade.php

@@ -116,7 +116,7 @@
 										@endif
 										<div class="form-group row mb-0">
 											<div class="col-md-12">
-												<button type="submit" class="btn btn-primary btn-block py-0 font-weight-bold text-uppercase">
+												<button type="submit" class="btn btn-primary btn-block btn-lg font-weight-bold text-uppercase">
 													{{ __('Login') }}
 												</button>
 
@@ -127,7 +127,7 @@
 							</div>
 						</div>
 						<div class="card shadow-none border card-body">
-							<p class="text-center mb-0 font-weight-bold small">
+							<p class="text-center mb-0 font-weight-bold">
 								@if(config_cache('pixelfed.open_registration'))
 								<a href="/register">Register</a>
 								<span class="px-1">·</span>