Merge branch 'stable' into develop

This commit is contained in:
Dennis Schubert 2016-02-08 08:21:35 +01:00
commit 5b21be845e
2 changed files with 5 additions and 1 deletions

View file

@ -132,6 +132,7 @@ Contributions are very welcome, the hard work is done!
* Ensure the rubyzip gem is properly loaded [#6659](https://github.com/diaspora/diaspora/pull/6659)
* Fix mobile registration layout after failed registration [#6677](https://github.com/diaspora/diaspora/pull/6677)
* Fix mirrored names when using a RTL language [#6680](https://github.com/diaspora/diaspora/pull/6680)
* Disable submitting a post multiple times in the mobile UI [#6682](https://github.com/diaspora/diaspora/pull/6682)
## Features
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)

View file

@ -32,7 +32,10 @@
#file-upload-publisher{title: t('shared.publisher.upload_photos'), class: 'btn btn-default'}
%i.entypo-camera.middle
#publisher_mobile
= submit_tag t('shared.publisher.share'), class: 'btn btn-primary', id: "submit_new_message"
= submit_tag t("shared.publisher.share"),
class: "btn btn-primary",
id: "submit_new_message",
data: {"disable-with" => t("shared.publisher.posting")}
.clearfix
#publisher_photo_upload