fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in julceslau/processmaker/HOR-963 (pull request #4209)

Browse Source 
HOR-963
This commit is contained in:
David Callizaya
2016-05-09 18:20:28 -04:00
parent 689a17fe4e 540edf42fe
commit bce70047f5
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/content/languages/translation.en
View File

File diff suppressed because one or more lines are too long

8
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -14566,8 +14566,8 @@ msgstr "Failure to do so could lead your ProcessMaker installation not functioni
# TRANSLATION # TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP # LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_PHP
msgid "PHP Version >= 5.2.10" msgid "PHP Version >= 5.5.33"
msgstr "PHP Version >= 5.2.10" msgstr "PHP Version >= 5.5.33"
# TRANSLATION # TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_MYSQL # LABEL/ID_PROCESSMAKER_REQUIREMENTS_MYSQL
@@ -14626,8 +14626,8 @@ msgstr "LDAP Support (*)"
# TRANSLATION # TRANSLATION
# LABEL/ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT # LABEL/ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT
#: LABEL/ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT #: LABEL/ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT
msgid "Memory Limit >= 80M" msgid "Memory Limit >= 256M"
msgstr "Memory Limit >= 80M" msgstr "Memory Limit >= 256M"
# TRANSLATION # TRANSLATION
# LABEL/ID_ADMINISTRATOR_ROLE_CANT_CHANGED # LABEL/ID_ADMINISTRATOR_ROLE_CANT_CHANGED

4
workflow/engine/controllers/installer.php
View File

@@ -130,7 +130,7 @@ class Installer extends Controller
$info->memory = new stdclass(); $info->memory = new stdclass();
$info->php->version = phpversion(); $info->php->version = phpversion();
$info->php->result = version_compare(phpversion(), '5.2.10') >= 0 ? true : false; $info->php->result = version_compare(phpversion(), '5.5.33') >= 0 ? true : false;
// MYSQL info and verification // MYSQL info and verification
$info->mysql->result = false; $info->mysql->result = false;
@@ -216,7 +216,7 @@ class Installer extends Controller
// memory limit verification // memory limit verification
$memory = (int) ini_get( "memory_limit" ); $memory = (int) ini_get( "memory_limit" );
$info->memory->version = $memory . 'M'; $info->memory->version = $memory . 'M';
if ($memory > 80) { if ($memory > 255) {
$info->memory->result = true; $info->memory->result = true;
} else { } else {
$info->memory->result = false; $info->memory->result = false;

4
workflow/engine/data/mssql/insert.sql
View File

@@ -6310,7 +6310,7 @@ SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these
UNION ALL UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16' SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16'
UNION ALL UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.2.10','2014-01-15' SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.5.33','2014-01-15'
UNION ALL UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15' SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15'
UNION ALL UNION ALL
@@ -6330,7 +6330,7 @@ SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_SOAP','en','Soap Support','2014-01-
UNION ALL UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_LDAP','en','LDAP Support (*)','2014-01-15' SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_LDAP','en','LDAP Support (*)','2014-01-15'
UNION ALL UNION ALL
SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT','en','Memory Limit >= 80M','2014-01-15' SELECT 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT','en','Memory Limit >= 256M','2014-01-15'
UNION ALL UNION ALL
SELECT 'LABEL','ID_ADMINISTRATOR_ROLE_CANT_CHANGED','en','The role of the administrator can not be changed!','2014-10-21' SELECT 'LABEL','ID_ADMINISTRATOR_ROLE_CANT_CHANGED','en','The role of the administrator can not be changed!','2014-10-21'
UNION ALL UNION ALL

4
workflow/engine/data/mysql/insert.sql
View File

@@ -3895,7 +3895,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') , ( 'LABEL','ID_CHECK_AGAIN','en','Check again','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.<br />','2015-04-07') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION','en','If any of these items are not supported (marked as No), then please take actions to correct them.<br />','2015-04-07') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_DESCRIPTION2','en','Failure to do so could lead your ProcessMaker installation not functioning correctly!<br />','2015-01-16') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.2.10','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_PHP','en','PHP Version >= 5.5.33','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MYSQL','en','MySQL Support','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MSSQL','en','MSSQL Support (*)','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MSSQL','en','MSSQL Support (*)','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_CURL','en','cURL Version','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_CURL','en','cURL Version','2014-01-15') ,
@@ -3905,7 +3905,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MULTIBYTESTRING','en','Multibyte Strings Support','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MULTIBYTESTRING','en','Multibyte Strings Support','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_SOAP','en','Soap Support','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_SOAP','en','Soap Support','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_LDAP','en','LDAP Support (*)','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_LDAP','en','LDAP Support (*)','2014-01-15') ,
( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT','en','Memory Limit >= 80M','2014-01-15') , ( 'LABEL','ID_PROCESSMAKER_REQUIREMENTS_MEMORYLIMIT','en','Memory Limit >= 256M','2014-01-15') ,
( 'LABEL','ID_ADMINISTRATOR_ROLE_CANT_CHANGED','en','The role of the administrator can not be changed!','2014-10-21') , ( 'LABEL','ID_ADMINISTRATOR_ROLE_CANT_CHANGED','en','The role of the administrator can not be changed!','2014-10-21') ,
( 'LABEL','ID_CONFIRM_IMPORT_DYNAFORM','en','If the selected form is imported, you may lose the information in the current form. Are you sure you want to import the form?','2015-01-16') , ( 'LABEL','ID_CONFIRM_IMPORT_DYNAFORM','en','If the selected form is imported, you may lose the information in the current form. Are you sure you want to import the form?','2015-01-16') ,
( 'LABEL','ID_CASESLIST_FIELD_RESET','en','Restart everything with the system fields','2014-01-15') , ( 'LABEL','ID_CASESLIST_FIELD_RESET','en','Restart everything with the system fields','2014-01-15') ,