mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 10:31:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
31199 commits 219 branches 562 tags 474 MiB
Commit graph

12572 commits

Author SHA1 Message Date
Šimon Brandner
bd2423a52c
Added line numbering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 10:53:18 +01:00
Travis Ralston
c7c055dd98 Give a bigger target area to AppsDrawer vertical resizer 
The existing target was too hard to hit, which annoyed users. This change makes it the same sort of surface area as the horizontal resizers, as requested by design to fix the problem in the short term.
 2021-01-20 15:05:18 -07:00
Šimon Brandner
14bf169631
Handle small codeblocks 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 15:01:23 +01:00
Šimon Brandner
f8179f0c7a
Fix inverted icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 14:08:57 +01:00
Šimon Brandner
25f30ca79f
Fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 13:05:23 +01:00
Šimon Brandner
072cbe98b5
Simplifie 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 13:03:05 +01:00
Šimon Brandner
8535a11dd2
Rename some variable and cleanup a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 08:44:32 +01:00
Šimon Brandner
58b2c18cf5
This somehow works 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 21:02:39 +01:00
J. Ryan Stinnett
3115c4f3f3 Show only preview buttons in directory for guest users 
This aligns the room directory with the rest of Element Web so that it does not
allow guest users to join rooms. Instead, we show preview buttons (even when the
preview might not actually happen).

Fixes https://github.com/vector-im/element-web/issues/16213
 2021-01-19 17:59:30 +00:00
Šimon Brandner
95939f3d6c
Added _wrapInDiv() method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 18:21:59 +01:00
Šimon Brandner
e6ab47ff76
Fix bug 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c
Redo expanding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 16:35:32 +01:00
Travis Ralston
6227d3c183 Appease the linters 2021-01-18 20:53:15 -07:00
Travis Ralston
04d1f5dd28 Implement a "Copy my layout to the room" button 2021-01-18 20:42:21 -07:00
Travis Ralston
1768d6ea5f Move all widget pinning logic to the WidgetLayoutStore 2021-01-18 20:26:47 -07:00
Travis Ralston
5b5c338200 Render layout changes in the timeline 2021-01-18 19:31:11 -07:00
Travis Ralston
0d29d15a46 Support room-defined height as well 
Much like widget widths, it is acceptable for us to forget what everyone's height was previously at.
 2021-01-18 19:27:11 -07:00
Travis Ralston
cfb583d193 Calculate widget widths in the WidgetLayoutStore 
Note that this ditches all previously set width values, however this is probably acceptable for now. Trying to remain backwards compatible gets tricky on top of already tricky code, and the impact of Element forgetting widths is not as severe as forgetting which widgets were/are pinned.
 2021-01-18 18:50:36 -07:00
Travis Ralston
2548a438ae Render ordering changes in the AppsDrawer 2021-01-18 17:43:29 -07:00
Šimon Brandner
45d0270bca
Merge branch 'develop' into expand-codeblock 2021-01-18 19:08:24 +01:00
Šimon Brandner
8a4af2f348
Merge branch 'develop' into expand-codeblock 2021-01-18 17:54:06 +01:00
Šimon Brandner
49dce58027
Added expanding based on the option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:49:09 +01:00
Šimon Brandner
7f727be4f6
Added expand code block option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:44:32 +01:00
Ayush Kumar
530a242aae Fixed continue button while selecting home server 2021-01-18 21:41:10 +05:30
Will Hunt
d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-18 11:36:46 +00:00
J. Ryan Stinnett
1c5a234b93
Merge pull request #5547 from matrix-org/jryans/listener-overload 
Use room-specific listeners for message preview and community prototype
 2021-01-18 10:57:56 +00:00
