Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/calendar-fix1

src/app/pages/agenda/agenda.page.ts

@@ -135,8 +135,6 @@ export class AgendaPage implements OnInit {
         }
       }
     });
-
-
   }
 
   //Go to the next view of the calendar month/week/day

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html

@@ -14,7 +14,7 @@
 <ion-menu autoHide="false" side="end" content-id="main-content">
   <ion-header>
     <ion-toolbar translucent>
-      <ion-title>Acções</ion-title>
+      <ion-title>Ações</ion-title>
     </ion-toolbar>
   </ion-header>
   <ion-content>

src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts

@@ -49,7 +49,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   close(){
-    this.router.navigate(['/home/gabinete-digital/event-list']);
+    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.modalController.dismiss(null);
   }
 

src/app/pages/agenda/view-event/view-event.page.html

@@ -31,7 +31,7 @@
       <div class="content-details">
         <ion-label>
           <p>{{customDate}}</p>
-          <p>das {{loadedEvent.StartDate | date: 'hh:mm'}} às {{loadedEvent.EndDate | date: 'hh:mm'}}</p>
+          <p>das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
           <p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
           <p *ngIf="loadedEvent.IsRecurring">Repete</p>
         </ion-label>