Merge branch 'develop' into t3chguy/devtools

README.md

@@ -16,7 +16,7 @@ released version of Riot:
 
 1. Download the latest version from https://github.com/vector-im/riot-web/releases
 1. Untar the tarball on your web server
-1. Move (or symlink) the vector-x.x.x directory to an appropriate name
+1. Move (or symlink) the riot-x.x.x directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
    as desired. See below for details.
 1. Enter the URL into your browser and log into Riot!

src/components/structures/LoginBox.js

@@ -84,7 +84,7 @@ module.exports = React.createClass({
 
         var self = this;
         return (
-            <div className="mx_SearchBox">
+            <div className="mx_SearchBox mx_LoginBox">
                 { loginButton }
                 { toggleCollapse }
             </div>

src/components/structures/RoomSubList.js

@@ -78,6 +78,9 @@ var RoomSubList = React.createClass({
         // undefined if no room is selected (eg we are showing settings)
         selectedRoom: React.PropTypes.string,
 
+        // passed through to RoomTile and used to highlight room with `!` regardless of notifications count
+        isInvite: React.PropTypes.bool,
+
         startAsHidden: React.PropTypes.bool,
         showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded
         collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?
@@ -246,7 +249,7 @@ var RoomSubList = React.createClass({
         return this.props.list.reduce(function(result, room, index) {
             if (truncateAt === undefined || index >= truncateAt) {
                 var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
-                var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites';
+                var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite;
                 var notificationCount = room.getUnreadNotificationCount();
 
                 const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState);
@@ -376,8 +379,8 @@ var RoomSubList = React.createClass({
                     collapsed={ self.props.collapsed || false}
                     selected={ selected }
                     unread={ Unread.doesRoomHaveUnreadMessages(room) }
-                    highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
+                    highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite }
-                    isInvite={ self.props.label === 'Invites' }
+                    isInvite={ self.props.isInvite }
                     refreshSubList={ self._updateSubListCount }
                     incomingCall={ null }
                     onClick={ self.onRoomTileClick }
@@ -409,6 +412,9 @@ var RoomSubList = React.createClass({
         var badge;
         if (subListNotifCount > 0) {
             badge = <div className={badgeClasses}>{ FormattingUtils.formatCount(subListNotifCount) }</div>;
+        } else if (this.props.isInvite) {
+            // no notifications but highlight anyway because this is an invite badge
+            badge = <div className={badgeClasses}>!</div>;
         }
 
         // When collapsed, allow a long hover on the header to show user

src/components/views/dialogs/BugReportDialog.js

@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import sdk from 'matrix-react-sdk';
 import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
+import Modal from 'matrix-react-sdk/lib/Modal';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 export default class BugReportDialog extends React.Component {
@@ -64,8 +65,13 @@ export default class BugReportDialog extends React.Component {
                 progressCallback: this._sendProgressCallback,
             }).then(() => {
                 if (!this._unmounted) {
-                    this.setState({ busy: false, progress: null });
                     this.props.onFinished(false);
+                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                    Modal.createTrackedDialog('Bug report sent', '', QuestionDialog, {
+                        title: _t('Bug report sent'),
+                        description: _t('Thank you!'),
+                        hasCancelButton: false,
+                    });
                 }
             }, (err) => {
                 if (!this._unmounted) {

src/components/views/login/VectorLoginFooter.js

@@ -30,7 +30,7 @@ module.exports = React.createClass({
             <div className="mx_Login_links">
                 <a href="https://medium.com/@RiotChat">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://twitter.com/@RiotChat">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-                <a href="https://github.com/vector-im/vector-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
+                <a href="https://github.com/vector-im/riot-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://matrix.org">{ _t('powered by Matrix') }</a>
             </div>
         );

src/i18n/strings/en_EN.json

@@ -10,6 +10,7 @@
   "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
   "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
   "Back": "Back",
+  "Bug report sent": "Bug report sent",
   "Call invitation": "Call invitation",
   "Cancel": "Cancel",
   "Cancel Sending": "Cancel Sending",
@@ -155,6 +156,7 @@
   "You are not receiving desktop notifications": "You are not receiving desktop notifications",
   "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
   "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
+  "Thank you!": "Thank you!",
   "Sunday": "Sunday",
   "Monday": "Monday",
   "Tuesday": "Tuesday",

src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss

@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_LoginBox {
+    min-height: 24px;
+    height: unset !important;
+    padding-top: 13px !important;
+    padding-bottom: 14px !important;
+}
+
 .mx_LoginBox_loginButton_wrapper {
     text-align: center;
     width: 100%;
@@ -21,13 +28,13 @@ limitations under the License.
 
 .mx_LoginBox_loginButton,
 .mx_LoginBox_registerButton {
-    margin-top: -8px;
+    margin-top: 3px;
     height: 40px;
     border: 0px;
     border-radius: 40px;
     margin-left: 4px;
     margin-right: 4px;
-    width: 80px;
+    min-width: 80px;
 
     background-color: $accent-color;
     color: $primary-bg-color;
@@ -35,4 +42,6 @@ limitations under the License.
     cursor: pointer;
 
     font-size: 15px;
+    padding: 0 11px;
+    word-break: break-word;
 }