Commit Graph

1354 Commits

Author SHA1 Message Date
David Baker e7ac66ad04 Don't redirect to mobile app if verifying 3pid
Fixes https://github.com/vector-im/vector-web/issues/1933
2016-08-11 12:44:49 +01:00
David Baker 5a17d8b450 Merge pull request #1946 from vector-im/rav/rav/refactor_token_login
Support for refactored login token handling
2016-08-11 10:52:32 +01:00
David Baker 43e3662e60 Merge pull request #1935 from aviraldg/fix-emoji
Various fixes and improvements to emojification.
2016-08-11 10:22:46 +01:00
Aviral Dasgupta 19d5063814 Merge branch 'develop' into fix-emoji 2016-08-11 14:51:17 +05:30
Richard van der Hoff c2cb4dff4c Support for refactored login token handling
loginToken handling is now done by the session loader, so we need to pass in
the queryparams to MatrixChat.

Also, MatrixChat no longer automatically reloads the page to drop the
querystring, so we have to do that ourselves (doing it in index.js allows
tokenlogin to be tested).
2016-08-11 01:55:51 +01:00
Richard van der Hoff afc889ff4d Some tests of the application load process 2016-08-10 00:15:04 +01:00
Aviral Dasgupta bd9f5d3e06 Various fixes and improvements to emojification.
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
Matthew Hodgson ee2329d236 make scrollbars bigger on hoverover 2016-08-07 21:35:41 +01:00
Matthew Hodgson 66f80b2239 let MemberInfo scroll if you have loads of E2E devices 2016-08-07 20:50:56 +01:00
David Baker bf46c3cfab Merge remote-tracking branch 'origin/develop' into matthew/scalar 2016-08-05 15:37:38 +01:00
wmwragg b99e7598f9 notification menu now has cickable radio buttons 2016-08-04 17:05:19 +01:00
wmwragg b9e06bcf66 Moved mute state to mentions only 2016-08-04 16:17:47 +01:00
Matthew Hodgson eb108c7866 Merge branch 'develop' into matthew/scalar 2016-08-04 13:41:04 +01:00
Richard van der Hoff a190862ed3 Merge pull request #1919 from vector-im/dbkr/deactivate_account
CSS for deactivate account dialog
2016-08-04 10:32:41 +01:00
Matthew Hodgson 34a31a71fd increase weight of unread rooms as it's the only way to tell if you have unread messages, and the weight difference is currently too subtle 2016-08-03 22:54:01 +01:00
Matthew Hodgson 7774756ed1 fix lightbox on chrome 52: https://github.com/vector-im/vector-web/issues/1706 2016-08-03 17:19:36 +01:00
Matthew Hodgson ee9f78d156 slightly better volume labels 2016-08-03 15:49:32 +01:00
Matthew Hodgson 70754db27a Merge pull request #1900 from vector-im/wmwragg/mention-state-menu
Wmwragg/mention state menu
2016-08-03 15:22:49 +01:00
wmwragg 16f8143f3e synced prefix flex with flex 2016-08-03 14:45:31 +01:00
wmwragg be1f014294 Speech bubble tail shifted slightly, as the badge is now larger 2016-08-03 14:22:47 +01:00
wmwragg f53f9af1c5 Badge width fixed, and hover state for badge now only on badge itself. 2016-08-03 14:11:17 +01:00
David Baker 58b1d62976 CSS for deactivate account dialog
(Inc some generic CSS for error & danger fields)
2016-08-03 11:38:19 +01:00
wmwragg 8e0f7f18a0 Design update to match the new Zeplin designs 2016-08-03 11:21:00 +01:00
wmwragg ee8572559f Fixed small collapsed state hover issue with badges 2016-08-02 15:45: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
wmwragg 472acd4792 New design for long names 2016-08-02 14:46:31 +01:00
Will Hunt 8c7aede0cc Style UnknownBody with ``white-space: pre-wrap;`` 2016-08-02 11:13:46 +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 28057fd086 improve upgrade-to-app warning on mobile app 2016-08-01 18:36:08 +01:00
wmwragg 2e3ad3206c New video call icon 2016-08-01 16:46:13 +01:00
wmwragg 4f94cf5dfb New voice and video call icons 2016-08-01 16:44:58 +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
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 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
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 f382946138 Merge up from develop 2016-07-30 12:07:34 +01:00
wmwragg bb93a59cfb fixed unread hightlight font weight for room name 2016-07-29 13:49:28 +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
wmwragg 18701a2dae CSS tweaks to get the collapsed mute state properly working 2016-07-29 10:01:42 +01:00
wmwragg 2f65064688 CSS bugfix to stop incorrect letter spaceing on room names 2016-07-28 17:44:17 +01:00
wmwragg 2f08f2441f CSS tweaks for muted dohickey positioning 2016-07-28 17:41:01 +01:00
wmwragg 6c4c0bf57a Initial feature set complete, but the state and CSS need to be simplified 2016-07-28 17:35:25 +01:00
wmwragg 55a10ee275 Mute state handled corrcectly 2016-07-28 17:25:28 +01:00
wmwragg 49545ce0c2 Leaving the fail promise section blank as a todo, with explanitary comment 2016-07-28 15:29:57 +01:00
wmwragg b87058508e When a use clicks the state they want, after the change has been made it pasues breifly before closing, so that the user can see their state change has taken place. 2016-07-28 15:28:05 +01:00
wmwragg 6329e274ab Extra polish to get styling looking like the design 2016-07-28 14:20:24 +01:00