63695 Commits

Author SHA1 Message Date
David Baker 10f6ecfe5f Include rooms with 1 person invited
If we can't find one with both people joined.
2016-08-02 15:59:28 +01:00
David Baker 3000fae5d8 Oops, uncommit 61e0258 2016-08-02 15:58:21 +01:00
David Baker 61e0258b6f Include rooms with 1 person invited
If we can't find one with both people joined.
2016-08-02 15:55:18 +01:00
wmwragg ee8572559f Fixed small collapsed state hover issue with badges 2016-08-02 15:45:11 +01:00
Matthew Hodgson 3fc4e92a78 Merge pull request #378 from matrix-org/dbkr/fix_new-direct_chat
Fix 'start new direct chat'
2016-08-02 15:05:11 +01:00
wmwragg f640be90ad Container height shrunk, so it doesn't bump the avatars when collapsed. Also search box gutters fixed 2016-08-02 15:00:47 +01:00
David Baker 05f0d4d166 Fix 'start new direct chat' 2016-08-02 14:55:29 +01:00
wmwragg 2c2f689361 New design for long names 2016-08-02 14:46:47 +01:00
wmwragg 472acd4792 New design for long names 2016-08-02 14:46:31 +01:00
David Baker db9750a7e3 Call the logout API when we log out
Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient.
2016-08-02 14:04:20 +01:00
David Baker 8087e99808 Merge pull request #1914 from vector-im/rav/no_webpack_olm
Exclude olm from the webpack
2016-08-02 13:07:56 +01:00
Richard van der Hoff 51b74251f9 Exclude olm from the webpack
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
2016-08-02 12:44:23 +01:00
David Baker f393811171 Merge pull request #376 from matrix-org/rav/messagecomposer_warnings
Fix warnings from MessageComposer
2016-08-02 11:32:00 +01:00
Will Hunt 8c7aede0cc Style UnknownBody with `white-space: pre-wrap;` 2016-08-02 11:13:46 +01:00
Richard van der Hoff e63a32dc10 Fix warnings from MessageComposer
Fix a couple of warnings from React about required properties not being set.
2016-08-02 11:00:00 +01:00
Matthew Hodgson 2829d95705 Merge pull request #1912 from vector-im/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 20:37:15 +01:00
Matthew Hodgson 1b38398156 Merge pull request #371 from matrix-org/wmwragg/button-updates
New voice and video call buttons
2016-08-01 20:36:56 +01:00
Matthew Hodgson 28057fd086 improve upgrade-to-app warning on mobile app 2016-08-01 18:36:08 +01:00
David Baker 89d2a56584 Merge pull request #373 from matrix-org/rav/more_react_warnings
Silence some more react warnings
2016-08-01 17:23:08 +01:00
David Baker 0ad23fa9ed Merge pull request #372 from matrix-org/rav/velociraptor_warnings
Fix warnings emanating from Velociraptor elements
2016-08-01 17:22:29 +01:00
Richard van der Hoff 124a816751 Silence some more react warnings
Remove some spurious props which were causing react warnings
2016-08-01 17:10:46 +01:00
Richard van der Hoff 94a44bfec3 Fix warnings emanating from Velociraptor elements
We are no longer allowed to stick random properties on child properties, and
the Velociraptor animations were causing some React warnings.

Move the startStyles and enterTransitionOpts properties up to the Velociraptor
node, and avoid setting arbitrary props on the created children. This is less
flexible, as it assumes that all children will have the same start style;
however, we weren't using the flexibility, and we can always replace the array
with a map or a function or something if we need it in the future.
2016-08-01 16:56:25 +01:00
wmwragg 2e3ad3206c New video call icon 2016-08-01 16:46:13 +01:00
wmwragg 84583b25e6 New voice and video call buttons 2016-08-01 16:45:27 +01:00
wmwragg 4f94cf5dfb New voice and video call icons 2016-08-01 16:44:58 +01:00
Matthew Hodgson 5b100eeff3 Merge pull request #353 from matrix-org/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 15:42:46 +01:00
Matthew Hodgson 51e8c28ab6 Merge pull request #1828 from vector-im/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 15:42:33 +01:00
David Baker 0f73228d55 Merge pull request #1909 from vector-im/rav/devices_panel
CSS for device management UI
2016-08-01 14:28:08 +01:00
David Baker d21e4fb86a Merge pull request #1908 from vector-im/rav/silence_warning
Fix a warning from RoomSubList
2016-08-01 14:27:35 +01:00
David Baker 215b32b377 Merge pull request #370 from matrix-org/rav/devices_panel
Implement device management UI
2016-08-01 14:27:12 +01:00
Richard van der Hoff 645db7fa2f CSS for device management UI 2016-08-01 13:46:14 +01:00
Richard van der Hoff 0d4f35bed1 Fix a warning from RoomSubList
`selectedRoom` is *not* required, and we often don't have one, so get warnings.
2016-08-01 13:44:04 +01:00
Richard van der Hoff c071bc54f9 Implement device management UI
View/rename/delete.
2016-08-01 13:42:29 +01:00
Richard van der Hoff 9333793a7c Fix code style 2016-08-01 10:49:51 +01:00
Richard van der Hoff 2123fec8ed Merge pull request #1907 from vector-im/rav/fix_notification_warning_display
Fix notifications warning layout
2016-08-01 10:46:23 +01:00
Richard van der Hoff 3860488bb5 Fix notifications warning layout
For some reason, Chrome doesn't seem to make the central div in the
notifications warning wide enough, so it ends up wrapping. Fix this by making
the central div expand across the available space, instead of letting the
container for the close button do it.

Fixes https://github.com/vector-im/vector-web/issues/1687
2016-08-01 10:31:58 +01:00
wmwragg ef5ea46830 Consistent collapsed height across browsers 2016-08-01 09:53:57 +01:00
Matthew Hodgson d4faacf462 clear up IS ambiguity and close https://github.com/vector-im/vector-web/issues/1720 2016-07-31 23:42:34 +01:00
wmwragg d16aa276e2 Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states 2016-07-30 12:52:39 +01:00
wmwragg 4a7d2901ac Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states 2016-07-30 12:52:14 +01:00
wmwragg 398e56c9f9 Fixed bug where the long hover tooltip for a room name show an object rather than the name 2016-07-30 12:28:10 +01:00
wmwragg cf22a5fecc Merge up from develop 2016-07-30 12:10:43 +01:00
wmwragg f382946138 Merge up from develop 2016-07-30 12:07:34 +01:00
wmwragg 1487c600ee Revert so that the 2016-07-29 17:53:18 +01:00
wmwragg 229664a624 first pass on css re-write 2016-07-29 17:49:42 +01:00
Richard van der Hoff 3194c5c61d Factor EditableTextContainer out of ChangeDisplayName
Take the non-displayname-specific bits out of ChangeDisplayName into a new
EditableTextContainer, so that we can reuse the logic elsewhere.
2016-07-29 17:40:13 +01:00
wmwragg bb93a59cfb fixed unread hightlight font weight for room name 2016-07-29 13:49:28 +01:00
wmwragg 38f504bdcb Hide tooltip when badge clicked and collapsed 2016-07-29 11:10:16 +01:00
wmwragg 0ad84fd7b0 Better comments 2016-07-29 10:59:54 +01:00
wmwragg 87bddcd8ce Preliminary fix for showing muted state when collapsed - keep faded avatar, but don't show the mute icon 2016-07-29 10:50:50 +01:00