Commit 0881810f authored by Jonne Haß's avatar Jonne Haß

Merge branch 'release/0.5.0.0-RC' into develop

parents 606d7499 5c78ab68
# Head
# 0.5.0.0
## Major Sidekiq update
This release includes a major upgrade of the background processing system Sidekiq. To upgrade cleanly:
......
......@@ -92,7 +92,7 @@ gem "js-routes", "1.0.0"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.1" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "4.0.3"
gem "rails-assets-markdown-it", "4.1.0"
gem "rails-assets-markdown-it-hashtag", "0.3.0"
gem "rails-assets-markdown-it-diaspora-mention", "0.3.0"
gem "rails-assets-markdown-it-sanitizer", "0.3.0"
......
......@@ -510,7 +510,7 @@ GEM
rails-assets-jquery.slimscroll (1.3.3)
rails-assets-jquery (>= 1.7)
rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
rails-assets-markdown-it (4.0.3)
rails-assets-markdown-it (4.1.0)
rails-assets-markdown-it-diaspora-mention (0.3.0)
rails-assets-markdown-it-hashtag (0.3.0)
rails-assets-markdown-it-sanitizer (0.3.0)
......@@ -776,7 +776,7 @@ DEPENDENCIES
rails-assets-jquery-idletimer (= 1.0.1)!
rails-assets-jquery-placeholder (= 2.1.1)!
rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 4.0.3)!
rails-assets-markdown-it (= 4.1.0)!
rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)!
rails-assets-markdown-it-diaspora-mention (= 0.3.0)!
rails-assets-markdown-it-hashtag (= 0.3.0)!
......
#conversations_container {
.stream_container { border-left: none; }
.stream_element {
border-bottom: 1px solid $border-grey;
&:first-child { border-top: none; }
......
......@@ -7,9 +7,7 @@ module ContactsHelper
end
def start_a_conversation_link(aspect, contacts_size)
suggested_limit = 16
conv_opts = { class: "conversation_button contacts_button"}
conv_opts[:title] = t('.many_people_are_you_sure', suggested_limit: suggested_limit) if contacts_size > suggested_limit
content_tag :span, conv_opts do
content_tag(:i, nil, :class => 'entypo mail contacts-header-icon', :title => t('contacts.index.start_a_conversation'), 'data-toggle' => 'modal', 'data-target' => '#conversationModal')
......
......@@ -4,7 +4,7 @@
defaults:
version:
number: "head" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
number: "0.5.0.0" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
heroku: false
environment:
url: "http://localhost:3000/"
......
......@@ -324,7 +324,6 @@ en:
only_sharing_with_me: "Only sharing with me"
add_contact: "Add contact"
remove_contact: "Remove contact"
many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
user_search: "Contact search"
spotlight:
community_spotlight: "Community spotlight"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment