Merge branch 'develop' into release-v1.0.0

Author: jryans

res/css/structures/_TabbedView.scss

@@ -64,7 +64,7 @@ limitations under the License.
     background-color: $tab-label-icon-bg-color;
     mask-repeat: no-repeat;
     mask-size: 16px;
-    width: 14px;
+    width: 16px;
     height: 22px;
     mask-position: center;
     content: '';

res/css/views/context_menus/_TopLeftMenu.scss

@@ -31,10 +31,6 @@ limitations under the License.
             mask-image: url('$(res)/img/feather-icons/home.svg');
         }
 
-        li.mx_TopLeftMenu_icon_welcome::after {
-            mask-image: url('$(res)/img/feather-icons/gift.svg');
-        }
-
         li.mx_TopLeftMenu_icon_settings::after {
             mask-image: url('$(res)/img/feather-icons/settings.svg');
         }

res/css/views/elements/_ImageView.scss

@@ -77,7 +77,8 @@ limitations under the License.
 
 .mx_ImageView_cancel {
     position: absolute;
-    top: 0px;
+    // hack for mx_Dialog having a top padding of 40px
+    top: 40px;
     right: 0px;
     padding: 35px;
     cursor: pointer;

res/css/views/rooms/_EventTile.scss

@@ -278,6 +278,10 @@ limitations under the License.
 
 /* End to end encryption stuff */
 
+.mx_EventTile_e2eIcon:hover {
+    opacity: 1;
+}
+
 .mx_EventTile_e2eIcon {
     display: block;
     position: absolute;
@@ -289,6 +293,7 @@ limitations under the License.
     mask-size: 14px;
     mask-repeat: no-repeat;
     mask-position: 0;
+    opacity: 0.2;
 }
 
 .mx_EventTile_e2eIcon_undecryptable, .mx_EventTile_e2eIcon_unverified {

res/img/feather-icons/gift.svg

@@ -31,6 +31,7 @@ import sessionStore from '../../stores/SessionStore';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 import RoomListStore from "../../stores/RoomListStore";
+import { getHomePageUrl } from '../../utils/pages';
 
 import TagOrderActions from '../../actions/TagOrderActions';
 import RoomListActions from '../../actions/RoomListActions';
@@ -459,17 +460,7 @@ const LoggedInView = React.createClass({
 
             case PageTypes.HomePage:
                 {
-                    const pagesConfig = this.props.config.embeddedPages;
-                    let pageUrl = null;
-                    if (pagesConfig) {
-                        pageUrl = pagesConfig.homeUrl;
-                    }
-                    if (!pageUrl) {
-                        // This is a deprecated config option for the home page
-                        // (despite the name, given we also now have a welcome
-                        // page, which is not the same).
-                        pageUrl = this.props.config.welcomePageUrl;
-                    }
+                    const pageUrl = getHomePageUrl(this.props.config);
                     pageElement = <EmbeddedPage className="mx_HomePage"
                         url={pageUrl}
                         scrollbar={true}

src/components/structures/LoggedInView.js

@@ -40,6 +40,7 @@ import * as Lifecycle from '../../Lifecycle';
 // LifecycleStore is not used but does listen to and dispatch actions
 require('../../stores/LifecycleStore');
 import PageTypes from '../../PageTypes';
+import { getHomePageUrl } from '../../utils/pages';
 
 import createRoom from "../../createRoom";
 import KeyRequestHandler from '../../KeyRequestHandler';
@@ -1198,8 +1199,12 @@ export default React.createClass({
         } else {
             if (MatrixClientPeg.get().isGuest()) {
                 dis.dispatch({action: 'view_welcome_page'});
-            } else {
+            } else if (getHomePageUrl(this.props.config)) {
                 dis.dispatch({action: 'view_home_page'});
+            } else {
+                this.firstSyncPromise.promise.then(() => {
+                    dis.dispatch({action: 'view_next_room'});
+                });
             }
         }
     },

src/components/structures/MatrixChat.js

@@ -211,6 +211,14 @@ module.exports = React.createClass({
         // forget what we wanted, so don't overwrite the saved state unless
         // this appears to be a user-initiated scroll.
         if (sn.scrollTop != this._lastSetScroll) {
+            // when scrolling, we don't care about disappearing typing notifs shrinking the timeline
+            // this might cause the scrollbar to resize in case the max-height was not correct
+            // but that's better than ending up with a lot of whitespace at the bottom of the timeline.
+            // we need to above check because when showing the typing notifs, an onScroll event is also triggered
+            if (!this.isAtBottom()) {
+                this.clearBlockShrinking();
+            }
+
             this._saveScrollState();
         } else {
             debuglog("Ignoring scroll echo");

src/components/structures/ScrollPanel.js

@@ -26,7 +26,6 @@ export class TopLeftMenu extends React.Component {
     constructor() {
         super();
         this.viewHomePage = this.viewHomePage.bind(this);
-        this.viewWelcomePage = this.viewWelcomePage.bind(this);
         this.openSettings = this.openSettings.bind(this);
         this.signIn = this.signIn.bind(this);
         this.signOut = this.signOut.bind(this);
@@ -67,9 +66,6 @@ export class TopLeftMenu extends React.Component {
 
         return <div className="mx_TopLeftMenu">
             {homePageSection}
-            <ul className="mx_TopLeftMenu_section">
-                <li className="mx_TopLeftMenu_icon_welcome" onClick={this.viewWelcomePage}>{_t("Welcome")}</li>
-            </ul>
             <ul className="mx_TopLeftMenu_section">
                 <li className="mx_TopLeftMenu_icon_settings" onClick={this.openSettings}>{_t("Settings")}</li>
             </ul>
@@ -82,11 +78,6 @@ export class TopLeftMenu extends React.Component {
         this.closeMenu();
     }
 
-    viewWelcomePage() {
-        dis.dispatch({action: 'view_welcome_page'});
-        this.closeMenu();
-    }
-
     openSettings() {
         dis.dispatch({action: 'view_user_settings'});
         this.closeMenu();

src/components/views/context_menus/TopLeftMenu.js

@@ -20,14 +20,12 @@ import { _t } from '../../../languageHandler';
 
 export default (props) => {
     const existingIssuesUrl = "https://github.com/vector-im/riot-web/issues" +
-        "?q=is%3Aopen+is%3Aissue+label%3Aredesign+sort%3Areactions-%2B1-desc";
-    const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new" +
-        "?assignees=&labels=redesign&template=redesign_issue.md&title=";
+        "?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
+    const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new";
 
     const description1 =
-        _t("Thanks for testing the Riot Redesign. " +
-            "If you run into any bugs or visual issues, " +
-            "please let us know on GitHub.");
+        _t("If you run into any bugs or have feedback you'd like to share, " +
+           "please let us know on GitHub.");
     const description2 = _t("To help avoid duplicate issues, " +
         "please <existingIssuesLink>view existing issues</existingIssuesLink> " +
         "first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> " +