Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json

Author: snipe

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.0.4',
-  'full_app_version' => 'v8.0.4 - build 17704-g0dcb315d9',
-  'build_version' => '17704',
+  'app_version' => 'v8.1.0',
+  'full_app_version' => 'v8.1.0 - build 17855-gd81788345',
+  'build_version' => '17855',
   'prerelease_version' => '',
-  'hash_version' => 'g0dcb315d9',
-  'full_hash' => 'v8.0.4-506-g0dcb315d9',
+  'hash_version' => 'gd81788345',
+  'full_hash' => 'v8.1.0-657-gd81788345',
   'branch' => 'master',
 );

public/css/build/app.css

@@ -2,8 +2,8 @@
     "/js/build/app.js": "/js/build/app.js?id=f69d05a80165b5bbf6b0f4691edfd24e",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=d34ae2483cbe2c77478c45f4006eba55",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=6bf62cdec2477f3176df196fd0c99662",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=1956dacae986380f376eb30f849d899a",
-    "/css/build/app.css": "/css/build/app.css?id=adad39d650ea189b9a44f8d07df73761",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=4db745985e0eef8cd209114c605b552f",
+    "/css/build/app.css": "/css/build/app.css?id=d1fe702237ab0106011dd7c51be0ceb2",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=a67bd93bed52e6a29967fe472de66d6c",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=53edc92eb2d272744bc7404ec259930e",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=091d9625203be910caca3e229afe438f",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=18787b3f00a3be7be38ee4e26cbd2a07",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/all.css": "/css/dist/all.css?id=15fe3863037f44de1c50c30748d0bc09",
+    "/css/dist/all.css": "/css/dist/all.css?id=850d7cc68e3bdeb8436d71453fb7ea0f",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

public/css/build/overrides.css

@@ -1199,7 +1199,12 @@ legend.highlight {
 
   color: #fff;
   font-size: 18px;
-  padding: 6px;
+  padding: 6px 6px 6px 10px;
+}
+
+legend.highlight a {
+  color: #fff;
+  cursor: pointer;
 }
 
 fieldset.bottom-padded {

public/css/dist/all.css

@@ -5,7 +5,7 @@
     'manage'                    => 'crwdns6501:0crwdne6501:0',
     'field'		                => 'crwdns1487:0crwdne1487:0',
     'about_fieldsets_title'		=> 'crwdns1488:0crwdne1488:0',
-    'about_fieldsets_text'		=> 'crwdns13148:0crwdne13148:0',
+    'about_fieldsets_text'		=> 'crwdns13176:0crwdne13176:0',
     'custom_format'             => 'crwdns6505:0crwdne6505:0',
     'encrypt_field'      	        => 'crwdns1792:0crwdne1792:0',
     'encrypt_field_help'      => 'crwdns1683:0crwdne1683:0',

public/mix-manifest.json

@@ -58,6 +58,7 @@
     'asset_not_deployable_checkin' => 'crwdns12752:0crwdne12752:0',
     'asset_deployable' => 'crwdns12945:0crwdne12945:0',
     'processing_spinner' => 'crwdns11515:0crwdne11515:0',
+    'processing' => 'crwdns13210:0crwdne13210:0',
     'optional_infos'  => 'crwdns10490:0crwdne10490:0',
     'order_details'   => 'crwdns10492:0crwdne10492:0',
     'calc_eol'    => 'crwdns12782:0crwdne12782:0',

resources/assets/less/overrides.less

@@ -25,7 +25,7 @@
     'audit_interval_help'       => 'crwdns11201:0crwdne11201:0',
     'audit_warning_days'        => 'crwdns1910:0crwdne1910:0',
     'audit_warning_days_help'   => 'crwdns1911:0crwdne1911:0',
-    'auto_increment_assets'		=> 'crwdns13154:0crwdne13154:0',
+    'auto_increment_assets'		=> 'crwdns13178:0crwdne13178:0',
     'auto_increment_prefix'		=> 'crwdns1148:0crwdne1148:0',
     'auto_incrementing_help'    => 'crwdns6323:0crwdne6323:0',
     'backups'					=> 'crwdns1331:0crwdne1331:0',
@@ -151,7 +151,8 @@
     'full_multiple_companies_support_help_text' => 'crwdns1464:0crwdne1464:0',
     'full_multiple_companies_support_text' => 'crwdns1465:0crwdne1465:0',
     'scope_locations_fmcs_support_text'  => 'crwdns13049:0crwdne13049:0',
-    'scope_locations_fmcs_support_help_text'  => 'crwdns13142:0crwdne13142:0',
+    'scope_locations_fmcs_support_help_text'  => 'crwdns13188:0crwdne13188:0',
+    'scope_locations_fmcs_support_disabled_text'  => 'crwdns13190:0crwdne13190:0',
     'show_in_model_list'   => 'crwdns1990:0crwdne1990:0',
     'optional'					=> 'crwdns1298:0crwdne1298:0',
     'per_page'                  => 'crwdns832:0crwdne832:0',
@@ -451,6 +452,24 @@
     ],
 
 
+    'legends' => [
+        'scoping' => 'crwdns13192:0crwdne13192:0',
+        'formats' => 'crwdns13194:0crwdne13194:0',
+        'profiles' => 'crwdns13196:0crwdne13196:0',
+        'eula' => 'crwdns13224:0crwdne13224:0',
+        'misc_display' => 'crwdns13200:0crwdne13200:0',
+        'email' => 'crwdns13202:0crwdne13202:0',
+        'checkin' => 'crwdns13204:0crwdne13204:0',
+        'dashboard' => 'crwdns13206:0crwdne13206:0',
+        'misc' => 'crwdns13208:0crwdne13208:0',
+        'logos' => 'crwdns13212:0crwdne13212:0',
+        'colors' => 'crwdns13214:0crwdne13214:0',
+        'footer' => 'crwdns13216:0crwdne13216:0',
+        'security' => 'crwdns13218:0crwdne13218:0',
+        'general' => 'crwdns13220:0crwdne13220:0',
+        'intervals' => 'crwdns13222:0crwdne13222:0',
+    ],
+
 
     /* Keywords for settings overview help */
     'keywords' => [

resources/lang/aa-ER/admin/custom_fields/general.php

@@ -614,4 +614,13 @@
     'cost_each' => 'crwdns12983:0crwdne12983:0',
     'remove_current_image' => 'crwdns13089:0crwdne13089:0',
 
+    'seeding' => [
+        'manufacturers' => [
+            'button' => 'crwdns13180:0crwdne13180:0',
+            'prompt' => 'crwdns13182:0crwdne13182:0',
+            'success' => 'crwdns13184:0crwdne13184:0',
+            'error' => 'crwdns13186:0crwdne13186:0',
+        ],
+    ],
+
 ];