OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
43,443 Commits
219 Branches
561 Tags
468 MiB
Commit Graph

414 Commits (450ddbe2b0c22362e17f540ee89aa5f8800eb089)

Author SHA1 Message Date
Šimon Brandner 375e279825
Add speaker icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:15:48 +02:00
Andrew Morgan f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Travis Ralston 3ae76c84f6 Add a simple TagComposer for the keywords entry 2021-07-12 23:55:08 -06:00
Šimon Brandner fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 10:53:22 +02:00
Šimon Brandner b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00
Jaiwanth 551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Michael Telatynski 26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Jaiwanth 637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-29 11:31:30 +05:30
Jaiwanth 398d49245f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-06-26 23:42:42 +05:30
Jaiwanth 4d6ad91e52 Add export option to right panel 2021-06-25 22:45:14 +05:30
Michael Telatynski 1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Andrew Morgan a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Michael Weimann 086042f078
update message context texts and icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:53 +02:00
Michael Weimann 6ea79b297f
tweak message context icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:51 +02:00
Michael Weimann 62efea7e19
add message context menu icons 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-24 22:20:50 +02:00
Michael Telatynski cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +01:00
Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
 2021-06-22 22:02:09 +01:00
Šimon Brandner f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:07:43 +02:00
Šimon Brandner 65c477f45f
Add sidebar icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-12 17:17:00 +02:00
Michael Telatynski 90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00
Šimon Brandner 1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:19:29 +02:00
Šimon Brandner 629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Šimon Brandner 6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:49:05 +02:00
Šimon Brandner 3a0b6eb466
Add a warning icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 14:40:08 +02:00
Michael Telatynski 13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
Šimon Brandner cbc31b43a4
Add icons for silencing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-22 20:23:07 +02:00
Robin Townsend 332412782e Remove logo spinner 
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-20 17:31:10 -04:00
Šimon Brandner 17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 08:46:33 +02:00
Robin Townsend 74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
J. Ryan Stinnett 24d49efe33
Merge pull request #6031 from matrix-org/niquewoodhouse-spaces-beta-img 
Update spaces.png
 2021-05-13 16:26:16 +01:00
Nique Woodhouse fa17b3b3cb Update spaces.png 
Update spaces.png to be a smaller file size.
 2021-05-13 15:24:47 +01:00
Michael Telatynski 3af0138e9d Update emoji icons to new style 2021-05-13 10:28:35 +01:00
Šimon Brandner 4a6d8ebdf0
Add screensharing icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-07 20:29:26 +02:00
Michael Telatynski a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
 2021-04-29 09:52:21 +01:00
Michael Telatynski 1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Travis Ralston 6764b8d645 Change symbol names 2021-04-28 09:29:31 -06:00
Travis Ralston 30e120284d Add simple play/pause controls 2021-04-27 15:02:15 -06:00
Michael Telatynski c5f653245a Show Spaces beta card in Labs & My Communities view 
the image is temporary
 2021-04-27 16:29:42 +01:00
Robin Townsend 3a62f6cdaa Merge branch 'develop' into better-spinners 2021-04-26 14:12:44 -04:00
Robin Townsend 5c7476b5af Remove spinner.gif 
All spinners throughout the app have been vectorized, and thus this GIF
is no longer necessary.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-26 14:10:30 -04:00
Travis Ralston 91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Šimon Brandner 9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
Michael Telatynski 760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11 
Tweak and fix some space features
 2021-03-25 09:02:11 +00:00
Travis Ralston 8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp 
Labs feature: Early implementation of voice messages
 2021-03-24 09:56:34 -06:00
Michael Telatynski a2a1e37fa3 Add prompt to bottom of room list to invite to space 2021-03-24 14:18:06 +00:00
Michael Telatynski d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Travis Ralston b5d32d92f3 Wire up a simple record button 2021-03-16 22:58:44 -06:00
Šimon Brandner b27a8e3c3a
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-14 08:30:28 +01:00
Travis Ralston 4811154f25 Remove now-unused assets and CSS from CompleteSecurity step 2021-03-12 15:24:16 -07:00
Travis Ralston 52621946de
Merge pull request #5723 from matrix-org/travis/uploads 
Refresh UI for file uploads
 2021-03-08 08:52:51 -07:00
Travis Ralston 08072aca9a Add upload icon, fix cancel button, refresh styles 2021-03-05 14:42:15 -07:00
Travis Ralston 017c2af663 Merge branch 'develop' into travis/message-states 2021-03-05 09:29:39 -07:00
Travis Ralston 676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui 
File drop UI fixes and improvements
 2021-03-04 20:30:45 -07:00
