Merge branch 'master' into feature-gdpr-no-caldav

UI/WebServerResources/js/Mailer/Message.service.js

@@ -461,7 +461,9 @@
 
             // Trusted content that can be compiled (Angularly-speaking)
             part.compile = true;
-            parts.push(part);
+            if (!Object.hasOwn(part, 'shouldDisplayAttachment') || 1 == part.shouldDisplayAttachment ) {
+              parts.push(part);
+            }
           }
           else {
             part.html = true;

UI/WebServerResources/js/Scheduler/Component.service.js

@@ -798,7 +798,6 @@
    */
   Component.prototype.canRemindAttendeesByEmail = function() {
     return this.alarm.action == 'email' &&
-      this.isEditable &&
       this.attendees && this.attendees.length > 0;
   };
 

UI/WebServerResources/js/Scheduler/ComponentController.js

@@ -14,6 +14,7 @@
       this.calendarService = Calendar;
       this.service = Component;
       this.component = stateComponent;
+      this.isDeleting = false;
 
       // Put organizer in an array to display it as an mdChip
       this.organizer = [stateComponent.organizer];
@@ -144,17 +145,26 @@
     };
 
     this.deleteOccurrence = function () {
-      this.component.remove(true).then(function() {
-        $rootScope.$emit('calendars:list');
-        $mdDialog.hide();
-      });
+      if (!this.isDeleting) {
+        this.isDeleting = true;
+        this.component.remove(true).then(function() {
+          $rootScope.$emit('calendars:list');
+          $mdDialog.hide();
+          vm.isDeleting = false;
+        });
+      }
     };
 
     this.deleteAllOccurrences = function () {
-      this.component.remove().then(function() {
-        $rootScope.$emit('calendars:list');
-        $mdDialog.hide();
-      });
+      if (!this.isDeleting) {
+        this.isDeleting = true;
+        this.component.remove().then(function () {
+          $rootScope.$emit('calendars:list');
+          $mdDialog.hide();
+          vm.isDeleting = false;
+        });
+      }
+      
     };
 
     this.toggleRawSource = function ($event) {