Merge remote-tracking branch 'origin/master' into #1040035-Dublettenermittlung-master
# Conflicts: # .aditoprj/project.version # entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod # entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js # entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod # entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/onValueChange.js # entity/DuplicateScannerPrefilterConfig_entity/entityfields/filter_condition/valueProcess.js # entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js # entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildorganisationduplicatescache/onActionProcess.js # entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js # entity/Organisation_entity/Organisation_entity.aod # entity/PermissionAction_entity/PermissionAction_entity.aod # entity/Person_entity/Person_entity.aod # entity/Person_entity/recordcontainers/db/onDBInsert.js # entity/Person_entity/recordcontainers/index/query.js # neonContext/360Degree/360Degree.aod # neonContext/Activity/Activity.aod # neonContext/ActivityLink/ActivityLink.aod # neonContext/Address/Address.aod # neonContext/AddressType/AddressType.aod # neonContext/AddressValidation/AddressValidation.aod # neonContext/Analyses/Analyses.aod # neonContext/AnyContact/AnyContact.aod # neonContext/Appointment/Appointment.aod # neonContext/AppointmentLink/AppointmentLink.aod # neonContext/AttributeRelation/AttributeRelation.aod # neonContext/BulkMail/BulkMail.aod # neonContext/CampaignAddParticipants/CampaignAddParticipants.aod # neonContext/CampaignAnalysis/CampaignAnalysis.aod # neonContext/CampaignCost/CampaignCost.aod # neonContext/CampaignCostChart/CampaignCostChart.aod # neonContext/CampaignParticipant/CampaignParticipant.aod # neonContext/CampaignParticipantChart/CampaignParticipantChart.aod # neonContext/Classification/Classification.aod # neonContext/ClassificationAdmin/ClassificationAdmin.aod # neonContext/ClassificationScore/ClassificationScore.aod # neonContext/CommRestriction/CommRestriction.aod # neonContext/Communication/Communication.aod # neonContext/Competition/Competition.aod # neonContext/Contact/Contact.aod # neonContext/Context/Context.aod # neonContext/Countries/Countries.aod # neonContext/DSGVO/DSGVO.aod # neonContext/Default_context/Default_context.aod # neonContext/Document/Document.aod # neonContext/DocumentTemplate/DocumentTemplate.aod # neonContext/DocumentTemplateLink/DocumentTemplateLink.aod # neonContext/DocumentTemplateTypeCategory/DocumentTemplateTypeCategory.aod # neonContext/DuplicateScanner/DuplicateScanner.aod # neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod # neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod # neonContext/Email/Email.aod # neonContext/Employee/Employee.aod # neonContext/EmployeeRole/EmployeeRole.aod # neonContext/Forecast/Forecast.aod # neonContext/IndexSearchContext/IndexSearchContext.aod # neonContext/KeywordAttribute/KeywordAttribute.aod # neonContext/KeywordAttributeRelation/KeywordAttributeRelation.aod # neonContext/KeywordEntry/KeywordEntry.aod # neonContext/Language/Language.aod # neonContext/Letter/Letter.aod # neonContext/LetterRecipient/LetterRecipient.aod # neonContext/LogHistory/LogHistory.aod # neonContext/Member/Member.aod # neonContext/ModuleTree/ModuleTree.aod # neonContext/Notification/Notification.aod # neonContext/Object/Object.aod # neonContext/ObjectRelationType/ObjectRelationType.aod # neonContext/ObjectTree/ObjectTree.aod # neonContext/Offeritem/Offeritem.aod # neonContext/Orderitem/Orderitem.aod # neonContext/PermissionAction/PermissionAction.aod # neonContext/PermissionDetail/PermissionDetail.aod # neonContext/PermissionMetaData/PermissionMetaData.aod # neonContext/PermissionOverview/PermissionOverview.aod # neonContext/Prod2prod/Prod2prod.aod # neonContext/Productprice/Productprice.aod # neonContext/QuickEntry/QuickEntry.aod # neonContext/Role/Role.aod # neonContext/SalesprojectAnalyses/SalesprojectAnalyses.aod # neonContext/SalesprojectMilestone/SalesprojectMilestone.aod # neonContext/SalesprojectSource/SalesprojectSource.aod # neonContext/Salutation/Salutation.aod # neonContext/SalutationDistinct/SalutationDistinct.aod # neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod # neonContext/SerialLetter/SerialLetter.aod # neonContext/Social/Social.aod # neonContext/Stock/Stock.aod # neonContext/SupportTicket/SupportTicket.aod # neonContext/Task/Task.aod # neonContext/TaskLink/TaskLink.aod # neonContext/Timetracking/Timetracking.aod # neonContext/Turnover/Turnover.aod # neonContext/TurnoverTree/TurnoverTree.aod # neonContext/UnlinkedMail/UnlinkedMail.aod # neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod # neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod # neonView/DuplicateScannerPrefilterConfigEdit_view/DuplicateScannerPrefilterConfigEdit_view.aod # neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod # process/DuplicateScanner_lib/process.js
No related branches found
No related tags found
Showing
- .aditoprj/project.version 1 addition, 1 deletion.aditoprj/project.version
- .liquibase/Data_alias/basic/2019.1.4/AditoBasic/create_ab_ctilog.xml 2 additions, 2 deletions...Data_alias/basic/2019.1.4/AditoBasic/create_ab_ctilog.xml
- .liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml 1 addition, 1 deletion...019.1.4/AditoBasic/init_AttributeKeyword_target_group.xml
- .liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_permission_keyword.xml 5 additions, 5 deletions...s/basic/2019.1.4/AditoBasic/insert_permission_keyword.xml
- .liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml 194 additions, 194 deletions...ase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
- .liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml 6 additions, 6 deletions.../Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
- .liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml 1 addition, 1 deletion...lias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml
- .liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml 1 addition, 1 deletion...se/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
- .liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaign.xml 1 addition, 1 deletion...ias/basic/2019.1.4/CampaignManagement/create_campaign.xml
- .liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCost.xml 1 addition, 1 deletion...basic/2019.1.4/CampaignManagement/create_campaignCost.xml
- .liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStep.xml 2 additions, 2 deletions...basic/2019.1.4/CampaignManagement/create_campaignStep.xml
- .liquibase/Data_alias/basic/2019.1.4/Classification/create_classification_tables.xml 1 addition, 1 deletion.../2019.1.4/Classification/create_classification_tables.xml
- .liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml 7 additions, 7 deletions.liquibase/Data_alias/basic/2019.1.4/DSGVO/create_DSGVO.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml 2 additions, 2 deletions...9.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml 2 additions, 2 deletions...c/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml 2 additions, 2 deletions....4/KeywordRelatedStructureChanges/CommunicationMedium.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml 2 additions, 2 deletions...9.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml 2 additions, 2 deletions...dRelatedStructureChanges/SalesProjectCompetitionPhase.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml 2 additions, 2 deletions....1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
- .liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPricePolitics.xml 2 additions, 2 deletions...wordRelatedStructureChanges/SalesProjectPricePolitics.xml
Loading
Please register or sign in to comment