Commit graph

31642 commits

Author SHA1 Message Date
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
David Baker
79455d99b4 Unused import 2021-02-15 19:38:17 +00:00
David Baker
89b2dae035 Send onNewInvitedRoom via VisibilityProvider 2021-02-15 18:13:13 +00:00
J. Ryan Stinnett
b2834d7f91 Test domains in config directly 2021-02-15 17:59:38 +00:00
J. Ryan Stinnett
3919fcd80e Use config for host signup branding 2021-02-15 17:59:38 +00:00
J. Ryan Stinnett
0ad22eac76
Merge pull request #5650 from matrix-org/jryans/host-signup-brand
Use config for host signup branding
2021-02-15 17:56:46 +00:00
J. Ryan Stinnett
234f1bf2c4 Test domains in config directly 2021-02-15 17:38:11 +00:00
J. Ryan Stinnett
d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Travis Ralston
f4e0ff9ab5
Merge pull request #5649 from matrix-org/travis/sensible-jitsi-names
Use randomly generated conference names for Jitsi
2021-02-15 10:29:58 -07:00
Travis Ralston
cb757b5b50 Fix import 2021-02-15 08:56:38 -07:00
Travis Ralston
cd82d97c3e Use randomly generated conference names for Jitsi
Fixes https://github.com/vector-im/element-web/issues/15205
Replaces https://github.com/matrix-org/matrix-react-sdk/pull/5322

This change uses a random ID for the Jitsi conference name to avoid any badly-named Jitsi calls, and overrides the "subject" (title) of the call so end users aren't typically exposed to the random ID.
2021-02-15 08:53:37 -07:00
David Baker
d339dc447f Add specific fields to third party lookup response fields 2021-02-15 15:25:07 +00:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner
064afab239
Use LEVELS_ACCOUNT_SETTINGS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-15 16:06:38 +01:00
David Baker
0b574327d7
More typo
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-15 15:05:16 +00:00
Šimon Brandner
65ef4f2f22
Removed the commented out code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-15 16:05:14 +01:00
David Baker
554dfdb6bf
Typo
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-15 15:05:01 +00:00
David Baker
d7bf57af13 Add missing 'd' 2021-02-15 15:04:01 +00:00
J. Ryan Stinnett
55d042596d
Merge pull request #5647 from jaiwanth-v/fix-immediate-newline-slashcommand
Modified regex to account for an immediate new line after slash commands
2021-02-15 14:07:01 +00:00
J. Ryan Stinnett
6f709ff978
Merge pull request #5642 from SimonBrandner/fix-chromium-scroll
Fix codeblock scrollbar color for non-Firefox
2021-02-15 12:26:56 +00:00
Jaiwanth
d73648dfb0 Modified regex to account for an immediate new line after slash commands
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-15 17:46:32 +05:30
Michael Weimann
f343aaa05a
fix context menu padding calculation
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-02-14 18:37:06 +01:00
PunitLodha
0902936d39 Add phone number only if verification is complete 2021-02-14 18:21:39 +05:30
PunitLodha
74a6c1e8d8 Dont clear email if verification cancelled by user 2021-02-14 18:21:12 +05:30
Šimon Brandner
7dc6029f19
Move icons
This tweaks the icon positions to look a bit better. Espacially with a scrollbar on the side

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 15:29:38 +01:00
Šimon Brandner
82474074f2
Fix scrollbar color for non-Firefox
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 13:03:26 +01:00
Šimon Brandner
8afb74d0e1
Fix border radius when the panel is collapsed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-13 08:53:25 +01:00
David Baker
196507a730 VoIP virtual rooms, mk II
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
2021-02-12 20:55:54 +00:00
Šimon Brandner
3983c15302
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 17:11:24 +01:00
Šimon Brandner
130e4f7bfd
Added some styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 17:06:02 +01:00
Šimon Brandner
97f5b6920c
Check if the method is defined before calling it
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 16:48:46 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
Šimon Brandner
b269517149
Removed wrapper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:52:42 +01:00
Šimon Brandner
daff94ecbc
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:47:33 +01:00
Šimon Brandner
ba2c68819f
Removed showSendButton setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:45:06 +01:00
Šimon Brandner
35c0cb99d0
Use isComposerEmpty for send button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:45:03 +01:00
Šimon Brandner
50b0a78132
Renamed composerEmpty to isComposerEmpty
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:44:22 +01:00
Šimon Brandner
42a48ee27d
Added composerEmpty property
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:44:22 +01:00
Šimon Brandner
98757bb6cf
Extract send button into a function
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:44:16 +01:00
Šimon Brandner
17f09d3b7a
Added onIsEmptyChanged prop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:16:07 +01:00
Šimon Brandner
d8a9b84af9
Don't show tooltip if there is nothing to display
We do this because resource is undefined for @room

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 14:28:39 +01:00
Šimon Brandner
cb5237a18b
Display room name instead of alias
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 14:21:07 +01:00
Šimon Brandner
a075568e89
Fixed tests
In the previous commits I have removed the native title/tooltip so it needs to be removed from the tests as well

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:34:09 +01:00
Šimon Brandner
a975de22ef
Fixed buggy tooltip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:27:14 +01:00
Šimon Brandner
f2137fe93f
Merge branch 'develop' into show-room-name 2021-02-12 08:21:40 +01:00
Šimon Brandner
33979b3354
Added a tooltip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 08:18:27 +01:00
Hubert Chathi
a61462bc85 use the default SSSS key if the default is set
implements MSC2874
2021-02-11 16:34:15 -05:00
J. Ryan Stinnett
a87e637666
Merge pull request #5630 from SimonBrandner/tweak-codeblock-colors
Fix codeblock scrollbar colors
2021-02-11 12:41:12 +00:00
Šimon Brandner
4aa3000894
Leverage our theme colours
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-11 13:31:06 +01:00