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

fix merge conflict

Browse Source 
fix merge conflict 5

fix tag label

fix CR notes

fix filtes conbined
This commit is contained in:
Rodrigo Quelca
2021-07-14 14:21:28 +00:00
parent d4adc42138
commit 6829c1ab3a
14 changed files with 437 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57318,8 +57318,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_BUY_NOW','en','Buy now','2014-09-18') ,
( 'LABEL','ID_BY_CASE_NUMBER','en','By Case #','2020-12-16') ,
( 'LABEL','ID_BY_CASE_TITLE','en','By Case Title','2020-12-16') ,
( 'LABEL','ID_BY_CURRENT_USER','en','By Current User','2021-07-13') ,
( 'LABEL','ID_BY_FINISH_DATE','en','By Finish Date','2020-12-16') ,
( 'LABEL','ID_BY_PROCESS_NAME','en','Process Name','2020-12-16') ,
( 'LABEL','ID_BY_PARTICIPATION','en','By Participation','2021-07-13') ,
( 'LABEL','ID_BY_PROCESS_CATEGORY','en','By Process Category','2021-07-13') ,
( 'LABEL','ID_BY_PROCESS_NAME','en','By Process Name','2020-12-16') ,
( 'LABEL','ID_BY_TASK','en','By Task','2020-12-16') ,
( 'LABEL','ID_BY_ROLE','en','By Role','2020-12-15') ,
( 'LABEL','ID_BY_STATUS','en','By Status','2020-12-16') ,
@@ -57547,6 +57550,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_ALL','en','Check All','2014-01-15') ,
( 'LABEL','ID_CHECK_FIELDS_MARK_RED','en','Please check the fields marked in red.','2014-10-06') ,
( 'LABEL','ID_CHECK_ONE_OPTION_ENABLE_SEARCH','en','Please check one option to be enabled for search.','2021-07-13') ,
( 'LABEL','ID_CHECK_PORT','en','Checking port','2014-01-15') ,
( 'LABEL','ID_CHECK_PORT_FAILED','en','Error Testing Connection: Checking port failed','2015-09-18') ,
( 'LABEL','ID_CHECK_UPDATES','en','Check for updates (you need to be connected to the Internet)','2017-02-21') ,
@@ -57588,6 +57592,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_COMMAND_EXECUTED_SUCCESSFULY','en','command executed successfully','2014-10-21') ,
( 'LABEL','ID_COMMENTS','en','Comments','2014-01-15') ,
( 'LABEL','ID_COMPLETED','en','Completed','2014-01-15') ,
( 'LABEL','ID_COMPLETED_BY','en','Completed By:','2021-07-13') ,
( 'LABEL','ID_COMPLETED_BY_USER','en','Completed By User','2014-01-15') ,
( 'LABEL','ID_COMPLETED_CASES','en','Completed Cases','2015-03-09') ,
( 'LABEL','ID_COMPLETED_TASK','en','Completed Task','2014-01-15') ,
@@ -60945,7 +60950,10 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SEARCH_ALSO_APP_UID','en','Search also in the APP_UID field','2014-10-30') ,
( 'LABEL','ID_SEARCH_BY_CASE_NUMBER','en','Search by Case #:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_CASE_TITLE','en','Search by Case Title:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_CURRENT_USER','en','Search by Current User:','2021-07-13')
( 'LABEL','ID_SEARCH_BY_FINISH_DATE','en','Search by Finish Date:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_PARTICIPATION','en','Search by Participation:','2021-07-13') ,
( 'LABEL','ID_SEARCH_BY_PROCESS_CATEGORY','en','Search by Process Category:','2021-07-13') ,
( 'LABEL','ID_SEARCH_BY_PROCESS_NAME','en','Search by Process Name:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_START_DATE','en','Search by Start Date:','2020-12-16') ,
( 'LABEL','ID_SEARCH_BY_STATUS','en','Search by Status:','2020-12-22') ,
@@ -61125,6 +61133,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_STAGE','en','Stage','2014-01-15') ,
( 'LABEL','ID_STAGES','en','Stages','2014-01-15') ,
( 'LABEL','ID_STANDARD_LOGGING','en','Log Files','2018-02-19') ,
( 'LABEL','ID_STARTED_BY','en','Started By:','2021-07-13') ,
( 'LABEL','ID_STARTED_CASES','en','My Started Cases','2014-01-15') ,
( 'LABEL','ID_STARTED_SUCCESSFULLY','en','Started successfully','2014-01-15') ,
( 'LABEL','ID_STARTING_LOG_FILE','en','Starting log file','2014-01-15') ,