Merge remote-tracking branch 'origin/develop'

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -48,6 +48,7 @@ If applicable, add screenshots to help explain your problem.
 - Any errors that appear in your browser's error console.
 - Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
 - Include any additional information you can find in `storage/logs` and your webserver's logs.
+- Include the output from `php -m` (this should display what modules you have enabled.)
 
 **Additional context**
 - Is this a fresh install or an upgrade? 

app/Console/Commands/LdapSync.php

@@ -108,7 +108,7 @@ class LdapSync extends Command
      */
     public function handle()
     {
-        ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
+        ini_set('max_execution_time', env('LDAP_TIME_LIM', "600")); //600 seconds = 10 minutes
         ini_set('memory_limit', '500M');
         $old_error_reporting = error_reporting(); // grab old error_reporting .ini setting, for later re-enablement
         error_reporting($old_error_reporting & ~E_DEPRECATED); // disable deprecation warnings, for LDAP in PHP 7.4 (and greater)

crowdin.yml

@@ -1,3 +1,8 @@
-files:
+"commit_message": "Fixed: New translations %original_file_name% from Crowdin"
-  - source: /resources/lang/en/**/*.php
+
-    translation: '**/%original_file_name%'
+"files": [
+  {
+    "source" : "/resources/lang/en/**/*.php",
+    "translation" : "/resources/lang/%locale%/%original_file_name%"
+  }
+]

resources/views/partials/bootstrap-table.blade.php

@@ -17,6 +17,16 @@
             stickyHeaderOffsetY += +$('.navbar-fixed-top').css('margin-bottom').replace('px','');
         }
 
+        var blockedFields = "searchable,sortable,switchable,title,visible,formatter,class".split(",");
+
+        var keyBlocked = function(key) {
+            for(var j in blockedFields) {
+                if(key === blockedFields[j]) {
+                    return true;
+                }
+            }
+            return false;
+        }
 
         $('.snipe-table').bootstrapTable('destroy').bootstrapTable({
             classes: 'table table-responsive table-no-bordered',
@@ -42,6 +52,15 @@
             pageList: ['10','20', '30','50','100','150','200', '500'],
             pageSize: {{  (($snipeSettings->per_page!='') && ($snipeSettings->per_page > 0)) ? $snipeSettings->per_page : 20 }},
             paginationVAlign: 'both',
+            queryParams: function (params) {
+                var newParams = {};
+                for(var i in params) {
+                    if(!keyBlocked(i)) { // only send the field if it's not in blockedFields
+                        newParams[i] = params[i];
+                    }
+                }
+                return newParams;
+            },
             formatLoadingMessage: function () {
                 return '<h2><i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading... please wait.... </h4>';
             },