calsocial/calendar_system/gregorian.py

@@ -154,6 +154,7 @@ class GregorianCalendar(CalendarSystem):
         end_timestamp = start_timestamp + timedelta(days=1)
 
         events = events.filter(((Event.start_time >= start_timestamp) & (Event.start_time < end_timestamp)) |
-                               ((Event.end_time >= start_timestamp) & (Event.end_time < end_timestamp)))
+                               ((Event.end_time >= start_timestamp) & (Event.end_time < end_timestamp))) \
+                       .order_by('start_time', 'end_time')
 
         return events