Travis Ralston c74224a1b7 Merge branch 'develop' into travis/message-states 2021-03-02 10:40:49 -07:00
Michael Telatynski ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +00:00
Travis Ralston 9cec382865 Change sending->sent state to match new designs 
For https://github.com/vector-im/element-web/issues/16424
 2021-03-01 16:25:19 -07:00
Michael Telatynski c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski 483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
Michael Telatynski 70f1303544 Fix invite svg viewbox 2021-03-01 16:48:35 +00:00
Michael Telatynski d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2 
Space Store and Space Panel for Room List filtering
 2021-03-01 09:42:04 +00:00
Michael Telatynski f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Šimon Brandner 6a7340e8be
Use new upload icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 18:46:48 +01:00
Šimon Brandner 984b4372db
Remove trash red icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 10:25:24 +01:00
Šimon Brandner 7fc3758056
Add newline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 10:23:59 +01:00
Šimon Brandner a4130cb7f3
Revert trash icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 10:23:27 +01:00
Šimon Brandner 5a9e1a1482
Fix close icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 08:10:54 +01:00
Šimon Brandner 0a00ffa9d6
Add more icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 18:10:50 +01:00
Robin Townsend 40b684d7de Vectorize spinners 
This replaces most of the GIF spinners used throughout the app with an
SVG that respects the user's theme. However, spinner.gif is still
retained for the room timeline avatar uploader component, since it is
more difficult to replace.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-23 20:22:09 -05:00
Šimon Brandner 6cf19e8897
Update icons according to the design 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 21:04:21 +01:00
Šimon Brandner e5d68142c6
Remove zoom icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 20:47:42 +01:00
Šimon Brandner 87d5d73025
Merge branch 'develop' into improve-image-view 2021-02-23 20:42:16 +01:00
Šimon Brandner 2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
Jason Robinson 23140a84ff Remove host signup config strings, make translatable instead 
Also replace the icon in the UserMenu and change the text, requested from design.
 2021-02-10 13:38:32 +02:00
Jason Robinson d75e2d19dc Remove unnecessary host_signup.png 2021-02-09 11:33:16 +02:00
Jason Robinson 5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Šimon Brandner 84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner 9a97b40ce9
Remove old icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:17 +01:00
Šimon Brandner cdb0d1c12e
Move and use icons from widget dir 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:10 +01:00
Jason Robinson 6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
Michael Telatynski 0e94d08d9a Update SSO Twitter social branding to match guidelines 2021-02-02 17:29:19 +00:00
Michael Telatynski 1ba0999915 Update SSO Facebook social branding to match guidelines 2021-02-02 17:19:18 +00:00
Michael Telatynski 2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
Michael Telatynski 34ae766893 Wire up MSC2858 brand attribute 
For better brand adherance.
Also removes old support for https IdP icons.
 2021-01-27 16:15:47 +00:00
Šimon Brandner e2abbf9a7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 08:12:32 +01:00
Šimon Brandner 58b2c18cf5
This somehow works 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 21:02:39 +01:00
Jason Robinson 158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Jason Robinson e8c716f33e First stage of host signup flow now sits here 
Need to make things configurable, image and text for the first step should be configurable.

Also missing privacy related words, though they should be configurable too.
 2021-01-11 15:47:21 +02:00
Šimon Brandner 7d120f7183
Simplifie svg 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:33:11 +01:00
Šimon Brandner 4538274e74
Added send message icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:25:29 +01:00
David Baker 4b43929aa3 Add in-call dialpad for DTMF sending 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
 2021-01-04 20:01:43 +00:00
David Baker 452fbb076b Add a dialpad UI for PSTN lookup 
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
 2020-12-23 19:02:01 +00:00
Šimon Brandner f771b7ac98 Added zoom button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:37:31 +01:00
Šimon Brandner 3c306bc54b Added icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 12:54:55 +01:00
David Baker 6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker 5b7ad079d2 Add SVGs 2020-11-26 14:55:07 +00:00
Michael Telatynski 758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
David Baker 729d59160d Rename buttons in CSS & remove unused 2020-11-23 15:27:37 +00:00
David Baker eca1851f02 Rename voip buttons 2020-11-23 15:21:18 +00:00
David Baker 49bd66c377 Change fullscreen button to expand button in PIP view 
and fix call controls which didn't appear in video call
 2020-11-19 16:36:23 +00:00
David Baker 50965e41eb Remove call bar 
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
 2020-11-19 15:15:31 +00:00
David Baker 41e885dd67 Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview 2020-11-18 14:28:03 +00:00
David Baker a2d58e2f1f Make new in-call UI work 
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
 * PIP view has no buttons, and not moveable yet
 * No call status in room view yet
 * Room status bar is still there currently
 2020-11-18 14:22:38 +00:00
