Merge remote-tracking branch 'origin/v2' into oasis

# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php

database/factories/ShareFactory.php

@@ -30,7 +30,7 @@ class ShareFactory extends Factory
             'type'         => $this->faker->randomElement(['file', 'folder']),
             'permission'   => $this->faker->randomElement(['visitor', 'editor']),
             'is_protected' => $this->faker->boolean(20),
-            'password'     => \Hash::make('secret'),
+            'password'     => bcrypt('secret'),
             'expire_in'    => $this->faker->randomElement([1, 6, 12, 24]),
         ];
     }

database/factories/UserFactory.php

@@ -4,7 +4,6 @@ namespace Database\Factories;
 
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
 class UserFactory extends Factory
@@ -29,7 +28,7 @@ class UserFactory extends Factory
             ),
             'email'             => $this->faker->unique()->safeEmail,
             'email_verified_at' => now(),
-            'password'          => Hash::make('secret'),
+            'password'          => bcrypt('secret'),
             'remember_token'    => Str::random(10),
             'created_at'        => $this->faker->dateTimeBetween(
                 $startDate = '-36 months', $endDate = 'now', $timezone = null

database/migrations/2021_01_09_130434_create_languages_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateLanguagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('languages', function (Blueprint $table) {
+            $table->uuid('id')->primary()->index();
+            $table->string('name');
+            $table->string('locale')->unique();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('languages');
+    }
+}

database/migrations/2021_01_09_152048_create_language_strings.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateLanguageStrings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('language_translations', function (Blueprint $table) {
+            $table->string('key');
+            $table->longText('value');
+            $table->string('lang');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('language_translations');
+    }
+}