Travis Ralston
edcd7c4426
Merge branch 'develop' into Discovery
2021-03-22 23:04:41 -06:00
Germain Souquet
0db31dfeae
fix: CIDER formatting buttons on Safari
2021-03-22 15:05:22 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10
...
Improve discovery of rooms in a space
2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
...
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
Ayush PS
f5911e6446
Fixing the minor UI issues in the email discovery
2021-03-22 00:33:09 +05:30
Jaiwanth
495cbadb08
Update src/components/views/rooms/RoomTile.tsx
2021-03-19 22:46:19 +05:30
Jaiwanth
70e0b77fc4
Changed invite phrases in context menu and invite dialog
2021-03-19 21:32:52 +05:30
Jaiwanth
b2a72565d3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into add-invite-to-context-menu
2021-03-19 20:28:10 +05:30
Travis Ralston
6ce0c17455
Merge pull request #5774 from matrix-org/travis/js-sdk-imports
...
Convert a bunch more js-sdk imports to absolute paths
2021-03-19 07:23:45 -06:00
Michael Telatynski
76dffdcb2c
Tweak space creation copy and auto focus fields
2021-03-19 13:20:30 +00:00
Michael Telatynski
1fbbb67e74
Consolidate button styles in Space creation flows
2021-03-19 13:20:30 +00:00
Michael Telatynski
3718d550c5
Fix space creation menu shade width
2021-03-19 13:20:30 +00:00
Michael Telatynski
88b7c8f53d
Fix add existing to space dialog showing all spaces additionally as rooms
2021-03-19 13:20:30 +00:00
Michael Telatynski
90d87122bc
Tweak copy on space creation flows
2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4
Improve discovery of rooms in a space
2021-03-19 11:54:10 +00:00
Travis Ralston
be8ee1a576
Appease the linter
2021-03-18 21:05:51 -06:00
Travis Ralston
1d9d0cd7be
Convert a bunch more js-sdk imports to absolute paths
...
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
David Baker
f3ca75391d
Merge remote-tracking branch 'origin/develop' into dbkr/log_getusermedia_error
2021-03-18 17:15:07 +00:00
David Baker
84b6027d41
Log error when failing to list usermedia devices
...
So we can debug why this might be failing
2021-03-18 16:41:22 +00:00
Travis Ralston
451a3aaa3f
Work around more cases where a rageshake server might not be present
...
We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.
2021-03-16 13:50:43 -06:00
Michael Telatynski
0ce78f469f
Merge pull request #5761 from matrix-org/t3chguy/spaces4.8
...
Iterate space panel visually and functionally
2021-03-16 17:41:14 +00:00
Michael Telatynski
272f06d57a
Fix Space Panel exploding with cyclic hierarchies
2021-03-15 12:16:48 +00:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization
...
Support a media handling customisation endpoint
2021-03-12 11:01:59 -07:00
Travis Ralston
a9a4bd50ca
Merge branch 'develop' into travis/media-customization
2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67
Merge branch 'develop' into edit-view-source
2021-03-11 17:07:56 +02:00
Travis Ralston
229a95f190
Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps
...
[SK-3] Decorate easy components with replaceableComponent
2021-03-11 07:26:20 -07:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login
...
Rework cross-signing login flow
2021-03-11 12:53:55 +00:00
Travis Ralston
7f52e78748
Make styles dynamic
2021-03-10 21:08:01 -07:00
Travis Ralston
88a2bdb119
Change read receipt drift to be non-fractional
...
I suspect this is what is causing issues in Firefox for read receipts not falling down.
2021-03-10 16:47:27 -07:00
Travis Ralston
ebf1efe01b
docs
2021-03-10 12:32:18 -07:00
Travis Ralston
a7debdd946
Fix tinting for download icon
...
As shown in https://github.com/vector-im/element-web/issues/16546
2021-03-10 12:32:18 -07:00
Travis Ralston
af9f17219b
Fix MemberAvatar crash from EventTilePreview
2021-03-10 12:32:18 -07:00
Travis Ralston
125aef24b9
Convert edge cases of MXC URI conversion to new customisation endpoint
2021-03-10 12:32:18 -07:00
Travis Ralston
4688c887c4
Fix GroupAvatar crash
...
When we don't have an avatar we shouldn't explode.
2021-03-10 12:32:18 -07:00
Travis Ralston
2a40bc87cc
Fix ResizeMethod usage
2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64
Appease the linter
2021-03-10 12:32:18 -07:00
Travis Ralston
fa5d98c319
Convert cases of getHttpUriForMxc to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca
Convert cases of mxcUrlToHttp to new media customisation
2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f
Merge branch 'develop' into travis/skinning/pt3-easy-comps
2021-03-10 12:30:06 -07:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5
...
Spaces suggested rooms support
2021-03-10 10:56:17 +00:00
Travis Ralston
f25db38b2b
Add tooltips to sent/sending receipts
...
Fixes https://github.com/vector-im/element-web/issues/16649
2021-03-09 21:13:23 -07:00
Travis Ralston
71b8959d3c
Apply suggestions from code review
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-03-09 09:36:17 -07:00
Travis Ralston
5b3367d44e
Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps
2021-03-09 09:33:19 -07:00
Travis Ralston
eb45731d2e
Merge pull request #5735 from matrix-org/travis/use-strict-no
...
Remove a bunch of useless 'use strict' definitions
2021-03-09 07:24:41 -07:00
Michael Telatynski
cf2c790699
Pass OOB data for suggested rooms
2021-03-09 13:41:06 +00:00
Michael Telatynski
dd0b0834e6
Fix React warning
2021-03-09 13:40:48 +00:00
Panagiotis
ef267829de
Merge branch 'develop' into edit-view-source
2021-03-09 14:49:05 +02:00
J. Ryan Stinnett
d33acaac95
Merge pull request #5713 from panoschal/improve-view-source
...
Display decrypted and encrypted event source on the same dialog
2021-03-09 11:36:53 +00:00
Michael Telatynski
81e1f36c4b
Tidy up TemporaryTile now that it isn't temporary
2021-03-09 11:19:41 +00:00
Travis Ralston
591ccabab9
Remove a bunch of useless 'use strict' definitions
2021-03-08 20:26:08 -07:00