nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2015-07-07 02:51:38 +02:00
commit c703cadf9b
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -58,7 +58,6 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
* Fix wrong closing a-tag [#6111](https://github.com/diaspora/diaspora/pull/6111) * Fix wrong closing a-tag [#6111](https://github.com/diaspora/diaspora/pull/6111)
* Fix mobile more-button wording when there are less than 15 posts [#6118](https://github.com/diaspora/diaspora/pull/6118) * Fix mobile more-button wording when there are less than 15 posts [#6118](https://github.com/diaspora/diaspora/pull/6118)
* Fix reappearing flash boxes during sign-in [#6146](https://github.com/diaspora/diaspora/pull/6146) * Fix reappearing flash boxes during sign-in [#6146](https://github.com/diaspora/diaspora/pull/6146)
* Fix the kittens posioin on 404 pages [#6169](https://github.com/diaspora/diaspora/pull/6169)
## Features ## Features
* Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090) * Add configuration options for some debug logs [#6090](https://github.com/diaspora/diaspora/pull/6090)

1
app/assets/stylesheets/new_styles/_base.scss
View file

@ -2,7 +2,6 @@ html,
body { body {
/* hack to ensure fixed elements at height: 100%; are in relation to the window */ /* hack to ensure fixed elements at height: 100%; are in relation to the window */
max-height : 100%; max-height : 100%;
height: 100%;
} }
body { body {