OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
32,116 Commits
219 Branches
563 Tags
479 MiB
Commit Graph

32116 Commits (f2e2f1699bdc10dcb520b26b348851ae93024199)

Author SHA1 Message Date
Travis Ralston 21b9ab9d85 Add an optional config option to make the welcome page the login page 
This is commonly requested by deployments with custom setups or those using SSO. Instead of having them all ship the same welcome.html with redirect code in it, we can offer a built-in redirect.

Note that this doesn't actually redirect and instead just replaces the view. This is to make the change less invasive as otherwise it involves changing the routing layers.
 2021-02-16 15:18:31 -07: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
Jaiwanth ee54327733 Update src/components/views/rooms/RoomTile.tsx 2021-02-16 18:59:22 +05:30
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
Clemens Zeidler c84ad9bedc Use key binding for cancelling a message reply 2021-02-16 19:12:18 +13:00
Clemens Zeidler ac7963b509 Fix lint and style issues 2021-02-16 19:05:51 +13:00
Clemens Zeidler 12387b4978 Use the KeyBindingsManager in EditMessageComposer 2021-02-16 19:05:39 +13: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
Jaiwanth 04d2bf1d6a Check whether user has permission to invite 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 20:55:15 +05:30
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
Jaiwanth f420c85985 Added invite option to room's context menu 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 19:21:26 +05:30
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
Clemens Zeidler 4a138f3b84 Only support a single key in the KeyCombo 
Keep it simple...
 2021-02-15 19:21:08 +13:00
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
Clemens Zeidler b4c5dec4e5 Use the KeyBindingsManager for the SendMessageComposer 2021-02-14 15:56:55 +13:00
Š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