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

12344 commits

Author SHA1 Message Date
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
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
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
Šimon Brandner
eb64e5b2af Merge branch 'develop' into feature-change-password-validation 2020-11-27 14:46:08 +01:00
Michael Telatynski
edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700 
Simplify UserMenu for Guests as they can't use most of the options
 2020-11-27 10:57:54 +00:00
Michael Telatynski
00b1cd01eb Update copy 2020-11-27 09:44:04 +00:00
Arsh Sharma
cb3b8b6c77 fix(EventTile): updated comment 2020-11-27 14:13:42 +05:30
Travis Ralston
80f1df6d95 Don't needlessly persist user widgets 
Fixes https://github.com/vector-im/element-web/issues/15842

We don't have a concept of a stickerpicker staying on screen, so don't make it a thing yet.
 2020-11-26 15:09:08 -07:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Šimon Brandner
acd148d807 Remove nonsense lines 2020-11-26 16:58:34 +01:00
Michael Telatynski
5f03cbd88f Iterate PR some more 2020-11-26 15:45:15 +00:00
Michael Telatynski
86025459f4 Remove unused dialog, todo comments and other tiny tweaks 2020-11-26 15:01:12 +00:00
David Baker
2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00
Arsh Sharma
8386e50240 fix(EventTile): commited suggestions 2020-11-26 17:18:11 +05:30
Travis Ralston
fc820c4b1a Construct modal widgets in the same way we do any other widget 
Fixes https://github.com/vector-im/element-web/issues/15800
 2020-11-25 18:51:27 -07:00
Travis Ralston
51f6205258 Fix modal buttons not being disabled by disabling them 
Looks like this was just a missed block of code, but also the important bit.

Fixes https://github.com/vector-im/element-web/issues/15801
 2020-11-25 18:48:18 -07:00
Travis Ralston
5da27aed94 Replace the concept of a Widget Security Key with an OIDC state 
The security key naming/practice was misguided, so let's call it what it is (a settings key) and abstract away the complexity to a new store.

Fixes https://github.com/vector-im/element-web/issues/15820 while we're here.
 2020-11-25 18:39:11 -07:00
Michael Telatynski
c4084196d1 delint 2020-11-25 10:39:44 +00:00
Michael Telatynski
1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
Michael Telatynski
758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski
6a315e80b6 Improve auth error messages 2020-11-25 09:24:24 +00:00
Michael Telatynski
225d541487 Extend Field and InfoDialog with more configurability 2020-11-25 09:19:08 +00:00
Michael Telatynski
2f64160a0e Remove backwards compatibility in ServerConfig for m.require_identity_server 2020-11-25 09:00:31 +00:00
Arsh Sharma
5e239690da fix(EventTile): made revisions 2020-11-25 12:46:14 +05:30
macekj
2ffdfaef68 remove unnecessary lookbehind and comment emoticon regex 
Signed-off-by: macekj <macekj@umich.edu>
 2020-11-24 11:42:53 -05:00
Arsh Sharma
f271e117cf fix(EventTile): conditionally added avatar 2020-11-24 17:45:20 +05:30
Michael Telatynski
f7d7182dc9 Iterate Multi-SSO support 2020-11-24 12:09:11 +00:00
Michael Telatynski
b1ca1eb3f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Michael Telatynski
613710b75c Iterate Auth copy 2020-11-23 17:01:35 +00:00
David Baker
37059a3fcd Move call listener out of MatrixChat 
and into callhandler
 2020-11-23 16:20:15 +00:00
David Baker
f0fdfd53d2
Merge pull request #5432 from matrix-org/dbkr/new_look_callview 
New Look in-Call View
 2020-11-23 15:51:09 +00:00
Travis Ralston
054560b6a7
Merge pull request #5435 from matrix-org/travis/window-widgets 
Support arbitrary widgets sticking to the screen + sending stickers
 2020-11-23 08:32:46 -07:00
David Baker
2e3d889bbf consistent capitalisation 2020-11-23 15:28:54 +00:00
Michael Telatynski
56ffa17b89
Merge pull request #5433 from matrix-org/t3chguy/socials_preamble 
Auth typescripting and validation tweaks
 2020-11-23 14:14:25 +00:00
