Merge branch 'next-minor' into develop

app/assets/javascripts/app/router.js

@@ -18,7 +18,7 @@ app.Router = Backbone.Router.extend({
     "mentions(/)": "stream",
     "notifications(/)": "notifications",
     "p/:id(/)": "singlePost",
-    "people(/)": "pageWithAspectMembershipDropdowns",
+    "people(/)": "peopleSearch",
     "people/:id(/)": "profile",
     "people/:id/contacts(/)": "profile",
     "people/:id/photos(/)": "photos",
@@ -137,6 +137,14 @@ app.Router = Backbone.Router.extend({
     new app.views.Notifications({el: "#notifications_container"});
   },
 
+  peopleSearch: function() {
+    this._loadContacts();
+    this.renderAspectMembershipDropdowns($(document));
+    $(".invitations-link").click(function() {
+      app.helpers.showModal("#invitationsModal");
+    });
+  },
+
   photos: function(guid) {
     this._loadContacts();
     this.renderPage(function() {
@@ -214,11 +222,6 @@ app.Router = Backbone.Router.extend({
     app.contacts = new app.collections.Contacts(app.parsePreload("contacts"));
   },
 
-  pageWithAspectMembershipDropdowns: function() {
-    this._loadContacts();
-    this.renderAspectMembershipDropdowns($(document));
-  },
-
   renderAspectMembershipDropdowns: function($context) {
     $context.find(".aspect_membership_dropdown.placeholder").each(function() {
       var personId = $(this).data("personId");

app/assets/templates/profile_sidebar_tpl.jst.hbs

@@ -11,7 +11,7 @@
       {{#if bio}}
         <li>
           <h4>{{t 'profile.bio'}}</h4>
-          <div class="{{txtDirClass bio}}">{{fmtText bio}}</div>
+          <div class="{{txtDirClass bio}} markdown-content">{{fmtText bio}}</div>
         </li>
       {{/if}}
       {{#if location}}

config/locales/diaspora/en.yml

@@ -1044,7 +1044,7 @@ en:
     invitations:
       invites: "Invites"
       invite_your_friends: "Invite your friends"
-      by_email: "By email"
+      by_email: "Invite people by email"
       share_this: "Share this link via email, blog, or social networks!"
     public_explain:
       control_your_audience: "Control your audience"

db/migrate/20160822212739_remove_started_sharing_notifications_without_contact.rb

@@ -5,7 +5,8 @@ class RemoveStartedSharingNotificationsWithoutContact < ActiveRecord::Migration
   def up
     Notification.where(type: "Notifications::StartedSharing", target_type: "Person")
                 .joins("INNER JOIN people ON people.id = notifications.target_id")
-                .joins("LEFT OUTER JOIN contacts ON contacts.person_id = people.id")
+                .joins("LEFT OUTER JOIN contacts ON contacts.person_id = people.id " \
+                       "AND contacts.user_id = notifications.recipient_id")
                 .delete_all("contacts.id IS NULL")
   end
 end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160820181334) do
+ActiveRecord::Schema.define(version: 20160822212739) do
 
   create_table "account_deletions", force: :cascade do |t|
     t.string   "diaspora_handle", limit: 255

features/desktop/invitations.feature

@@ -48,3 +48,14 @@ Feature: Invitations
     And I press "Send an invitation"
     Then I should have 1 Devise email delivery
     And I should not see "change your notification settings" in the last sent email
+
+  Scenario: sends an invitation from the people search page
+    When I sign in as "alice@alice.alice"
+    And I search for "test"
+    Then I should see "Users matching test" within "#search_title"
+    When I click on selector "#invitations-button"
+    And I fill in the following:
+      | email_inviter_emails         | alex@example.com    |
+    And I press "Send an invitation"
+    Then I should have 1 Devise email delivery
+    And I should not see "change your notification settings" in the last sent email