Merge branch 'release/1.2.1'

accounts/templates/accounts/profile.html

@@ -20,6 +20,8 @@
                     <span class="today__time">{{event.time|time:"TIME_FORMAT"}}</span>
                     <span><a href="{% url 'event-update' event.pk %}">Edit</a></span>
                 </div>
+            {% empty %}
+            <p><em>Nothing for today.</em></p>
             {% endfor %}
         </div>
     </section>

accounts/views.py

@@ -21,9 +21,9 @@ class ProfileView(LoginRequiredMixin, TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        today = date.today()
+        today = timezone.localtime(timezone.now()).date()
         tomorrow = today + timedelta(days=1)
-        enddate = today + timedelta(days=6)
+        enddate = today + timedelta(days=7)
         context['profile'] = self.request.user.profile
         context['latest_activity'] = LogEntry.objects.all()[:10]
         context['today'] = Event.objects.filter(