Michael Telatynski
2263280035 Improve no email warning during registration 2020-11-23 10:25:46 +00:00
Michael Telatynski
6f6e850075 lowercase username placeholder in Password Login and Registration Form 2020-11-23 10:23:28 +00:00
Šimon Brandner
15ffdcb652 Added trailing comma 2020-11-22 09:57:22 +01:00
Šimon Brandner
dbce418b63 Check if old password is empty 2020-11-22 09:26:51 +01:00
Šimon Brandner
cd197133aa Button click validation 
Check validity when clicking change password button
 2020-11-22 08:49:20 +01:00
Šimon Brandner
651d6f4320 Merge branch 'develop' into feature-change-password-validation 2020-11-21 20:23:27 +01:00
Šimon Brandner
7e786e67a8 Added live validation 2020-11-21 20:10:38 +01:00
Travis Ralston
43be434aec Appease the linter 2020-11-20 19:36:45 -07:00
Travis Ralston
107fa98180 Support arbitrary widgets sticking to the screen + sending stickers 
Following https://github.com/matrix-org/matrix-react-sdk/pull/5385, it is now possible for a widget to request these capabilities without being a video conference or sticker picker. This commit actually enables this support for those kinds of widgets.

This commit also fixes an issue in the URL templating where some variables might get set to 'undefined' - this appears to be a scoping issue, so StopGapWidget now stores the definition alongside the superclass. 

Fixes https://github.com/vector-im/element-web/issues/15001
 2020-11-20 16:53:15 -07:00
Travis Ralston
5f47077a30
Merge pull request #5385 from matrix-org/travis/msc-send-widget-events 
Add new widget API actions for changing rooms and sending/receiving events
 2020-11-20 09:17:18 -07:00
Michael Telatynski
8c2f1b4342
Merge pull request #5434 from matrix-org/t3chguy/fix/15755 
Revert room header click behaviour to opening room settings
 2020-11-20 16:14:49 +00:00
Michael Telatynski
cc12f2f017 delint 2020-11-20 14:20:22 +00:00
Michael Telatynski
0c179e9e6a Revert room header click behaviour to opening room settings 2020-11-20 13:58:28 +00:00
Michael Telatynski
5ee21d448b
Merge pull request #5160 from czeidler/ctrl-enter-send 
Add option to send/edit a message with Ctrl + Enter / Command + Enter
 2020-11-20 13:47:52 +00:00
Michael Telatynski
d85b5b6e2b delint & post-rebase fixes 2020-11-20 13:34:44 +00:00
Michael Telatynski
3dcb58f108 Convert RegistrationForm to Typescript 2020-11-20 13:25:27 +00:00
Michael Telatynski
d45d0c6633 Convert Registration to Typescript 2020-11-20 13:23:10 +00:00
Michael Telatynski
7243ba0fe2 Convert Login to Typescript 2020-11-20 13:23:10 +00:00
Michael Telatynski
7397cebbea Convert PasswordLogin to Typescript 2020-11-20 13:23:10 +00:00
Michael Telatynski
85fbc6d89f Consolidate PasswordLogin state and input control/ownership 
previously data was stored in two places which drifted
 2020-11-20 13:23:10 +00:00
Michael Telatynski
0b74d3a0ef Use field validation for PasswordLogin instead of global errors 2020-11-20 13:23:10 +00:00
Michael Telatynski
c94137b106
Merge pull request #5409 from matrix-org/t3chguy/home-page-analytics 
Add Analytics instrumentation to the Homepage
 2020-11-20 10:08:57 +00:00
czeidler
063b26835e
Fix coding style 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2020-11-20 19:02:52 +13:00
Travis Ralston
dec47a260c Appease the linter 2020-11-19 12:12:00 -07:00
Travis Ralston
0104164d51 Approximate the design as proposed 2020-11-19 12:06:24 -07:00
Travis Ralston
21663314ee Minor touchups to the dialog 2020-11-19 11:24:17 -07:00
Travis Ralston
ddd8bdc00e Move all the capability copy to its own class 2020-11-19 11:15:42 -07:00
David Baker
b518b33169 Factor the height of the header into the max video height 2020-11-19 17:33:43 +00:00
David Baker
49bd66c377 Change fullscreen button to expand button in PIP view 
and fix call controls which didn't appear in video call
 2020-11-19 16:36:23 +00:00
