Merge branch 'develop' into matthew/notif-panel

CHANGELOG.md

@@ -1,3 +1,16 @@
+Changes in [0.7.5-r3](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r3) (2016-09-02)
+==================================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r2...v0.7.5-r3)
+
+ * Bump to matrix-react-sdk 0.6.5-r3 in order to fix bug #2020 (tightloop when flooded with join events)
+
+
+Changes in [0.7.5-r2](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r2) (2016-09-01)
+==================================================================================================
+[Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5-r1...v0.7.5-r2)
+
+ * Bump to matrix-react-sdk 0.6.5-r1 in order to fix guest access
+
 Changes in [0.7.5-r1](https://github.com/vector-im/vector-web/releases/tag/v0.7.5-r1) (2016-08-28)
 ==================================================================================================
 [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.7.5...v0.7.5-r1)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vector-web",
-  "version": "0.7.5-r1",
+  "version": "0.7.5-r3",
   "description": "Vector webapp",
   "author": "matrix.org",
   "repository": {
@@ -90,6 +90,6 @@
     "webpack": "^1.12.14"
   },
   "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-1.0.0.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-1.1.0.tgz"
   }
 }

src/components/structures/LeftPanel.js

@@ -109,7 +109,7 @@ var LeftPanel = React.createClass({
             var CallView = sdk.getComponent('voip.CallView');
             callPreview = (
                 <CallView
-                    className="mx_LeftPanel_callView" onClick={this.onCallViewClick}
+                    className="mx_LeftPanel_callView" showVoice={true} onClick={this.onCallViewClick}
                     ConferenceHandler={VectorConferenceHandler} />
             );
         }

src/components/views/dialogs/ChangelogDialog.js

@@ -50,9 +50,11 @@ export default class ChangelogDialog extends React.Component {
             return (
                 <div key={repo}>
                     <h2>{repo}</h2>
+                    <ul>
                     {this.state[repo].map(commit =>
-                        <div key={commit.commit.url}><a href={commit.commit.url}>{commit.commit.message}</a></div>
+                        <li key={commit.commit.url} className="mx_ChangelogDialog_li"><a href={commit.commit.url}>{commit.commit.message}</a></li>
                     )}
+                    </ul>
                 </div>
             )
         });

src/components/views/settings/Notifications.js

@@ -843,7 +843,7 @@ module.exports = React.createClass({
                                     <th width="55%"></th>
                                     <th width="15%">Off</th>
                                     <th width="15%">On</th>
-                                    <th width="15%">Highlight<br/>&amp; sound</th>
+                                    <th width="15%">Noisy</th>
                                 </tr>
                             </thead>
                             <tbody>

src/skins/vector/css/common.css

@@ -153,6 +153,8 @@ input[type=text]:focus, textarea:focus {
     width: 60%;
     max-width: 704px;
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
+    max-height: 80%;
+    overflow-y: auto;
 }
 
 .mx_Dialog_background {

src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 .mx_RoomStatusBar {
-    margin-top: 15px;
     margin-left: 65px;
     min-height: 34px;
 }
@@ -25,11 +24,17 @@ limitations under the License.
     padding-left: 18px;
     padding-right: 12px;
     margin-left: -73px;
+    margin-top: 13px;
     float: left;
     width: 24px;
     text-align: center;
 }
 
+.mx_RoomStatusBar_callBar {
+    height: 50px;
+    line-height: 50px;
+}
+
 .mx_RoomStatusBar_placeholderIndicator span {
     color: #4a4a4a;
     opacity: 0.5;
@@ -70,6 +75,7 @@ limitations under the License.
 }
 
 .mx_RoomStatusBar_unreadMessagesBar {
+    padding-top: 10px;
     color: #ff0064;
     cursor: pointer;
 }
@@ -103,10 +109,12 @@ limitations under the License.
 }
 
 .mx_RoomStatusBar_tabCompleteBar {
+    padding-top: 10px;
     color: #4a4a4a;
 }
 
 .mx_RoomStatusBar_typingBar {
+    padding-top: 10px;
     color: #4a4a4a;
     opacity: 0.5;
     overflow-y: hidden;

src/skins/vector/css/matrix-react-sdk/structures/RoomView.css

@@ -207,7 +207,7 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_statusAreaBox {
     max-width: 960px;
     margin: auto;
-    min-height: 60px;
+    min-height: 50px;
 }
 
 .mx_RoomView_statusAreaBox_line {
@@ -216,6 +216,15 @@ hr.mx_RoomView_myReadMarker {
     height: 1px;
 }
 
+.mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
+    background-color: #fff;
+}
+
+.mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {
+    color: #fff;
+    opacity: 1.0;
+}
+
 .mx_RoomView_inCall .mx_RoomView_statusAreaBox_line {
     border-top: 1px hidden;
 }
@@ -239,6 +248,7 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_voipButton {
     float: right;
     margin-right: 13px;
+    margin-top: 10px;
     cursor: pointer;
 }
 
@@ -268,3 +278,7 @@ hr.mx_RoomView_myReadMarker {
     padding: 6px 0;
     cursor: pointer;
 }
+
+.mx_RoomView_ongoingConfCallNotification a {
+    color: #fff ! important;
+}

src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css

@@ -34,6 +34,8 @@ limitations under the License.
     padding-bottom: 2px;
     margin-bottom: 6px;
     border-radius: 30px;
+    position: relative;
+    top: 1px;
 }
 
 .mx_TabCompleteBar_command .mx_TabCompleteBar_text {

src/skins/vector/css/matrix-react-sdk/views/voip/CallView.css

@@ -12,4 +12,14 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-*/
+*/
+
+.mx_CallView_voice {
+    background-color: #76cfa6;
+    color: #fff;
+    cursor: pointer;
+    text-align: center;
+    padding: 6px;
+    font-weight: bold;
+    font-size: 13px;
+}

src/skins/vector/css/vector-web/views/dialogs/ChangelogDialog.css

@@ -18,3 +18,7 @@ limitations under the License.
     max-height: 300px;
     overflow: auto;
 }
+
+.mx_ChangelogDialog_li {
+    padding: 0.2em;
+}

vector/index.html

@@ -49,6 +49,7 @@
         <source src="media/busy.ogg" type="audio/ogg" />
         <source src="media/busy.mp3" type="audio/mpeg" />
     </audio>
+    <audio id="remoteAudio"/>
     <script>
         if (window.location.host === 'www.vector.im' || window.location.host === 'vector.im') {
             (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){