35 files changed, 374 insertions, 4 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index e09b0f18..183b6690 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -129,6 +129,12 @@ services:
         calls:
             - [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ]
 
+    wallabag_core.notification_repository:
+        class: Wallabag\CoreBundle\Repository\NotificationRepository
+        factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
+        arguments:
+            - WallabagCoreBundle:Notification
+
     wallabag_core.helper.entries_export:
         class: Wallabag\CoreBundle\Helper\EntriesExport
         arguments:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.da.yml b/src/Wallabag/CoreBundle/Resources/translations/date.da.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.da.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.de.yml b/src/Wallabag/CoreBundle/Resources/translations/date.de.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.de.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.en.yml b/src/Wallabag/CoreBundle/Resources/translations/date.en.yml
new file mode 100644
index 00000000..7bcd6d0c
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.en.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        empty: 'Now'
+        second: 'One second ago|%count% seconds ago'
+        minute: 'One minute ago|%count% minutes ago'
+        hour: 'One hour ago|%count% hours ago'
+        day: 'One day ago|%count% days ago'
+        month: 'One month ago|%count% months ago'
+        year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.es.yml b/src/Wallabag/CoreBundle/Resources/translations/date.es.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.es.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/date.fa.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.fa.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/date.fr.yml
new file mode 100644
index 00000000..02eb96b0
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.fr.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        empty: 'Maintenant'
+        second: 'Il y a une seconde|il y a %count% secondes'
+        minute: 'Il y a une minute|il y a %count% minutes'
+        hour: 'Il y a une heure|il y a %count% heures'
+        day: 'Il y a un jour|Il y a %count% jours'
+        month: 'Il y a un mois|il y a %count% mois'
+        year: 'Il y a un an|il y a %count% ans'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.it.yml b/src/Wallabag/CoreBundle/Resources/translations/date.it.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.it.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/date.oc.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.oc.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/date.pl.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.pl.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/date.pt.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.pt.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/date.ro.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.ro.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/date.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/date.tr.yml
new file mode 100644
index 00000000..3797b6bf
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/translations/date.tr.yml
@@ -0,0 +1,9 @@
+diff:
+    ago:
+        # empty: 'Now'
+        # second: 'One second ago|%count% seconds ago'
+        # minute: 'One minute ago|%count% minutes ago'
+        # hour: 'One hour ago|%count% hours ago'
+        # day: 'One day ago|%count% days ago'
+        # month: 'One month ago|%count% months ago'
+        # year: 'One year ago|%count% years ago'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5229ac73..ad03fa91 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Søg'
         filter_entries: 'Filtrer artikler'
         # export: 'Export'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Indtast søgning'
 
@@ -250,6 +251,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'Om'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 996f173a..f2d75a62 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Suche'
         filter_entries: 'Artikel filtern'
         export: 'Exportieren'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Suchbegriff hier eingeben'
 
@@ -250,6 +251,17 @@ entry:
         delete: "Bist du sicher, dass du diesen Artikel löschen möchtest?"
         delete_tag: "Bist du sicher, dass du diesen Tag vom Artikel entfernen möchtest?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'Über'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index aa1cd1a9..228dd87e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Search'
         filter_entries: 'Filter entries'
         export: 'Export'
+        notifications: 'Notifications'
     search_form:
         input_label: 'Enter your search here'
 
@@ -250,6 +251,16 @@ entry:
         delete: "Are you sure you want to remove that article?"
         delete_tag: "Are you sure you want to remove that tag from that article?"
 
+notifications:
+    sidebar:
+        view_more: 'View more'
+    list:
+        page_title: 'Notifications'
+        mark_all_as_read: 'Mark all as read'
+        none: "No notifications yet :'("
+    release:
+        title: "wallabag has been updated to version %version%"
+        details: "View update's details"
 about:
     page_title: 'About'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 96998f53..28f064c7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Buscar'
         filter_entries: 'Filtrar los artículos'
         export: 'Exportar'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Introduzca su búsqueda aquí'
 