David Baker
50965e41eb Remove call bar 
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
 2020-11-19 15:15:31 +00:00
J. Ryan Stinnett
dea4fd661a
Merge pull request #5430 from matrix-org/jryans/fix-encrypted-videos 
Fix encrypted video playback in Chrome-based browsers
 2020-11-19 13:59:35 +00:00
J. Ryan Stinnett
3e85b6d085 Fix encrypted video playback in Chrome-based browsers 
For Chrome-based browsers, it seems we need to set some non-empty `src` URI for
the video element's play button to be enabled, so this crafts an empty `data`
URI and ensures playing is triggered once the real content has been fetched.

Fixes https://github.com/vector-im/element-web/issues/15694
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5352
 2020-11-19 13:30:05 +00:00
Michael Telatynski
14391a7295 Post-merge fix 2020-11-19 11:11:57 +00:00
Michael Telatynski
532b2e5ced Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/home-page-analytics 
 Conflicts:
	src/components/structures/HomePage.tsx
 2020-11-19 11:11:10 +00:00
Clemens Zeidler
1346416d20 Merge branch 'develop' into ctrl-enter-send 2020-11-19 19:40:38 +13:00
Travis Ralston
55592d365c Merge branch 'develop' into travis/msc-send-widget-events 2020-11-18 15:57:53 -07:00
Travis Ralston
57562560d2
Merge pull request #5331 from Transfusion/invisible_rooms_notif_badge 
Search through the list of unfiltered rooms rather than the rooms in the state which are already filtered by the search text
 2020-11-18 15:24:01 -07:00
Travis Ralston
df6218ef4a
Merge pull request #5364 from mkenigs/mxc-imgs 
Specify community description img must be mxc urls
 2020-11-18 15:21:09 -07:00
Heiko Carrasco
3fd13b89b8
Merge branch 'develop' into develop 2020-11-18 20:14:25 +01:00
J. Ryan Stinnett
f7e2d70ddf Tweak video component code style 2020-11-18 17:41:54 +00:00
Michael Telatynski
11fb081f7a
Merge pull request #5423 from matrix-org/t3chguy/sso 
Redirect user home from auth screens if they are already logged in
 2020-11-18 15:49:47 +00:00
J. Ryan Stinnett
23d039b961
Merge pull request #5428 from matrix-org/jryans/fix-message-search-summary 
Fix message search summary text
 2020-11-18 15:21:04 +00:00
J. Ryan Stinnett
14e64c10a3 Restore numeric count as well for better pluralisation 2020-11-18 15:16:35 +00:00
J. Ryan Stinnett
95a436cdaf Use room(s) style in message 2020-11-18 14:57:31 +00:00
David Baker
41e885dd67 Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview 2020-11-18 14:28:03 +00:00
David Baker
a2d58e2f1f Make new in-call UI work 
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
 * PIP view has no buttons, and not moveable yet
 * No call status in room view yet
 * Room status bar is still there currently
 2020-11-18 14:22:38 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle 
Small delight tweaks to improve rough corners in the app
 2020-11-18 10:07:31 +00:00
Travis Ralston
3ce45ef185
Merge pull request #5424 from matrix-org/travis/fix-dms 
Fix DM logic to always pick a more reliable DM room
 2020-11-17 20:42:30 -07:00
Travis Ralston
a212dab84c Developer design a permissions dialog 2020-11-17 20:38:59 -07:00
macekj
ba8d02a808 add quick shortcut emoji feature and tests 
Signed-off-by: macekj <macekj@umich.edu>
 2020-11-17 17:36:58 -05:00
Michael Telatynski
e05fcc8d34
Merge pull request #5408 from matrix-org/t3chguy/fix/15400 
Update styling of the Analytics toast
 2020-11-17 15:35:20 +00:00
