Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.x

main/announcements/announcements.php

@@ -318,6 +318,14 @@ switch ($action) {
 
         $form->addElement('text', 'title', get_lang('EmailTitle'));
         $form->addElement('hidden', 'id');
+        $htmlTags = "<b>".get_lang('Tags')."</b></br></br>";
+        $tags = AnnouncementManager::get_tags();
+        
+        foreach ($tags as $tag) {
+            $htmlTags .= "<b>".$tag."</b></br>";
+        }
+        
+        $form->addHtml("<div class='form-group'><div class='col-sm-2'></div><div class='col-sm-8'><div class='alert alert-info'>".$htmlTags."</div></div></div>");
         $form->addHtmlEditor(
             'content',
             get_lang('Description'),

main/calendar/agenda_list.php

@@ -33,6 +33,14 @@ if (!empty($currentCourseId) && $currentCourseId != -1) {
     $this_section = SECTION_COURSES;
 } else {
     // Agenda is out of the course tool (e.g personal agenda)
+    
+    // Little hack to sort the events by start date in personal agenda (Agenda events List view - See #8014)
+    usort($events, function($a, $b) {
+        $t1 = strtotime($a['start']);
+        $t2 = strtotime($b['start']);
+        return $t1 - $t2;
+    });
+    
     $url = false;
     if (!empty($events)) {
         foreach ($events as &$event) {