Michael Telatynski edb5e10506 Iterate registration to simplify it based on usertesting 2020-11-11 17:04:10 +00:00
Michael Telatynski af71b0735d Change icon for the Create Event bubble tile 2020-11-04 17:24:03 +00:00
Michael Telatynski 4afa610ee1 Add variant of default home page for justRegistered 2020-11-02 17:24:47 +00:00
Michael Telatynski fa9490b02b Add skeleton UI for Room List when no rooms 2020-11-02 17:22:45 +00:00
Michael Telatynski c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Michael Telatynski 0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
Michael Telatynski b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
Michael Telatynski 4184923e5e fix default widget icons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:49:56 +01:00
Michael Telatynski ba21c6ed36 Iterate on Widget icons and resizing handles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 15:56:53 +01:00
Michael Telatynski ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
J. Ryan Stinnett 3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
Travis Ralston bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00
Michael Telatynski cef533b83e Update ellipsis svg 2020-09-09 13:09:21 +01:00
Michael Telatynski 8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Michael Telatynski 0fe6ce1842 Stage svgs 2020-09-08 15:43:40 +01:00
Michael Telatynski 11e349d6c8 Update e2e iconography 2020-09-08 15:42:31 +01:00
Travis Ralston 13e9f7b912 Update home icon 2020-08-27 13:18:52 -06:00
Travis Ralston b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher 
Communities v2 prototype: Tag panel selection changes
 2020-08-26 10:22:50 -06:00
Travis Ralston 20c562c208 Change user avatar to a home icon 2020-08-25 21:46:26 -06:00
Travis Ralston 7c1a9993e3 Add new create group dialog 2020-08-25 21:08:24 -06:00
Michael Telatynski 4381bdfdbf fix typo 2020-08-14 18:53:56 +01:00
Michael Telatynski 90d99239bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617.2 2020-08-14 18:10:59 +01:00
Michael Telatynski 4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski df75024a21 Switch out the globe icon and colour it depending on theme 2020-08-13 15:16:31 +01:00
Jorik Schellekens 0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
J. Ryan Stinnett 9e429ee669 Remove rebranding toast 
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.

Fixes https://github.com/vector-im/element-web/issues/14931
 2020-08-11 14:27:53 +01:00
Jorik Schellekens 271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett 71af4580e8 Convert jump to unread button 2020-07-31 20:39:17 +01:00
J. Ryan Stinnett 7aaa4997c2 Convert jump to bottom button 2020-07-31 20:33:15 +01:00
J. Ryan Stinnett f28bce36e1 Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons 2020-07-31 18:23:57 +01:00
J. Ryan Stinnett 1a33104877 Use thinner chevron for network, adjust placement 2020-07-31 18:15:51 +01:00
Travis Ralston 968fbd5cba Merge branch 'develop' into travis/echo/audit 2020-07-30 10:18:30 -06:00
J. Ryan Stinnett e917c0d92e Replace all chevrons with a single icon 
This replaces all chevrons with a single icon, affecting components like the
room list, network dropdown, and rebrand modal.

Rather than having files for each direction that can get out of sync, this
change uses one direction and rotates in CSS for the others.

Fixes https://github.com/vector-im/riot-web/issues/14663
 2020-07-30 16:49:46 +01:00
Travis Ralston c5574219bb Implement dialog for resending local echo transactions 2020-07-29 20:36:04 -06:00
J. Ryan Stinnett 2f20cbd5ad Remove all unreferenced images 
This removes all images we no longer reference in the app. This should be safe,
as Webpack only adds images to the build output if they are referenced.
 2020-07-29 17:52:41 +01:00
Jorik Schellekens f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Jorik Schellekens d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Michael Telatynski 007f63b5bb Update the SVGs with 24x24 fixed Figma ones 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:30:06 +01:00
Michael Telatynski b6cd8065f8 Re-export top right header button svg masks to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:39:02 +01:00
Travis Ralston 556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
Bruno Windels aeadf64ccf change icon on invite button 2020-07-14 19:40:17 +02:00
Nad Chishtie 1b9d918a92 Add new e2e icons 2020-07-13 21:20:55 +01:00
Michael Telatynski 33422f1744 Switch out Labs spinner to be the Flow-generated from Design 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 17:39:57 +01:00
David Baker 503159c1c8 Merge branch 'dbkr/in-app-rebrand-prompt' into 'element' 
Add in-app rebranding toasts & prompts

See merge request new-vector/element/element-web/matrix-react-sdk!1
 2020-07-10 17:09:17 +00:00
David Baker 8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
Bruno Windels 7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Bruno Windels 7da2b5d92f fix muted video icon center 2020-07-08 18:06:11 +02:00