mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
Adapt app-specific merges to 186e03671a
This commit is contained in:
parent
186e03671a
commit
9be653e226
@ -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
|
||||||
|
@ -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
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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,
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -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
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user