Paula V. Quispe bb818ba50c conflict

2016-07-22 10:59:13 -04:00

..

entities

…

interfaces

…

model

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

triggers

…

class.actionsByEmailCore.php

HOR-1336

2016-07-11 15:58:34 -04:00

class.actionsByEmailUtils.php

…

class.AppDocumentDrive.php

…

class.applications.php

…

class.AppSolr.php

HOR-1344 Optimization: Lists tables

2016-07-18 14:13:01 -04:00

class.archive.php

…

class.ArrayPeer.php

…

class.BasePeer.php

…

class.calendar.php

…

class.case.php

Solving conflicts with branch 3.1-CONTENT

2016-07-20 16:28:13 -04:00

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

Merge remote-tracking branch 'upstream/3.1' into HOR-998

2016-07-19 10:12:49 -04:00

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

HOR-1356

2016-07-07 12:00:14 -04:00

class.javaBridgePM.php

…

class.labelsGmail.php

…

class.ldapAdvanced.php

…

class.library.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

HOR-1400 "Remove code scanner review for ProcessMaker plugins" SOLVED

2016-07-14 12:16:12 -04:00

class.pmDashlet.php

remove DEPO_TITLE

2016-06-29 12:07:16 -04:00

class.pmDrive.php

…

class.pmDynaform.php

HOR-1365

2016-07-11 17:26:53 -04:00

class.pmFunctions.php

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

class.pmGauge.php

…

class.pmGoogleApi.php

…

class.pmLicenseManager.php

…

class.pmPhing.php

…

class.pmScript.php

HOR-1443 "Add total trigger execution..."

2016-07-19 18:29:04 -04:00

class.pmSso.php

…

class.pmTable.php

…

class.popupMenu.php

…

class.processes.php

Merge remote-tracking branch 'upstream/3.1-CONTENT' into 3.1

2016-07-21 16:41:42 -04:00

class.processMap.php

HOR-1344 Optimization: Lists tables

2016-07-18 14:13:01 -04:00

class.propelTable.php

…

class.replacementLogo.php

…

class.report.php

HOR-1344 Optimization: Lists tables

2016-07-18 14:13:01 -04:00

class.reportTables.php

…

class.searchIndex.php

…

class.serverConfiguration.php

…

class.sessions.php

…

class.solr.php

…

class.spool.php

…

class.system.php

HOR-1293 "Create PMFunction to Send Message to Group PMFSendMessageToGroup" SOLVED

2016-07-21 10:07:00 -04:00

class.tasks.php

HOR-1328 Agregar los campos que se guardan en la tabla CONTENT relacionados a la tabla TASK

2016-07-08 14:37:06 -04:00

class.toolBar.php

…

class.triggerLibrary.php

…

class.Upgrade.php

…

class.webdav.php

…

class.wsBase.php

Solving conflicts with branch 3.1-CONTENT

2016-07-21 16:33:27 -04:00

class.wsResponse.php

…

class.wsTools.php

conflict

2016-07-22 10:59:13 -04:00

class.xmlDb.php

…

class.xmlfield_Image.php

…

class.xmlfield_InputPM.php

…