Šimon Brandner
e7384f829a
Made search shortcut optional 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-17 16:44:29 +01:00
Šimon Brandner
cb91d7037f
Added search shortcut 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-17 08:28:52 +01:00
Jason Robinson
39984c9a34 WIP 2021-01-15 17:14:55 +02:00
Jason Robinson
3901cd9c72 WIP 2021-01-15 17:02:28 +02:00
J. Ryan Stinnett
462e0889f0 Fix lint 2021-01-15 14:46:38 +00:00
J. Ryan Stinnett
8a341446aa Use room-specific listeners for community prototype 
Similar to message previews, this changes another area to use room-specific
listeners for better performance and avoiding warnings.
 2021-01-15 14:34:56 +00:00
J. Ryan Stinnett
729356394e Use room-specific listeners for message previews 
This should be a bit faster (since we now only notify one tile instead of all
for each update). It also resolves the max listener warning.

Fixes https://github.com/vector-im/element-web/issues/15121
 2021-01-15 14:21:21 +00:00
Jason Robinson
158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Jason Robinson
90a1c5a267 WIP 2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414 WIP 2021-01-15 15:32:30 +02:00
J. Ryan Stinnett
80f3e14faf Move LoggedInView subscriptions to after mounted 
This avoids a React warning about trying to call `setState` before the component
is mounted.
 2021-01-15 13:20:49 +00:00
J. Ryan Stinnett
e90009772d Fix React warnings about missing key for edited messages 
This uses a fragment instead of an array to avoid the need for key attributes.
 2021-01-15 13:20:49 +00:00
J. Ryan Stinnett
6d932e1352 Fix lint errors 2021-01-14 17:38:06 +00:00
J. Ryan Stinnett
658a8dfa99 Use device storage for allowed widgets if account data not supported 
With guest accounts, account data is not available, so we use device storage to
hold allowed widgets as a good enough place.

Fixes https://github.com/vector-im/element-web/issues/16145
 2021-01-14 17:30:25 +00:00
Šimon Brandner
eca8ef3b35
Update thumbnails 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-14 12:44:48 +01:00
Jason Robinson
d6af5b3bbd WIP minimize 2021-01-14 12:20:42 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
Šimon Brandner
8f91b04eb3
Use contextBridge 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-14 08:35:04 +01:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00
David Baker
e2111d9161
Merge pull request #5532 from matrix-org/dbkr/dtmf 
Add in-call dialpad for DTMF sending
 2021-01-13 13:07:27 +00:00
J. Ryan Stinnett
a73fe72b09 Fix soft crash on soft logout page 
This fixes a soft crash on the soft logout page, which can occur if it is shown
very quickly after app startup before encryption has become enabled.
 2021-01-13 12:25:36 +00:00
Aaron Raimist
b81e6fdedb
Update src/components/structures/auth/SetupEncryptionBody.js 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-01-12 16:04:43 -06:00
Jason Robinson
3da5049dc7 WIP minimize 2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa WIP minimize 2021-01-12 14:08:09 +02:00
Travis Ralston
a8d878dc48
Merge pull request #5528 from matrix-org/travis/widget-devtools 
Add a basic widget explorer to devtools (per-room)
 2021-01-11 11:00:08 -07:00
J. Ryan Stinnett
77f79e599f
Merge pull request #5534 from SimonBrandner/fix-16071 
Add <input type="password"> to security key field
 2021-01-11 17:13:35 +00:00
Michael Telatynski
1c3adbc545
Merge pull request #5526 from matrix-org/t3chguy/fix/15832 
Fix avatar upload prompt/tooltip floating wrong and permissions
 2021-01-11 16:48:17 +00:00
Jason Robinson
e8c716f33e First stage of host signup flow now sits here 
Need to make things configurable, image and text for the first step should be configurable.

Also missing privacy related words, though they should be configurable too.
 2021-01-11 15:47:21 +02:00
