Merge branch 'fix/events-list-upcoming-only' into 'master'

Only really show upcoming events in the upcoming events view

See merge request !1106

website/events/static/events/js/calendarlistview.js

@@ -9,6 +9,16 @@ ListView = View.extend({
         return this.title;
     },
 
+    fetchInitialEvents: function (dateProfile) {
+        var calendar = this.calendar;
+        var today = new Date();
+
+        return calendar.requestEvents(
+            calendar.msToMoment(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0), false),
+            calendar.msToMoment(Date.UTC(today.getFullYear() + 2, today.getMonth(), today.getDate(), 0, 0, 0), false)
+        );
+    },
+
     renderEvents: function (events) {
         var root = $("<div>").addClass("accordion bordered");
 

website/events/static/events/js/main.js

@@ -11,12 +11,12 @@ function checkResponsiveState(calendarElement, windowWidth, view) {
     calendarElement.fullCalendar('removeEventSource', SOURCES.birthdays);
     if (windowWidth <= 768) {
         calendarElement.fullCalendar('option', 'header', {
-            right: 'today'
+            right: ''
         });
     } else {
         if (view.name === 'list') {
             calendarElement.fullCalendar('option', 'header', {
-                right: 'list,agendaWeek,month today'
+                right: 'list,agendaWeek,month'
             });
         } else {
             if (Cookies.get(BIRTHDAYS_COOKIE)) {