extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adapt app-specific merges to 186e03671a

Browse Source
This commit is contained in:
nathangray 2021-06-23 11:31:47 -06:00 committed by Ralf Becker
parent e75bef4415
commit 6b50299d8a
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/inc/class.calendar_merge.inc.php
View File

@ -27,6 +27,7 @@ class calendar_merge extends Api\Storage\Merge
var $public_functions = array( var $public_functions = array(
'download_by_request' => true, 'download_by_request' => true,
'show_replacements' => true, 'show_replacements' => true,
'merge_entries' => true
); );
// Object for getting calendar info // Object for getting calendar info

1
filemanager/inc/class.filemanager_merge.inc.php
View File

@ -27,6 +27,7 @@ class filemanager_merge extends Api\Storage\Merge
*/ */
var $public_functions = array( var $public_functions = array(
'show_replacements' => true, 'show_replacements' => true,
'merge_entries' => true
); );
/** /**

1
infolog/inc/class.infolog_merge.inc.php
View File

@ -28,6 +28,7 @@ class infolog_merge extends Api\Storage\Merge
var $public_functions = array( var $public_functions = array(
'download_by_request' => true, 'download_by_request' => true,
'show_replacements' => true, 'show_replacements' => true,
'merge_entries' => true,
); );
/** /**

1
timesheet/inc/class.timesheet_merge.inc.php
View File

@ -29,6 +29,7 @@ class timesheet_merge extends Api\Storage\Merge
'download_by_request' => true, 'download_by_request' => true,
'show_replacements' => true, 'show_replacements' => true,
'timesheet_replacements' => true, 'timesheet_replacements' => true,
'merge_entries' => true
); );
/** /**