Jason Robinson
2b98f14242 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-11 11:16:03 +02:00
Will Hunt
448a5ea42d Remove replaceableComponentTs from BridgeTile 2021-01-08 18:07:48 +00:00
Will Hunt
000a69765c Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-08 18:03:36 +00:00
Šimon Brandner
20b1720258
Added a line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 21:08:25 +01:00
Šimon Brandner
b1010189be
Tabbed copyright link 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:33 +01:00
Šimon Brandner
640e6d68b3
Merge branch 'develop' into fix-screen-sharing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:06 +01:00
Šimon Brandner
bb7e76f69e
Hopefully fixed copyrights 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:36:54 +01:00
Šimon Brandner
99dc829369
Fixed translation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:27:11 +01:00
Šimon Brandner
d497594a6f
Remove unnecessary line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 19:55:08 +01:00
Šimon Brandner
8652c2e653
Fixed class names 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 19:49:09 +01:00
Šimon Brandner
efd889c09a
Remove commented line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 19:32:59 +01:00
David Baker
2d37151750
Merge pull request #5523 from matrix-org/dbkr/dial_pad 
Add a dialpad UI for PSTN lookup
 2021-01-05 17:23:34 +00:00
David Baker
470756546c
Merge pull request #5494 from matrix-org/dbkr/call_transfer 
Basic call transfer initiation support
 2021-01-05 17:22:22 +00:00
Jason Robinson
325447d9fa Remove the dedicated host signup dialogs, use QuestionDialog 2021-01-05 14:47:39 +02:00
Jason Robinson
5f84371038 Update some copyrights 2021-01-05 14:29:48 +02:00
SimonBrandner
247bd09312
Fixed 16071 
Signed-off-by: SimonBrandner <simon.bra.ag@gmail.com>
 2021-01-05 13:20:59 +01:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-04 19:17:17 -06:00
David Baker
4b43929aa3 Add in-call dialpad for DTMF sending 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
 2021-01-04 20:01:43 +00:00
Jason Robinson
bb53ae8038 Rename Element Pro -> Host Signup 2021-01-04 16:05:49 +02:00
Jason Robinson
6286c23aa5 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-04 15:46:28 +02:00
David Baker
a258a3874b Use objectShallowClone 2021-01-04 11:51:27 +00:00
Aaron Raimist
b8334bfd4a
Add option to hide the stickers button in the composer 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-02 15:31:54 -06:00
Šimon Brandner
86cb7f99ce
Hide localVideoFeed if video is muted 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-30 08:46:54 +01:00
Travis Ralston
5773d78464 Maybe this will appease the linter. 2020-12-29 15:40:44 -07:00
Travis Ralston
64b056d689 Appease the linter 2020-12-29 15:34:40 -07:00
Travis Ralston
254e0b9a94 Add a basic widget explorer to devtools (per-room) 2020-12-29 15:30:22 -07:00
Šimon Brandner
4185d53468
Disable add button if the field is empty 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-29 16:30:20 +01:00
Šimon Brandner
0083cf56bf
Hide buttons only if perrmissions are missing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-29 16:20:43 +01:00
Šimon Brandner
7912091bc5
Revert "Hide add button when new item field is empty" 
This reverts commit fa99c2e8c5.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-29 16:08:54 +01:00
Jason Robinson
6843737a33 Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-12-28 11:22:05 +02:00
Jason Robinson
7a358b1ca3 Rename components to be less EMS specific 2020-12-28 11:21:42 +02:00
Šimon Brandner
14a3b88497
Consistent formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-28 08:15:54 +01:00
Michael Telatynski
7af1471052 delint2 2020-12-27 21:46:56 +00:00
Michael Telatynski
ce5b244a24 delint 2020-12-27 21:25:48 +00:00
Michael Telatynski
8ee65258be Unfloat the MiniAvatarUploader "tooltip" 2020-12-27 21:13:01 +00:00
Michael Telatynski
f4190ccae2 Fix mini avatar uploader "working" even without permissions 2020-12-27 21:01:51 +00:00
Šimon Brandner
5779a543c9
Type cleanup 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 18:10:50 +01:00
Šimon Brandner
322afe6450
Remove log 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 18:00:08 +01:00
Šimon Brandner
675ca58eef
Improve UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 16:56:25 +01:00
Šimon Brandner
eae3c1c496
Get screen-sharing working, somehow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 08:32:51 +01:00
Šimon Brandner
65285fd55e Fix 15988 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-24 08:00:23 +01:00
David Baker
452fbb076b Add a dialpad UI for PSTN lookup 
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
 2020-12-23 19:02:01 +00:00
