Merge branch 'next-minor' into develop

This commit is contained in:
Benjamin Neff 2016-09-13 01:00:13 +02:00
commit 36b2dff164
5 changed files with 5 additions and 5 deletions

View file

@ -14,7 +14,7 @@
* Make the session cookies HttpOnly again [#7041](https://github.com/diaspora/diaspora/pull/7041)
* Invalidate sessions with invalid CSRF tokens [#7050](https://github.com/diaspora/diaspora/pull/7050)
* Liking a post will no longer update its interacted timestamp [#7030](https://github.com/diaspora/diaspora/pull/7030)
* Improve W3C compliance [#7068](https://github.com/diaspora/diaspora/pull/7068) [#7082](https://github.com/diaspora/diaspora/pull/7082)
* Improve W3C compliance [#7068](https://github.com/diaspora/diaspora/pull/7068) [#7082](https://github.com/diaspora/diaspora/pull/7082) [#7091](https://github.com/diaspora/diaspora/pull/7091)
* Load jQuery in the head on mobile [#7086](https://github.com/diaspora/diaspora/pull/7086)
## Bug fixes

View file

@ -14,7 +14,7 @@
.stream#main_stream
#paginate
%span.loader.hidden
.loader.hidden
.spinner
- if current_user.contacts.size < 2

View file

@ -30,7 +30,7 @@
= t('invitations.new.invite_someone_to_join')
#paginate
%span.loader.hidden
.loader.hidden
.spinner
-if @aspect

View file

@ -27,7 +27,7 @@
-# JS
#paginate
%span.loader.hidden
.loader.hidden
.spinner
%a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}

View file

@ -31,7 +31,7 @@
#main_stream.stream
#paginate
%span.loader.hidden
.loader.hidden
.spinner
%a.entypo-chevron-up.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}