Merge remote-tracking branch 'upstream/master'
# Conflicts: # layouts/v7/modules/Vtiger/partials/Topbar.tpl # layouts/v7/modules/Vtiger/resources/Vtiger.js # layouts/v7/skins/vtiger/style.less
No related branches found
No related tags found
Showing
- config.template.php 3 additions, 3 deletionsconfig.template.php
- data/CRMEntity.php 10 additions, 1 deletiondata/CRMEntity.php
- include/QueryGenerator/EnhancedQueryGenerator.php 27 additions, 18 deletionsinclude/QueryGenerator/EnhancedQueryGenerator.php
- include/Webservices/LineItem/VtigerInventoryOperation.php 3 additions, 1 deletioninclude/Webservices/LineItem/VtigerInventoryOperation.php
- include/Webservices/VtigerModuleOperation.php 13 additions, 3 deletionsinclude/Webservices/VtigerModuleOperation.php
- include/Webservices/WebserviceField.php 21 additions, 1 deletioninclude/Webservices/WebserviceField.php
- include/database/PearDatabase.php 6 additions, 4 deletionsinclude/database/PearDatabase.php
- include/fields/CurrencyField.php 1 addition, 1 deletioninclude/fields/CurrencyField.php
- include/fields/DateTimeField.php 155 additions, 77 deletionsinclude/fields/DateTimeField.php
- include/utils/CommonUtils.php 2 additions, 2 deletionsinclude/utils/CommonUtils.php
- include/utils/EmailTemplate.php 1 addition, 0 deletionsinclude/utils/EmailTemplate.php
- include/utils/InventoryUtils.php 5 additions, 5 deletionsinclude/utils/InventoryUtils.php
- include/utils/UserInfoUtil.php 1 addition, 1 deletioninclude/utils/UserInfoUtil.php
- include/utils/VtlibUtils.php 38 additions, 9 deletionsinclude/utils/VtlibUtils.php
- include/utils/utils.php 3 additions, 53 deletionsinclude/utils/utils.php
- includes/main/WebUI.php 1 addition, 1 deletionincludes/main/WebUI.php
- includes/runtime/Controller.php 32 additions, 21 deletionsincludes/runtime/Controller.php
- includes/runtime/Viewer.php 1 addition, 1 deletionincludes/runtime/Viewer.php
- kcfinder/core/browser.php 2 additions, 1 deletionkcfinder/core/browser.php
- kcfinder/core/uploader.php 15 additions, 1 deletionkcfinder/core/uploader.php
Loading
Please register or sign in to comment