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:
Steffen van Bergerem 2015-06-19 21:30:15 +02:00
commit 078e7a722f
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -47,6 +47,7 @@ bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
## Refactor ## Refactor
* Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085) * Update perfect-scrollbar [#6085](https://github.com/diaspora/diaspora/pull/6085)
* Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110) * Remove top margin for first heading in a post [#6110](https://github.com/diaspora/diaspora/pull/6110)
* Add link to pod statistics in right navigation [#6117](https://github.com/diaspora/diaspora/pull/6117)
## Bug fixes ## Bug fixes
* Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105) * Precompile facebox images [#6105](https://github.com/diaspora/diaspora/pull/6105)

1
app/views/shared/_links.haml
View file

@ -2,6 +2,7 @@
%li= link_to 'wiki', "https://wiki.diasporafoundation.org" %li= link_to 'wiki', "https://wiki.diasporafoundation.org"
%li= link_to t('layouts.application.whats_new'), changelog_url %li= link_to t('layouts.application.whats_new'), changelog_url
%li= link_to t('layouts.header.code') + " " + pod_version, "#{source_url}", {:title => t('layouts.application.source_package')} %li= link_to t('layouts.header.code') + " " + pod_version, "#{source_url}", {:title => t('layouts.application.source_package')}
%li= link_to t("layouts.application.statistics_link"), statistics_path
%li= link_to(t('layouts.application.toggle'), toggle_mobile_path) %li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
- if AppConfig.settings.terms.enable? - if AppConfig.settings.terms.enable?
%li= link_to(t('_terms'), terms_path) %li= link_to(t('_terms'), terms_path)

1
config/locales/diaspora/en.yml
View file

@ -645,6 +645,7 @@ en:
application: application:
powered_by: "Powered by diaspora*" powered_by: "Powered by diaspora*"
whats_new: "What’s new?" whats_new: "What’s new?"
statistics_link: "Pod statistics"
toggle: "Toggle mobile" toggle: "Toggle mobile"
public_feed: "Public diaspora* feed for %{name}" public_feed: "Public diaspora* feed for %{name}"
your_aspects: "Your aspects" your_aspects: "Your aspects"