Merge branch 'master' into fix_notices_warnings
# Conflicts: # include/utils/utils.php
No related branches found
No related tags found
Showing
- SendSupportNotification.php 1 addition, 1 deletionSendSupportNotification.php
- config.template.php 1 addition, 1 deletionconfig.template.php
- data/CRMEntity.php 12 additions, 7 deletionsdata/CRMEntity.php
- include/Webservices/ConvertLead.php 12 additions, 0 deletionsinclude/Webservices/ConvertLead.php
- include/events/VTEventTrigger.inc 1 addition, 1 deletioninclude/events/VTEventTrigger.inc
- include/utils/VtlibUtils.php 18 additions, 0 deletionsinclude/utils/VtlibUtils.php
- include/utils/utils.php 7 additions, 1 deletioninclude/utils/utils.php
- includes/main/WebUI.php 13 additions, 12 deletionsincludes/main/WebUI.php
- languages/en_us/Install.php 1 addition, 0 deletionslanguages/en_us/Install.php
- languages/fr_fr/Calendar.php 54 additions, 54 deletionslanguages/fr_fr/Calendar.php
- layouts/vlayout/modules/Calendar/resources/Edit.js 1 addition, 4 deletionslayouts/vlayout/modules/Calendar/resources/Edit.js
- layouts/vlayout/modules/Install/Step1.tpl 11 additions, 0 deletionslayouts/vlayout/modules/Install/Step1.tpl
- layouts/vlayout/modules/Install/Step6.tpl 1 addition, 1 deletionlayouts/vlayout/modules/Install/Step6.tpl
- layouts/vlayout/modules/Migration/MigrationStep1.tpl 1 addition, 1 deletionlayouts/vlayout/modules/Migration/MigrationStep1.tpl
- layouts/vlayout/modules/Migration/MigrationStep2.tpl 1 addition, 1 deletionlayouts/vlayout/modules/Migration/MigrationStep2.tpl
- layouts/vlayout/modules/Potentials/dashboards/TopPotentialsContents.tpl 2 additions, 2 deletions...t/modules/Potentials/dashboards/TopPotentialsContents.tpl
- layouts/vlayout/modules/Settings/Groups/EditView.tpl 1 addition, 1 deletionlayouts/vlayout/modules/Settings/Groups/EditView.tpl
- layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl 1 addition, 1 deletion...ayout/modules/Settings/MailConverter/ListViewContents.tpl
- layouts/vlayout/modules/Settings/Profiles/EditView.tpl 1 addition, 1 deletionlayouts/vlayout/modules/Settings/Profiles/EditView.tpl
- layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl 1 addition, 1 deletionlayouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
Loading
Please register or sign in to comment