Šimon Brandner
a7ca1d0856 Remove unnecessary line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 13:26:53 +01:00
Šimon Brandner
fa99c2e8c5 Hide add button when new item field is empty 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 13:14:55 +01:00
Šimon Brandner
ffe2727cf7 Fixed topic field resizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 09:40:39 +01:00
Šimon Brandner
48cfd3f9da Fixed some avatar stuff 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 09:29:35 +01:00
Šimon Brandner
15d10042ee Fixed 16014 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 08:52:21 +01:00
Jason Robinson
129795c2ec Add allow-same-origin to Element Pro dialog 
Seems to be required after all.
 2020-12-21 17:20:51 +02:00
David Baker
aee861956c Remove secondary call avatar 
and change 'paused' to 'on hold'
 2020-12-18 19:40:57 +00:00
David Baker
eab764a3c8 Vary resume link text 
Use 'Switch' if unholding that call would hold another
 2020-12-18 19:35:41 +00:00
Jason Robinson
1b6e90dcb8 More sandboxing 2020-12-18 16:09:11 +02:00
Jason Robinson
0ae28d584b Typing and other PR feedback fixes 2020-12-18 16:05:57 +02:00
J. Ryan Stinnett
8350b4152b Import from src in IncomingCallBox.tsx 2020-12-17 17:16:00 +00:00
Michael Telatynski
2567fcd045 add brackets for operator precedence 2020-12-17 12:02:16 +00:00
Michael Telatynski
1b2cfa5f05 Social Login support both https and mxc icons 2020-12-17 10:34:49 +00:00
Jason Robinson
f0e93c6929 Mark remaining strings to be translated 2020-12-17 12:06:42 +02:00
Jason Robinson
5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
Michael Telatynski
4c2b6f410b fix tests 2020-12-16 10:41:56 +00:00
Michael Telatynski
940fdb8e2f Better adhere to MSC process 2020-12-16 10:07:07 +00:00
Hubert Chathi
983ffe98ff
Merge pull request #5483 from uhoreg/web_pickle 
Use random pickle key on all platforms
 2020-12-15 12:56:41 -05:00
David Baker
a33be00c08 Basic call transfer initiation support 
Adapt the InviteDialog to select a transfer target

Doesn't support supplying a roo mID fr the transfer: just leaves
the transferee to work out how to contact the target themselves.

