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

Merge branch 'roymckenzie-body-classes' into develop

Browse source
This commit is contained in:
Florian Staudacher 2014-11-07 16:40:07 +01:00
commit c7f4051ac0
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -96,6 +96,7 @@ This maintenance is not enabled by default. Podmins can enable it by for example
* Maintenance feature to automatically expire inactive accounts [#5288](https://github.com/diaspora/diaspora/pull/5288) * Maintenance feature to automatically expire inactive accounts [#5288](https://github.com/diaspora/diaspora/pull/5288)
* Add LibreJS markers to JavaScript [5320](https://github.com/diaspora/diaspora/pull/5320) * Add LibreJS markers to JavaScript [5320](https://github.com/diaspora/diaspora/pull/5320)
* Ask for confirmation when leaving a submittable publisher [#5309](https://github.com/diaspora/diaspora/pull/5309) * Ask for confirmation when leaving a submittable publisher [#5309](https://github.com/diaspora/diaspora/pull/5309)
* Allow page-specific styling via individual CSS classes [#5282](https://github.com/diaspora/diaspora/pull/5282)
# 0.4.1.2 # 0.4.1.2

2
app/views/layouts/application.html.haml
View file

@ -52,7 +52,7 @@
= include_gon(:camel_case => true) = include_gon(:camel_case => true)
%body %body{ :class => "page-#{controller_name} action-#{action_name}" }
= flash_messages = flash_messages
= yield :before_content = yield :before_content