Merged in feature/HOR-4508 (pull request #6649)

HOR-4508 Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-11-12 17:42:09 +00:00
parent 27a71416c7 54225f9df7
commit 9b3d936e65
28 changed files with 831 additions and 99 deletions
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -66,7 +66,10 @@ class System
        'logging_level' => 'INFO',
        'smtp_timeout' => 20,
        'google_map_api_key' => '',
-        'google_map_signature' => ''
+        'google_map_signature' => '',
+        'logging_level' => 'INFO', 
+        'upload_attempts_limit_per_user' => '60,1',
+        'files_white_list' => ''
    );

    /**