Merge 'bagisto-master' into admin-backend/keep-search-terms-after-new-page-load

packages/Webkul/SocialLogin/src/Database/Migrations/2020_06_25_162340_change_email_password_columns_in_customers_table.php

@@ -14,7 +14,7 @@ class ChangeEmailPasswordColumnsInCustomersTable extends Migration
     public function up()
     {
         Schema::table('customers', function (Blueprint $table) {
-            $table->string('email')->unique()->nullable()->change();
+            $table->string('email')->nullable()->change();
             $table->string('password')->nullable()->change();
         });
     }
@@ -27,7 +27,7 @@ class ChangeEmailPasswordColumnsInCustomersTable extends Migration
     public function down()
     {
         Schema::table('customers', function (Blueprint $table) {
-            $table->string('email')->unique()->nullable(false)->change();
+            $table->string('email')->nullable(false)->change();
             $table->string('password')->nullable(false)->change();
         });
     }

packages/Webkul/Ui/src/Resources/lang/pl/app.php

@@ -31,7 +31,7 @@ return [
         'true' => 'Prawda / Aktywy',
         'false' => 'Fałsz / Nie aktywny',
         'between' => 'Jest pomiędzy',
-        'apply' => Zastosuj',
+        'apply' => 'Zastosuj',
         'items-per-page' => 'Przedmioty na stronę',
         'value-here' => 'Wartość tutaj',
         'numeric-value-here' => 'wartość liczbowa tutaj',

packages/Webkul/Velocity/publishable/assets/mix-manifest.json

@@ -1,5 +1,5 @@
 {
     "/js/velocity.js": "/js/velocity.js?id=226121407d7f6a559c67",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
-    "/css/velocity.css": "/css/velocity.css?id=f2ce483a21b83460e74f"
+    "/css/velocity.css": "/css/velocity.css?id=91aa43446b2111505847"
 }

packages/Webkul/Velocity/src/Resources/assets/sass/components/rtl.scss

@@ -449,6 +449,13 @@ body {
                     }
                 }
             }
+
+            .velocity-divide-page {
+                .left {
+                    right: 0;
+                    width: 200px;
+                }
+            }
         }
     }
 }