Commit graph

31217 commits

Author SHA1 Message Date
Will Hunt
c78d1c49ab Apply changes from review 2021-02-24 17:32:00 +00:00
Will Hunt
84bcdf66f2 Fix TS check 2021-02-23 13:00:05 +00:00
Will Hunt
aa86c1d751 Ensure that a dismissed usage alert toast stays dismissed 2021-02-23 12:51:47 +00:00
Will Hunt
0daed98627 Do not process an older usage event if we've already processed a newer one 2021-02-23 12:51:17 +00:00
J. Ryan Stinnett
72ff919512
Merge pull request #5644 from weeman1337/fix-contextmenu-padding
Fix context menu leaving visible area
2021-02-22 17:42:09 +00:00
David Baker
18bd49f3c2
Merge pull request #5675 from matrix-org/dbkr/jitsi_conference_captialised
Jitsi conferences names, take 3
2021-02-22 17:33:45 +00:00
J. Ryan Stinnett
e30a0d6420
Merge pull request #5670 from gsouquet/fix/is-on-dark-theme
Update isUserOnDarkTheme to take use_system_theme in account
2021-02-22 17:29:49 +00:00
David Baker
428af8b9e2 Jitsi conferences names, take 3
Shorter, capatalised, just 'Jitsi' prefix rather than 'JitsiConference'
2021-02-22 16:48:12 +00:00
Germain
bce88efa4f update isUserOnDarkTheme to return correct theme when use_system_theme is true
Signed-off-by: Germain <germain@grabyo.com>
2021-02-21 16:49:30 +00:00
Michael Telatynski
a794bfdd3e
Merge pull request #5665 from matrix-org/t3chguy/spaces1
Discard some dead code
2021-02-19 09:50:04 +00:00
Michael Telatynski
49f511bbab delint 2021-02-19 00:26:52 +00:00
Michael Telatynski
32cca0534c improve algo by skipping an O(n) operation 2021-02-19 00:19:35 +00:00
Michael Telatynski
d4df9e731d i18n 2021-02-19 00:10:47 +00:00
Michael Telatynski
3c52446205 Remove redundant PhasedRollOut 2021-02-19 00:01:07 +00:00
Michael Telatynski
3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00:00
Travis Ralston
de7e2ed37e
Merge pull request #5664 from matrix-org/travis/settings/v3-explorer
Add developer tool to explore and edit settings
2021-02-18 15:38:05 -07:00
Travis Ralston
10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Michael Telatynski
8fc244452c Prevent error being thrown so that we can throw our own better one 2021-02-18 18:06:26 +00:00
Michael Telatynski
50252483c6 Remove stale unused components 2021-02-18 18:05:41 +00:00
Michael Telatynski
a581c36f58
Merge pull request #5663 from matrix-org/t3chguy/spaces1
Use and create new room helpers
2021-02-18 18:02:34 +00:00
Michael Telatynski
0e7a731d61 Make use of new room canInvite helper 2021-02-18 15:19:16 +00:00
Michael Telatynski
e1acf11e67 Create Room Name & Topic HOCs to simplify code elsewhere 2021-02-18 15:16:59 +00:00
Michael Telatynski
354925c2c8 Improve TS definitions 2021-02-18 15:16:07 +00:00
Travis Ralston
64974eb3ee
Merge pull request #5661 from matrix-org/travis/clear-preview
Clear message previews when the maximum limit is reached for history
2021-02-18 07:31:54 -07:00
David Baker
68933c1a3d
Merge pull request #5639 from matrix-org/dbkr/virtual_rooms_v2
VoIP virtual rooms, mk II
2021-02-18 13:18:34 +00:00
Travis Ralston
47d73bef57 Clear message previews when the maximum limit is reached for history 2021-02-17 22:36:26 -07:00
J. Ryan Stinnett
cc5ed3eeb2
Merge pull request #5660 from matrix-org/jryans/reduced-motion-effects
Disable chat effects when reduced motion preferred
2021-02-17 19:15:23 +00:00
David Baker
648295e26b Oops, we still used this cache for new incoming virtual rooms 2021-02-17 19:00:21 +00:00
David Baker
6130bdf0d2 Use creation content to signal virtual-ness
This makes things a lot simpler.
2021-02-17 18:51:21 +00:00
J. Ryan Stinnett
10e25f306f Disable chat effects when reduce motion preferred
Some users prefer reduced motion, so this disables chat effects when such a
preference is set in the browser or OS.
2021-02-17 17:43:31 +00:00
J. Ryan Stinnett
d643f06ff0 Tweak chat effects setting label 2021-02-17 17:28:23 +00:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes
Improve URL preview formatting and image upload thumbnail size
2021-02-17 11:37:37 +00:00
J. Ryan Stinnett
ec4a39a694
Merge pull request #5641 from SimonBrandner/fix-rounded-resize
Fix border radius when the panel is collapsed
2021-02-17 11:12:03 +00:00
J. Ryan Stinnett
53c4a1ada5
Merge pull request #5571 from SimonBrandner/improve-layout-handling
Use a more generic layout setting - useIRCLayout → layout
2021-02-17 11:02:26 +00:00
David Baker
e787d11c73 Merge remote-tracking branch 'origin/develop' into dbkr/virtual_rooms_v2 2021-02-16 19:41:54 +00:00
David Baker
3b16645b59 Make fields optional 2021-02-16 18:52:49 +00:00
Michael Telatynski
b386f0c73b
Merge pull request #5657 from matrix-org/t3chguy/usercontent
Remove redundant lockOrigin parameter from usercontent
2021-02-16 18:23:55 +00:00
Michael Telatynski
6cb3381df5 Remove redundant lockOrigin parameter from usercontent
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
2021-02-16 18:03:12 +00:00
David Baker
fbf0a737a3
Merge pull request #5655 from matrix-org/dbkr/ice_candidate_pool_size
Set ICE candidate pool size option
2021-02-16 16:02:04 +00:00
David Baker
bb6659f983 Set ICE candidate pool size option
So we can start candidate gathering in advance
2021-02-16 15:48:58 +00:00
David Baker
7260a4c248
Merge pull request #5654 from matrix-org/dbkr/prepare_to_encrypt_on_incoming_call
Prepare to encrypt when a call arrives
2021-02-16 15:07:32 +00:00
David Baker
5535d7fb97 Prepare to encrypt when a call arrives
So we're ready to send an answer straight away if the user answers
2021-02-16 14:52:11 +00:00
RiotRobot
b6a4876c8a Reset matrix-js-sdk back to develop branch 2021-02-16 11:06:55 +00:00
RiotRobot
df3a9526a5 Resetting package fields for development 2021-02-16 11:06:42 +00:00
RiotRobot
f4ab4dce40 Merge branch 'master' into develop 2021-02-16 11:06:42 +00:00
RiotRobot
e70085ed2e v3.14.0 2021-02-16 11:05:25 +00:00
RiotRobot
a99f080e97 Prepare changelog for v3.14.0 2021-02-16 11:05:24 +00:00
RiotRobot
f9d4d679ee Upgrade matrix-js-sdk to 9.7.0 2021-02-16 10:59:39 +00:00
J. Ryan Stinnett
9d64344053
Merge pull request #5651 from matrix-org/jryans/host-signup-brand-release
[Release] Use config for host signup branding
2021-02-15 22:14:03 +00:00