Merge branch 'stable' into develop

Changelog.md

@@ -92,6 +92,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267)
 * Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286)
 * Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339)
+* Fix pagination design on notifications page [#6364](https://github.com/diaspora/diaspora/pull/6364)
 
 ## Features
 

app/assets/stylesheets/mobile/mobile.scss

@@ -647,7 +647,7 @@ form#new_user.new_user input.btn {
   text-shadow: 1px 1px 20px rgb(126, 240, 77);
 }
 
-#conversation_inbox {
+#conversation_inbox, .notifications {
   div.pagination {
     width: 100%;
     margin-left: auto;

app/views/notifications/index.mobile.haml

@@ -24,4 +24,9 @@
                   .time_notif
                     = timeago(note.created_at)
 
-  = will_paginate @notifications, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
+  = will_paginate @notifications,
+    previous_label: "«",
+    next_label: "»",
+    inner_window: 1,
+    outer_window: 0,
+    renderer: WillPaginate::ActionView::BootstrapLinkRenderer