mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
31285 commits 207 branches 547 tags 609 MiB
Commit graph

31285 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
waclaw66
75d789bb43 Translated using Weblate (Czech) 
Currently translated at 100.0% (2764 of 2764 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-02-16 12:41:27 +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
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
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
Michael Telatynski
da6f1e559b
Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog 
Added loading and disabled the button while searching for server
 2021-02-11 12:22:27 +00:00
Jaiwanth
20dc8dbb32
Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:39:12 +05:30
Jaiwanth
61c6033de7
Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:38:58 +05:30
Jaiwanth
6c252a87a1
Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:38:46 +05:30
Jaiwanth
3fc6d73158 Added loading and disabled the button while searching for server 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-11 17:28:02 +05:30
RiotRobot
d1524b2e9d v3.14.0-rc.1 2021-02-10 16:51:52 +00:00
RiotRobot
1dfbc73d4a Prepare changelog for v3.14.0-rc.1 2021-02-10 16:51:52 +00:00