@@ -250,6 +251,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'Acerca de'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 57e6c029..4496a2f2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -38,6 +38,7 @@ menu:
         search: 'جستجو'
         filter_entries: 'فیلترکردن مقاله‌ها'
         export: 'برون‌بری'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'جستجوی خود را این‌جا بنویسید:'
 
@@ -250,6 +251,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'درباره'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6eac4c36..8bccc8a4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -38,6 +38,7 @@ menu:
         search: "Rechercher"
         filter_entries: "Filtrer les articles"
         export: "Exporter"
+        notifications: 'Notifications'
     search_form:
         input_label: "Saisissez votre terme de recherche"
 
@@ -250,6 +251,17 @@ entry:
         delete: "Voulez-vous vraiment supprimer cet article ?"
         delete_tag: "Voulez-vous vraiment supprimer ce tag de cet article ?"
 
+notifications:
+    sidebar:
+        view_more: 'Voir plus'
+    list:
+        page_title: 'Notifications'
+        mark_all_as_read: 'Marquer tout comme lu'
+        none: "Aucune notification pour le moment :'("
+    release:
+        title: "wallabag a été mis à jour vers la version %version%"
+        details: "Voir les détails de la mise à jour"
+
 about:
     page_title: "À propos"
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 4e26f38c..c404b3e5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Cerca'
         filter_entries: 'Filtra contenuti'
         export: 'Esporta'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Inserisci qui la tua ricerca'
 
@@ -250,6 +251,16 @@ entry:
         delete: "Vuoi veramente rimuovere quell'articolo?"
         delete_tag: "Vuoi veramente rimuovere quell'etichetta da quell'articolo?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
 about:
     page_title: 'A proposito'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index be57e903..af9d85c3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Cercar'
         filter_entries: 'Filtrar los articles'
         export: 'Exportar'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Picatz vòstre mot-clau a cercar aquí'
 
@@ -250,6 +251,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'A prepaus'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 00c559ed..78464162 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Szukaj'
         filter_entries: 'Filtruj wpisy'
         export: 'Eksportuj'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Wpisz swoje zapytanie tutaj'
 
@@ -250,6 +251,17 @@ entry:
         delete: "Czy jesteś pewien, że chcesz usunąć ten artykuł?"
         delete_tag: "Czy jesteś pewien, że chcesz usunąć ten tag, z tego artykułu?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'O nas'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 4ab5f144..07eeefc2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Pesquisa'
         filter_entries: 'Filtrar entradas'
         export: 'Exportar'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Digite aqui sua pesquisa'
 
@@ -250,6 +251,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'Sobre'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index f16504ed..ba7b11d5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Căutare'
         filter_entries: 'Filtrează articolele'
         # export: 'Export'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Introdu căutarea ta'
 
@@ -250,6 +251,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'Despre'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 90a140cd..6cbe6dcd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -38,6 +38,7 @@ menu:
         search: 'Ara'
         filter_entries: 'Filtrele'
         export: 'Dışa Aktar'
+        # notifications: 'Notifications'
     search_form:
         input_label: 'Aramak istediğiniz herhangi bir şey yazın'
 
@@ -248,6 +249,17 @@ entry:
         # delete: "Are you sure you want to remove that article?"
         # delete_tag: "Are you sure you want to remove that tag from that article?"
 
+# notifications:
+#     sidebar:
+#         view_more: 'View more'
+#     list:
+#         page_title: 'Notifications'
+#         mark_all_as_read: 'Mark all as read'
+#         none: "No notifications yet :'("
+#     release:
+#         title: "wallabag has been updated to version %version%"
+#         details: "View update's details"
+
 about:
     page_title: 'Hakkımızda'
     top_menu:
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
index 8a5da71a..d566795d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig
@@ -3,6 +3,7 @@
 {% block title %}{{ 'developer.client.page_title'|trans }}{% endblock %}
 
 {% block content %}
+{{ parent() }}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 528b055c..53210688 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -3,6 +3,7 @@
 {% block title %}{{ 'developer.page_title'|trans }}{% endblock %}
 
 {% block content %}