MSC2747 (matrix-org/matrix-doc#2747)
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1558
 2020-12-15 14:59:06 +00:00
Jason Robinson
cd836be809 Rename everything HostingSignup -> EMSElementPro 
This setup flow ended up quite specific due to all the various moving parts.
 2020-12-15 10:50:38 +02:00
David Baker
2d36910577
Add comment 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-14 22:52:30 +00:00
David Baker
df825792bc These can just all be Members 2020-12-14 22:51:40 +00:00
David Baker
32f693e3b0 Convert InviteDialog to TypeScript 
Before I start using it to select VoIP transfer targets
 2020-12-14 22:28:21 +00:00
J. Ryan Stinnett
70f24baaf1
Merge pull request #5425 from macekj/emoji_quick_shortcut 
Add keyboard shortcut for emoji reactions
 2020-12-14 13:12:49 +00:00
Will Hunt
c5e578a502 linting 2020-12-14 12:59:59 +00:00
Will Hunt
da86bc0b0a Allow sender for backwards compat 2020-12-14 12:59:59 +00:00
Will Hunt
48018615f8 Add support for linking to the remote network page 2020-12-14 12:59:59 +00:00
Will Hunt
d6312606e6 Use correct key for avatar 2020-12-14 12:59:59 +00:00
Will Hunt
e448da0bcd Add interface for event content, and validate 2020-12-14 12:59:59 +00:00
Will Hunt
8d203043d4 Remove hide/show behaviour 2020-12-14 12:59:59 +00:00
Will Hunt
8e6061b37a Ts tweaks 2020-12-14 12:59:59 +00:00
Will Hunt
86200e5519 Convert BridgeTile to Typescript 2020-12-14 12:59:59 +00:00
Jason Robinson
04bd5f648f Add confirmation dialog before transferring account data 2020-12-11 16:25:22 +02:00
Jason Robinson
518c4c5dc9 HostingSignupDialog now returns requested data in one message 2020-12-11 16:03:18 +02:00
David Baker
07fa535513 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 16:11:29 +00:00
Travis Ralston
18a60ae2ea
Merge pull request #5484 from matrix-org/travis/remove-dead-feature 
Remove impossible labs feature: sending hidden read receipts
 2020-12-10 08:24:05 -07:00
David Baker
80be46bc32 Fix vertical scrolling in videoview 
Fixes https://github.com/vector-im/element-web/issues/15886
 2020-12-10 15:18:22 +00:00
David Baker
026b4422a8 Merge remote-tracking branch 'origin/develop' into dbkr/call_ui_height 2020-12-10 12:36:51 +00:00
David Baker
5282c6bbe8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 12:36:11 +00:00
David Baker
f987908d04
Merge pull request #5446 from matrix-org/dbkr/hold_ui 
Add UI for hold functionality
 2020-12-10 12:30:59 +00:00
Travis Ralston
80d6629c3e delete the rest too 2020-12-09 18:50:16 -07:00
Travis Ralston
27df6ae6e1 Remove impossible labs feature: sending hidden read receipts 
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
 2020-12-09 18:36:48 -07:00
Hubert Chathi
753ec9e45a use random pickle key on all platforms, and store access token encrypted in IDB 2020-12-09 18:40:31 -05:00
Travis Ralston
af69ba9c79
Merge pull request #5451 from iokiwi/new/room-alias-in-permalink 
Use room alias in generated permalink for rooms
 2020-12-09 12:07:44 -07:00
Travis Ralston
3e3a32cf10 Only show confetti if the current room is receiving an appropriate event 2020-12-09 11:56:57 -07:00
Michael Telatynski
d05ad1e36c
Merge pull request #5481 from matrix-org/t3chguy/fix/15905 
Throttle RoomState.members handler to improve performance
 2020-12-09 12:53:34 +00:00
Michael Telatynski
91ae8df423
Merge pull request #5477 from matrix-org/t3chguy/fix/15913 
Handle manual hs urls better for the server picker
 2020-12-09 11:32:33 +00:00
Michael Telatynski
5be65a525d Improve identifiers and code readability 2020-12-09 11:14:06 +00:00
Michael Telatynski
ecb0b0113f Also use getJoinedMemberCount as its capable of using the room summary member count instead 
Leave the useRoomMembers hook for future use as it is very useful.
 2020-12-09 11:07:40 +00:00
Michael Telatynski
184c73cca4 Throttle RoomState.members handler to improve performance 
Lazy Loading emits a RoomState.members for each member which in the case of a room like
Matrix HQ means it happens over 8000 times in a very short span of time causing the UI
to lock up.
 2020-12-09 11:02:30 +00:00
Michael Telatynski
05e6b52191
Merge pull request #5476 from matrix-org/t3chguy/fix/15895 
Hide Invite to this room CTA if no permission
 2020-12-08 15:33:33 +00:00
David Baker
4a009d480d Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-08 11:48:14 +00:00
Michael Telatynski
e896b009f1 Handle manual hs urls better 2020-12-08 10:58:16 +00:00
Michael Telatynski
9f9699bf75 Hide Invite to this room CTA if no permission 2020-12-08 10:31:40 +00:00
Travis Ralston
f30d2ff1c5 Fix confetti room unread state check 
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
 2020-12-07 16:54:09 -07:00
Travis Ralston
603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Travis Ralston
550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
David Baker
365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker
8a58c9dea0 Update UI for two calls in the PiP view 
and also merge hold_ui changes
 2020-12-07 17:56:36 +00:00
David Baker
747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
Michael Telatynski
499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
David Baker
3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
Simon Merrick
b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
Simon Merrick
5544ee6408 extract alias handling to separate function 2020-12-06 23:29:11 +13:00
Lukas
a856484139 Fix typos in some strings 
This commit fixes some typos that I've stumbled upon.
 2020-12-06 10:32:52 +01:00
David Baker
ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker
faf2922b1b Update video element when the call changes in a videoview 
Because that can happen now
 2020-12-04 19:41:48 +00:00
macekj
0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker
0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker
1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
Michael Telatynski
b200211660
Merge pull request #5465 from matrix-org/t3chguy/socials 
Fix React complaining about unknown DOM props
 2020-12-03 15:20:16 +00:00
Michael Telatynski
1afece9a14 Fix React complaining about unknown DOM props 2020-12-03 12:20:48 +00:00
Michael Telatynski
e4b929c6f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882 2020-12-03 11:42:47 +00:00
Michael Telatynski
f432d4e394 delint 2020-12-03 11:31:14 +00:00
Michael Telatynski
3223b00028 Jump to home page when leaving a room 
so that you don't get thrown into a room you may be ignoring on purpose
 2020-12-03 11:15:55 +00:00
Michael Telatynski
0fd9b55b95 Fix SSO buttons for Social Logins 2020-12-03 11:08:16 +00:00
macekj
27a853c586 use textSerialize function to get model text 2020-12-02 15:01:44 -05:00
Michael Telatynski
3fda7e3f46 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-02 15:08:13 +00:00
Jason Robinson
31c7c05f2e Convert ConfirmCloseHostingSignupDialog to typescript 2020-12-02 11:12:45 +02:00
Travis Ralston
bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts 
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.

Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
 2020-12-01 13:05:48 -07:00
nurjinn jafar
111515e794 fixed linter problem 2020-12-01 17:37:28 +01:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 
 Conflicts:
	src/i18n/strings/en_EN.json
 2020-12-01 16:33:29 +00:00
nurjinn jafar
1bf7ff8994 null check added 
path to confetti fixed after refactoring
 2020-12-01 17:15:02 +01:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
Michael Telatynski
26e1cdb82c Update i18n 2020-12-01 12:04:41 +00:00
Jason Robinson
c03a50e34b
Semiclon 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:51:46 +02:00
Jason Robinson
8f7b012ec1
Interface syntax 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:50:58 +02:00
Jason Robinson
85ce95e066
Interface syntax 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:50:42 +02:00
Jason Robinson
f112f4fcef
Method scoping 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:49:47 +02:00
Jason Robinson
a67ad0750d
Code styling 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:49:04 +02:00
anonym
b1b0e93d5e
Update i18n for Appearance User Settings 
The variable has to be added to the i18n files as well (I don't know how to do that)
 2020-11-30 21:33:52 +01:00
David Baker
cb6c080828 Fix remote video being too tall and causing aux panel to scroll 2020-11-30 16:44:31 +00:00
Michael Telatynski
d4ed4a135c
Merge pull request #5442 from RinkiyaKeDad/avatar-fix 
Fixed Avatar for 3PID invites
 2020-11-30 09:49:05 +00:00
macekj
200c061968 remove unnecessary plus checks in emoji regexes 
Signed-off-by: macekj <macekj@umich.edu>
 2020-11-27 19:41:45 -05:00
Steffen Kolmer
0e53e220d0
Fixed copy paste error 2020-11-27 17:25:34 +01:00
nurjinn jafar
82023dcf42 Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
Travis Ralston
ced68a6fbc
Merge pull request #5447 from matrix-org/travis/fix-stickerpicker 
Fix the stickerpicker
 2020-11-27 07:06:35 -07:00
Jason Robinson
cdf8aa13cc Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-11-27 16:01:29 +02:00