Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab

Browse source
This commit is contained in:
Aleksander Machniak 2017-08-01 12:55:45 +02:00
commit 2586d83fa1
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/kolab_tags/kolab_tags.js
View file

@ -60,6 +60,17 @@ window.rcmail && rcmail.addEventListener('init', function() {
rcmail.register_command('tag-remove', function(props, obj, event) { tag_remove(props, obj, event); }); rcmail.register_command('tag-remove', function(props, obj, event) { tag_remove(props, obj, event); });
rcmail.register_command('tag-remove-all', function() { tag_remove('*'); }); rcmail.register_command('tag-remove-all', function() { tag_remove('*'); });
// Disable tag functionality in contextmenu in Roundcube < 1.4
if (!rcmail.env.rcversion) {
rcmail.addEventListener('menu-open', function(e) {
if (e.name == 'rcm_markmessagemenu') {
$.each(['add', 'remove', 'remove-all'], function() {
$('a.cmd_tag-' + this).parent().hide();
});
}
});
}
// ajax response handler // ajax response handler
rcmail.addEventListener('plugin.kolab_tags', update_tags); rcmail.addEventListener('plugin.kolab_tags', update_tags);

2
plugins/libcalendaring/libcalendaring.php
View file

@ -137,7 +137,7 @@ class libcalendaring extends rcube_plugin
'statusorganizer', 'statusaccepted', 'statusdeclined', 'statusorganizer', 'statusaccepted', 'statusdeclined',
'statusdelegated', 'statusunknown', 'statusneeds-action', 'statusdelegated', 'statusunknown', 'statusneeds-action',
'statustentative', 'statuscompleted', 'statusin-process', 'statustentative', 'statuscompleted', 'statusin-process',
'delegatedto', 'delegatedfrom' 'delegatedto', 'delegatedfrom', 'showmore'
); );
} }