+{{ parent() }}
 <div class="row">
     <div class="col s12">
         <div class="card-panel settings">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index 1cd3485c..ffd9b1b8 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'about.page_title'|trans }}{% endblock %}
 
 {% block content %}
-
+    {{ parent() }}
     <div class="row">
         <div class="col s12">
             <div class="card-panel settings">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
index 231f9bdf..4c598b85 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/howto.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
 
 {% block content %}
-
+    {{ parent() }}
     <div class="row">
         <div class="col s12">
             <div class="card-panel settings">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index 4580813c..70265be2 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
 
 {% block content %}
-
+    {{ parent() }}
     <div class="row quickstart">
         <div class="col s12">
             <div class="card-panel settings">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index a8143315..bd5932b0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'config.page_title'|trans }}{% endblock %}
 
 {% block content %}
-
+    {{ parent() }}
     <div class="row">
         <div class="col s12">
             <div class="card-panel settings">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 0c4dc80b..1cc5489f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -19,6 +19,7 @@
 {% endblock %}
 
 {% block content %}
+    {{ parent() }}
     {% set listMode = app.user.config.listMode %}
     {% set currentRoute = app.request.attributes.get('_route') %}
     <div class="results clearfix">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Notification/notifications.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Notification/notifications.html.twig
new file mode 100644
index 00000000..49cc0d40
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Notification/notifications.html.twig
@@ -0,0 +1,56 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ 'notifications.list.page_title' | trans }}{% endblock %}
+
+{% block content %}
+    {{ parent() }}
+    <div class="row notifications-page">
+        <div class="col l8 offset-l2">
+            {% if app.user.notifications is not empty %}
+                <div class="row">
+                    <a href="{{ path('notification-archive-all') }}" class="btn-light waves-effect waves-light right"><i class="material-icons">done_all</i> {{ 'notifications.list.mark_all_as_read' | trans }}</a>
+                </div>
+                <ul class="collection">
+                {% for notification in notifications | slice(0, 10) %}
+                    <li class="notification collection-item avatar{% if not notification.read %} light-blue lighten-5{% else %} grey-text{% endif %}">
+                        <i class="material-icons circle">{% spaceless %}
+                                {% if notification.type == constant('TYPE_ADMIN', notification) %}
+                                    build
+                                {% elseif notification.type == constant('TYPE_USER', notification) %}
+                                    person
+                                {% elseif notification.type == constant('TYPE_RELEASE', notification) %}
+                                    new_releases
+                                {% endif %}
+                            {% endspaceless %}</i>
+                        <span class="title">{{ notification.title | trans(notification.parameters) }}</span>
+                        <p>{{ notification.description | trans | trans(notification.parameters) }}</p>
+                        <time datetime="{{ notification.timestamp | date }}">{{ notification.timestamp | time_diff }}</time>
+                        <div class="secondary-content">
+                            {% if not notification.read %}
+                                {% for action in notification.actions %}
+                                    <a class="notification-action btn waves-effect waves-light {% spaceless %}
+                                       {% if action.type == constant('TYPE_OK', action) %}
+                                       {% elseif action.type == constant('TYPE_YES', action) %}
+                                            cyan
+                                       {% elseif action.type == constant('TYPE_NO', action) %}
+                                            red
+                                       {% elseif action.type == constant('TYPE_INFO', action) %}
+                                            blue-grey
+                                       {% endif %}
+                                        {% endspaceless %}" data-id="{{ notification.id }}" href="{{ path('notification-archive-redirect', {'redirection': action.link, 'notification': notification.id}) }}">{{ action.label | trans(notification.parameters) }}</a>
+                                {% endfor %}
+                            <a href="{{ path('notification-archive', {'notification': notification.id}) }}" class="notification-action waves-effect waves-teal btn-flat"><i class="material-icons">check</i></a>
+                            {% endif %}
+                        </div>
+                    </li>
+                {% endfor %}
+                </ul>
+            {% else %}
+                    {{ 'notifications.list.none' | trans }}
+            {% endif %}
+            {% if notifications.getNbPages > 1 %}
+                {{ pagerfanta(notifications, 'twitter_bootstrap_translated', {'proximity': 1}) }}
+            {% endif %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 97ddedc9..7a0f793c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -3,6 +3,7 @@
 {% block title %}{{ 'tag.page_title'|trans }}{% endblock %}
 
 {% block content %}
+    {{ parent() }}
     <div class="results clearfix">
         <div class="nb-results left">{{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}</div>
     </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 60907e11..ccc44931 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -110,6 +110,13 @@
                         <i class="material-icons">search</i>
                     </a>
                 </li>
+                <li id="button_notifications">
+                    {% set unreadNotifs = get_notifications() | unread_notif | length %}
+                    <a class="nav-panel-menu button-collapse-right tooltipped js-notifications-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.notifications' | trans }}" href="#" data-activates="notifications">
+                        <i class="material-icons">notifications{% if unreadNotifs == 0 %}_none{% endif %}</i>
+                        {% if unreadNotifs > 0 %}<span id="notifications-count" class="red-text text-accent-2">{{ unreadNotifs }}</span>{% endif %}
+                    </a>
+                </li>
                 <li id="button_filters">
                     <a class="nav-panel-menu button-collapse-right tooltipped js-filters-action" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
                         <i class="material-icons">filter_list</i>
@@ -135,6 +142,53 @@
     </nav>
 {% endblock %}
 
+{% block content %}
+
+    <div id="notifications" class="side-nav">
+        {% if app.user.notifications is not empty %}
+        <div class="notifications-area">
+            <ul class="collection">
+                {% for notification in get_notifications() | slice(0, 10) %}
+                <li class="notification collection-item avatar{% if not notification.read %} light-blue lighten-5{% else %} grey-text{% endif %}">
+                    <i class="material-icons circle">{% spaceless %}
+                        {% if notification.type == constant('TYPE_ADMIN', notification) %}
+                            build
+                        {% elseif notification.type == constant('TYPE_USER', notification) %}
+                            person
+                        {% elseif notification.type == constant('TYPE_RELEASE', notification) %}
+                            new_releases
+                        {% endif %}
+                        {% endspaceless %}</i>
+                    <span class="title">{{ notification.title | trans(notification.parameters) }}</span>
+                    <p>{{ notification.description | trans(notification.parameters) }}</p>
+                    <time datetime="{{ notification.timestamp | date }}">{{ notification.timestamp | time_diff }}</time>
+                    <div>
+                        {% for action in notification.actions %}
+                            <a class="notification-action-button btn waves-effect waves-light {% spaceless %}
+                                   {% if action.type == constant('TYPE_OK', action) %}
+                                   {% elseif action.type == constant('TYPE_YES', action) %}
+                                        cyan
+                                   {% elseif action.type == constant('TYPE_NO', action) %}
+                                        red
+                                   {% elseif action.type == constant('TYPE_INFO', action) %}
+                                        blue-grey
+                                   {% endif %}
+                                   {% if notification.read %}lighten-3{% endif %}
+                                    {% endspaceless %}" href="{{ path('notification-archive-redirect', {'redirection': action.link, 'notification': notification.id}) }}">{{ action.label | trans(notification.parameters) }}</a>
+                        {% endfor %}
+                    </div>
+                </li>
+                {% endfor %}
+            </ul>
+        </div>
+        <a href="{{ path('notification-archive-all') }}" class="btn-light waves-effect waves-light right"><i class="material-icons">done_all</i> {{ 'notifications.list.mark_all_as_read' | trans }}</a>
+        <a class="waves-effect waves-light btn view-more" href="{{ path('notifications-all') }}">{{ 'notifications.sidebar.view_more' | trans }}</a>
+        {% else %}
+            <div class="no-notifications grey-text">{{ 'notifications.list.none' | trans }}</div>
+        {% endif %}
+    </div>
+{% endblock %}
+
 {% block footer %}
     <footer class="page-footer cyan darken-2">
         <div class="footer-copyright">