Travis Ralston
94550546eb Merge branch 'develop' into travis/msc-send-widget-events 2020-11-16 15:08:52 -07:00
Travis Ralston
91b1c8b817 Fix DM logic to always pick a more reliable DM room 
Fixes https://github.com/vector-im/element-web/issues/15605
 2020-11-16 15:07:09 -07:00
Michael Telatynski
5b32287f3d Redirect user home from auth screens if they are already logged in 2020-11-16 15:56:54 +00:00
Michael Telatynski
6a3049b90f Remove old unused views/paths 2020-11-16 15:40:56 +00:00
Michael Telatynski
447e87ceab
Merge pull request #5422 from matrix-org/t3chguy/fix/_940 
Fix BaseAvatar sometimes messing up and duplicating the url
 2020-11-13 00:29:26 +00:00
Michael Telatynski
75888fb7b6 Fix BaseAvatar sometimes messing up and duplicating the url 2020-11-13 00:16:58 +00:00
Travis Ralston
962b964c07
Merge pull request #5412 from matrix-org/travis/msc2790-disabled-buttons 
Disable buttons when required by MSC2790
 2020-11-12 12:02:20 -07:00
David Baker
c921567831 WIP: the new call views work now 
just need to add the buttons and then get rid of the status bar
 2020-11-12 18:09:56 +00:00
Michael Telatynski
5f23c9499c Simplify UserMenu for Guests as they can't use most of the options 2020-11-12 12:46:55 +00:00
Michael Telatynski
f0ca8e152e
Merge pull request #5414 from matrix-org/t3chguy/fix/7420 
Fix drag drop file to upload for Safari
 2020-11-12 10:44:09 +00:00
Michael Telatynski
24a393342d
Merge pull request #5416 from matrix-org/t3chguy/fix/14852 
Fix poorly i18n'd string
 2020-11-12 10:43:22 +00:00
Michael Telatynski
b32a2c1b92
Merge pull request #5417 from matrix-org/t3chguy/fix/15698 
Fix the feedback not closing without feedback/countly
 2020-11-12 10:41:36 +00:00
Michael Telatynski
56d24fc723
Merge pull request #5419 from matrix-org/t3chguy/fix/15701 
Fix New Room Intro invite to this room button
 2020-11-11 18:32:45 +00:00
Michael Telatynski
bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415 
Change how we expose Role in User Info and hide in DMs
 2020-11-11 18:15:46 +00:00
Michael Telatynski
2adc578d28 mark the onClick prop required on AccessibleButton 2020-11-11 17:31:30 +00:00
Michael Telatynski
0911007c77 fix issue with server selector introduced in this PR 2020-11-11 17:12:27 +00:00
Michael Telatynski
edb5e10506 Iterate registration to simplify it based on usertesting 2020-11-11 17:04:10 +00:00
Michael Telatynski
b3ccabbe6b Clear recaptcha error on reattempts 2020-11-11 17:04:09 +00:00
Michael Telatynski
0bee4bd72b Update Confirm password placeholder 2020-11-11 17:04:09 +00:00
Michael Telatynski
d0513406ee Pass filter text when clicking explore/dm prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
a481f3bdf1 Iterate the filtering prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
d3fee540c5 Update Room List filter copy 2020-11-11 17:04:09 +00:00
Michael Telatynski
187901004d Fix the Join rooms prompt not showing up due to missing updates 2020-11-11 17:04:09 +00:00
Michael Telatynski
d5c399dfd9 Fix Left Panel layout being wrong when filtering with 0 rooms 2020-11-11 17:04:09 +00:00
Michael Telatynski
1a2bd55c09 Fix New Room Intro invite to this room button 2020-11-11 16:58:39 +00:00
Michael Telatynski
b2366c38ba Fix the feedback not closing without feedback/countly 2020-11-11 16:54:11 +00:00
Michael Telatynski
979faf23e8 Fix poorly i18n'd string 2020-11-11 16:49:51 +00:00
Michael Telatynski
f73573881e
Merge pull request #5390 from matrix-org/t3chguy/fix/15524 
Disallow sending of empty messages
 2020-11-11 10:23:32 +00:00