Merge branch 'soon' into staging

www/common/outer/async-store.js

@@ -1816,8 +1816,8 @@ define([
 
             // Ping clients regularly to make sure one tab was not closed without sending a removeClient()
             // command. This allow us to avoid phantom viewers in pads.
-            var PING_INTERVAL = 30000;
-            var MAX_PING = 5000;
+            var PING_INTERVAL = 120000;
+            var MAX_PING = 30000;
             var MAX_FAILED_PING = 2;
 
             setInterval(function () {

www/common/toolbar3.js

@@ -304,8 +304,10 @@ MessengerUI, Messages) {
             } else if (Common.isLoggedIn() && data.curvePublic && !friends[data.curvePublic]
                 && !priv.readOnly) {
                 if (pendingFriends[data.curvePublic] && pendingFriends[data.curvePublic] > friendTo) {
-                    $('<span>', {'class': 'cp-toolbar-userlist-friend'}).text(Messages.userlist_pending)
-                        .appendTo($rightCol);
+                    $('<button>', {
+                        'class': 'fa fa-hourglass-half cp-toolbar-userlist-button',
+                        'title': Messages.profile_friendRequestSent
+                    }).appendTo($nameSpan);
                 } else if (friendRequests[data.curvePublic]) {
                     $('<button>', {
                         'class': 'fa fa-bell cp-toolbar-userlist-button',

www/common/translations/messages.json

@@ -278,13 +278,8 @@
     "profile_create": "Create a profile",
     "profile_description": "Description",
     "profile_fieldSaved": "New value saved: {0}",
-    "profile_inviteButton": "Connect",
-    "profile_inviteButtonTitle": "Create a link that will invite this user to connect with you.",
-    "profile_inviteExplanation": "Clicking <strong>OK</strong> will create a link to a secure messaging session that <em>only {0} will be able to redeem.</em><br><br>The link will be copied to your clipboard and can be shared publicly.",
     "profile_viewMyProfile": "View my profile",
     "userlist_addAsFriendTitle": "Send \"{0}\" a friend request",
-    "userlist_thisIsYou": "This is you (\"{0}\")",
-    "userlist_pending": "Pending...",
     "contacts_title": "Contacts",
     "contacts_addError": "Error while adding that contact to the list",
     "contacts_added": "Contact invite accepted.",