diff --git a/client/scripts/filters/calendar.filter.js b/client/scripts/filters/calendar.filter.js
new file mode 100644
index 0000000..f22da38
--- /dev/null
+++ b/client/scripts/filters/calendar.filter.js
@@ -0,0 +1,17 @@
+import Moment from 'moment';
+import { Filter } from 'angular-ecmascript/module-helpers';
+
+export default class CalendarFilter extends Filter {
+  filter(time) {
+    if (!time) return;
+
+    return Moment(time).calendar(null, {
+      lastDay : '[Yesterday]',
+      sameDay : 'LT',
+      lastWeek : 'dddd',
+      sameElse : 'DD/MM/YY'
+    });
+  }
+}
+
+CalendarFilter.$name = 'calendar';
\ No newline at end of file