Rodrigo Quelca 5011ba6b76 fix merge conflicts

2020-12-18 19:28:38 +00:00

..

entities

…

interfaces

…

model

fix merge conflicts

2020-12-18 19:28:38 +00:00

triggers

…

ActionsByEmailCoreClass.php

PMCORE-1335 ProcessMaker core should be use the native Laravel log mechanism.

2020-08-10 17:11:55 -04:00

AppDocumentDrive.php

…

ApplicationAppDataUnserializeException.php

…

Applications.php

…

ApplicationWithCorruptDynaformException.php

…

ApplicationWithoutDelegationRecordsException.php

…

AppSolr.php

…

Archive.php

…

ArrayBasePeer.php

…

BpmnEngineSearchIndexAccessSolr.php

…

BpmnEngineServicesSearchIndex.php

…

BzipFile.php

…

Calendar.php

…

Cases.php

PMCORE-2292

2020-12-08 14:43:40 -04:00

class.actionsByEmailCore.php

…

class.AppDocumentDrive.php

…

class.applications.php

…

class.AppSolr.php

…

class.archive.php

…

class.ArrayPeer.php

…

class.BasePeer.php

…

class.calendar.php

…

class.case.php

…

class.cli.php

…

class.configuration.php

…

class.consolidatedCases.php

…

class.dashboards.php

…

class.dashletOpenVSCompleted.php

…

class.dashletProcessMakerCommunity.php

…

class.dashletProcessMakerEnterprise.php

…

class.dashletRssReader.php

…

class.dates.php

…

class.dbConnections.php

…

class.derivation.php

…

class.dynaformEditor.php

…

class.dynaFormField.php

…

class.enterprise.php

…

class.enterpriseUtils.php

…

class.fieldValidator.php

…

class.fileCache.php

…

class.formBatchRouting.php

…

class.groups.php

…

class.groupUser.php

…

class.indicatorsCalculator.php

…

class.Installer.php

…

class.javaBridgePM.php

…

class.labelsGmail.php

…

class.ldapAdvanced.php

…

class.license.app.php

…

class.license.lib.php

…

class.licensedFeatures.php

…

class.memcached.php

…

class.multipleFilesBackup.php

…

class.net.php

…

class.patch.php

…

class.plugin.php

…

class.pluginRegistry.php

…

class.pmDashlet.php

…

class.pmDrive.php

…

class.pmDynaform.php

…

class.pmFunctions.php

Merged in bugfix/PMCORE-1335 (pull request #7332)

2020-09-18 18:24:25 +00:00

class.pmGauge.php

…

class.pmGoogleApi.php

…

class.pmLicenseManager.php

…

class.pmPhing.php

…

class.pmScript.php

PMCORE-552

2020-10-26 20:45:42 +00:00

class.pmSso.php

…

class.pmTable.php

…

class.popupMenu.php

…

class.processes.php

…

class.processMap.php

…

class.propelTable.php

…

class.replacementLogo.php

…

class.report.php

…

class.reportTables.php

…

class.searchIndex.php

…

class.serverConfiguration.php

…

class.sessions.php

…

class.solr.php

…

class.spool.php

…

class.system.php

…

class.tasks.php

…

class.toolBar.php

…

class.triggerLibrary.php

…

class.Upgrade.php

…

class.webdav.php

…

class.wsBase.php

…

class.wsResponse.php

…

class.wsTools.php

…

class.xmlDb.php

…

class.xmlfield_Image.php

…

class.xmlfield_InputPM.php

…

CLI.php

…

Configurations.php

…

ConsolidatedCases.php

…

Dashboards.php

…

DashletInterface.php

…

DashletOpenVsCompleted.php

…

DashletProcessMakerCommunity.php

…

DashletProcessMakerEnterprise.php

…

DashletRssReader.php

…

Dates.php

…

DbConnections.php

PMCORE-1470 Custom Port not included when using MSSQL instance name in the DB connection

2020-08-18 07:53:11 -04:00

Derivation.php

PMCORE-2395

2020-11-26 10:13:59 -04:00

DynaformEditor.php

…

DynaformEditorAjax.php

…

DynaFormField.php

…

EnterpriseClass.php

…

EnterpriseUtils.php

…

FeaturesDetail.php

…

FieldValidator.php

…

FileCache.php

…

FormBatchRouting.php

…

Groups.php

…

GulliverBasePeer.php

…

Gzip_File.php

…

IDynaformEditorAjax.php

…

IndicatorsCalculator.php

PMCORE-1160

2020-02-19 10:47:36 -04:00

InvalidIndexSearchTextException.php

…

JavaBridgePM.php

…

LabelsGmail.php

…

LdapAdvanced.php

PMCORE-1207 Generic message for wrong credentials and AD users

2020-10-07 22:59:04 -04:00

License_Application.php

…

ListAdditionalColumnsInterface.php

…

ListCreateUpdateInterface.php

…

ListInterface.php

…

ListUserDisplayFormatInterface.php

…

MultipleFilesBackup.php

…

Net.php

…

ObjectCollection.php

…

ObjectDocument.php

…

P11835.php

…

Padl.php

…

Patch.php

…

PluginDetail.php

…

PmDashlet.php

…

PmDrive.php

…

PmDynaform.php

Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/PMCORE-1335

2020-08-31 08:51:26 -04:00

PmGauge.php

…

PmGoogleApi.php

…

PMLicensedFeatures.php

…

PmLicenseManager.php

…

PMmemcached.php

…

PmPhing.php

…

PmPluginCompatibility.php

…

PMPluginRegistry.php

…

PmSsoClass.php

…

PmTable.php

…

PopupMenu.php

…

Processes.php

PMCORE-1335 ProcessMaker core should be use the native Laravel log mechanism.

2020-08-10 17:11:55 -04:00

ProcessMap.php

…

PropelTable.php

…

ReplacementLogo.php

…

Report.php

…

ReportTables.php

PMCORE-1335 ProcessMaker core should be use the native Laravel log mechanism.

2020-08-10 17:11:55 -04:00

ServerConf.php

…

Sessions.php

…

SpoolRun.php

Merged in bugfix/PMCORE-1335 (pull request #7332)

2020-09-18 18:24:25 +00:00

Stat.php

…

TarFile.php

…

Tasks.php

…

ToolBar.php

…

TriggerLibrary.php

…

WorkspaceTools.php

PMCORE-2559

2020-12-18 10:55:53 -04:00

WsBase.php

PMCORE-2559

2020-12-18 10:55:53 -04:00

WsCreateDepartmentResponse.php

…

WsCreateGroupResponse.php

…

WsCreateUserResponse.php

…

WsGetCaseNotesResponse.php

…

WsGetVariableResponse.php

…

WsResponse.php

PMCORE-593 Action by email: when the authentication is incorrect we can see an error in the routing page.

2020-06-09 12:50:12 -04:00

XMLConnection.php

…

XMLDB.php

…

XmlFormFieldCheckBoxTable.php

…

XmlFormFieldHours.php

…

XmlFormFieldPopupOption.php

…

XmlFormFieldTextareaPm.php

…

XmlFormFieldTextPm.php

…

XmlFormFieldToolBar.php

…

XmlFormFieldToolButton.php

…

XMLResult.php

…

ZipFile.php

…