Merge branch 'develop' into blade-Finish_weeklies_pr

2015-06-04 12:45:23 -05:00
parent 076f7f0db9 865f7651a9
commit db38663f94
9 changed files with 95 additions and 9 deletions
@@ -32,5 +32,8 @@

    // party
    span(ng-controller='PartyCtrl')
+      button.party-invite.pull-right.btn.btn-primary(ng-click="inviteOrStartParty(group)",
+        ng-if="(!party.members || party.memberCount === 1) && user.preferences.displayInviteToPartyWhenPartyIs1",
+        popover="{{!party.members ? env.t('startAParty') : env.t('addToParty')}}", popover-placement="left", popover-trigger="mouseenter")=env.t("inviteFriends")
      .herobox-wrap(ng-repeat='profile in partyMinusSelf')
        +herobox()