PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980
# Conflicts: # workflow/engine/classes/WsBase.php
This commit is contained in:
@@ -2744,6 +2744,8 @@ CREATE TABLE `EMAIL_SERVER`
|
||||
`MESS_ENGINE` VARCHAR(256) default '' NOT NULL,
|
||||
`MESS_SERVER` VARCHAR(256) default '' NOT NULL,
|
||||
`MESS_PORT` INTEGER default 0 NOT NULL,
|
||||
`MESS_INCOMING_SERVER` VARCHAR(256) default '' NOT NULL,
|
||||
`MESS_INCOMING_PORT` INTEGER default 0 NOT NULL,
|
||||
`MESS_RAUTH` INTEGER default 0 NOT NULL,
|
||||
`MESS_ACCOUNT` VARCHAR(256) default '' NOT NULL,
|
||||
`MESS_PASSWORD` VARCHAR(256) default '' NOT NULL,
|
||||
@@ -2865,6 +2867,7 @@ CREATE TABLE `ABE_CONFIGURATION`
|
||||
`DYN_UID` VARCHAR(32) default '' NOT NULL,
|
||||
`ABE_EMAIL_FIELD` VARCHAR(255) default '' NOT NULL,
|
||||
`ABE_ACTION_FIELD` VARCHAR(255) default '',
|
||||
`ABE_ACTION_BODY_FIELD` VARCHAR(255) default '',
|
||||
`ABE_CASE_NOTE_IN_RESPONSE` INTEGER default 0,
|
||||
`ABE_FORCE_LOGIN` INTEGER default 0,
|
||||
`ABE_CREATE_DATE` DATETIME NOT NULL,
|
||||
@@ -2873,6 +2876,7 @@ CREATE TABLE `ABE_CONFIGURATION`
|
||||
`ABE_MAILSERVER_OR_MAILCURRENT` INTEGER default 0,
|
||||
`ABE_CUSTOM_GRID` MEDIUMTEXT,
|
||||
`ABE_EMAIL_SERVER_UID` VARCHAR(32) default '',
|
||||
`ABE_EMAIL_SERVER_RECEIVER_UID` VARCHAR(32) default '',
|
||||
PRIMARY KEY (`ABE_UID`),
|
||||
KEY `indexAbeProcess`(`PRO_UID`),
|
||||
KEY `indexAbeProcessTask`(`PRO_UID`, `TAS_UID`)
|
||||
|
||||
Reference in New Issue
Block a user