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

16024 commits

Author SHA1 Message Date
Michael Telatynski
0697470cc8 Update copy 2021-09-29 16:05:03 +01:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski
ad5842c87a Allow closing Dropdown via its chevron 2021-09-29 14:24:12 +01:00
Michael Telatynski
d6cab320e9 Fix space invite edge cases 2021-09-29 14:04:02 +01:00
Richard van der Hoff
c99216814f fix lint 2021-09-29 11:20:51 +01:00
Richard van der Hoff
b285315cb8 Fix ScrollPanel.isAtBottom for non-standard DPI settings 2021-09-29 11:16:41 +01:00
Michael Telatynski
399ceaf002
Merge pull request #6879 from matrix-org/t3chguy/fix/19164 2021-09-29 10:05:43 +01:00
Michael Telatynski
02c5b7e28d Pluck out some more applicable styles 2021-09-28 16:36:25 +01:00
Michael Telatynski
4335cd03c5 Pluck out JoinRuleSettings styles so they apply in space settings too 2021-09-28 16:30:17 +01:00
Michael Telatynski
886f8d31fb Iterate title on confirm space action dialog 2021-09-28 16:23:42 +01:00
Michael Telatynski
0f8069ac35 Switch ConfirmUserActionDialog over to using a Field 2021-09-28 16:22:27 +01:00
Michael Telatynski
207a1143fc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 2021-09-28 15:45:09 +01:00
Germain
ca3b8e596a
Merge pull request #6873 from matrix-org/gsouquet/threads-action-bar-19127 2021-09-28 15:07:36 +01:00
Dariusz Niemczyk
8331d4c7b7
Happily handle empty text messages (#6825) 
This commig refactors the message-deletion modal and reuses it for case of removing
the entire message and trying to send it, which should trigger removal flow instead.

Fix vector-im/element-web#18873
 2021-09-28 15:04:25 +01:00
Germain Souquet
c1165830ed Create rendering context enum for MessageActionBar 2021-09-28 14:55:00 +01:00
Michael Telatynski
7f63f496be delint 2021-09-28 14:03:41 +01:00
Michael Telatynski
ce0f16d58b Fix pagination when filtering space hierarchy 2021-09-28 13:52:30 +01:00
Germain Souquet
160bf8e21f Fix missing prop 2021-09-28 11:06:06 +01:00
Germain Souquet
e52a33e93c Merge branch 'develop' into gsouquet/threads-action-bar-19127 2021-09-28 09:34:43 +01:00
Travis Ralston
8e497f8c56
Merge pull request #6871 from psrpinto/fix/close-url-preview-button 
Fix issue with preview panel close button not appearing for certain messages containing a URL
 2021-09-27 13:42:11 -06:00
Paulo Pinto
432dd994bd Filter out invalid previews 
The call to cli.getUrlPreview() might return an empty object ({}), which means
there is in fact no preview for that URL.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-09-27 18:07:54 +01:00
Paulo Pinto
dabc13c98f Extract logic to a function 
For better readability of the call to useAsyncMemo()

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-09-27 18:07:54 +01:00
Šimon Brandner
e2b6c2cbd6
Convert RoomNotifs to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 18:39:57 +02:00
Travis Ralston
77ad0a9142
Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787 
Improve AUX panel behaviour
 2021-09-27 10:16:05 -06:00
Michael Telatynski
c39519a753 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/spaces-admin-check 2021-09-27 13:46:51 +01:00
Šimon Brandner
30599554f1
Convert PageTypes to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 14:41:03 +02:00
Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages (#6701) 
In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.

Fixes https://github.com/vector-im/element-web/issues/18884
 2021-09-27 12:20:37 +02:00
Michael Telatynski
6d0af83df4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969 
 Conflicts:
	src/components/views/dialogs/LeaveSpaceDialog.tsx
	src/i18n/strings/en_EN.json
 2021-09-27 11:19:49 +01:00
Šimon Brandner
0cba943f96
Fix types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:35:33 +02:00
Šimon Brandner
6a88ac900c
Merge remote-tracking branch 'upstream/develop' into task/messages-ts 2021-09-27 10:32:25 +02:00
Šimon Brandner
2712dde581
Remove empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:28:07 +02:00
Šimon Brandner
dd92f8f1f9
Move imports 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 10:21:46 +02:00
Šimon Brandner
a1d5e7ba66
Add return type 
Co-authored-by: Germain <germain@souquet.com>
 2021-09-27 10:12:55 +02:00
Šimon Brandner
6aa5d98741
Remove constructor 
Co-authored-by: Germain <germain@souquet.com>
 2021-09-27 10:12:45 +02:00
Šimon Brandner
af9429c8a0
Convert ActiveWidgetStore to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 19:57:02 +02:00
Šimon Brandner
fb5c18caa0
Convert MKeyVerificationConclusion to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 14:51:46 +02:00
Šimon Brandner
c287d15fa0
Convert RoomCreate to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:42:29 +02:00
Šimon Brandner
421fa1ab69
Convert RoomAvatarEvent to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:42:28 +02:00
Šimon Brandner
ff1c1fbc78
Convert MjolnirBody to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:08:05 +02:00
Šimon Brandner
bee85a0bcd
Convert EditHistoryMessage to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-26 13:08:04 +02:00
Germain
79b52f8a22
Merge pull request #6857 from matrix-org/gsouquet/composer-reply-18989 2021-09-24 15:05:40 +01:00
David Baker
9f26cca256 Fix the User View 
Extreme confusion between users and members, and presumably we were
passing one as the other and they were similar enough that it
worked.

UserView still makes fake member objects but this at least fixes
the user view in the right panel.

Fixes https://github.com/vector-im/element-web/issues/19158
 2021-09-24 14:35:00 +01:00
Germain Souquet
8348add67f Add MessageActionBar to ThreadView 2021-09-24 14:19:11 +01:00
Germain Souquet
836e427dc8 Scope editor reset when reply changed for thread view 2021-09-24 11:13:57 +01:00
Germain Souquet
82d685e410 Only switch to ThreadPanel when roomId changes 2021-09-24 11:06:07 +01:00
Germain Souquet
070f279ae7 Close thread view when changing room 2021-09-23 14:44:03 +01:00
Germain Souquet
bd599c96a3 Add React lifecycle methods publicity and return types 2021-09-23 14:43:39 +01:00
Germain Souquet
a9f7ab785c Change CIDER state persistence key to cater for threads 
Extending the CIDER state persistence to threads and make sure that SendMessageComposer can restore drafts for specific threads

This also prevents the thread's replyToEvent to leaking in the room composer
 2021-09-23 10:59:33 +01:00
Jaiwanth
d1e3d35d40 Change export bundle filename format, light theme for all exports and import jszip after export cta 2021-09-22 22:17:23 +05:30
Germain
2cd5b731bf
Merge pull request #6851 from matrix-org/gsouquet/timeline-rendering-18719 2021-09-22 17:23:07 +01:00
Travis Ralston
7cd7cf87e3
Merge pull request #6853 from videogame-hacker/patch/undefined-3pids 
Fix Notifications settings view when threepids is undefined
 2021-09-22 10:22:58 -06:00
David Baker
f69854b274
Merge pull request #6856 from SimonBrandner/fix/soft-crash 
Fix `AppsDrawer` soft crash
 2021-09-22 14:56:00 +01:00
Šimon Brandner
96c16354ca
Fix soft crash 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 15:47:15 +02:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
videogame hacker
d323bc4c07 Fix Notifications settings view when threepids is undefined 
Signed-off-by: Charlotte Som <half-kh-hacker@hackery.site>
 2021-09-22 13:17:49 +01:00
Germain Souquet
1265fe6b86 Set comprehensive set of props for thread's MessagePanel 2021-09-22 10:48:24 +01:00
Šimon Brandner
4adc900d00
Remove autoFocus 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 10:46:59 +02:00
Šimon Brandner
d3e340e7ce
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 10:42:02 +02:00
Šimon Brandner
8bbaf642bf
Avoid self = this 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 08:11:26 +02:00
Šimon Brandner
7f8c0e99ea
Merge remote-tracking branch 'upstream/develop' into task/settings-ts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 19:35:42 +02:00
Dariusz Niemczyk
7bd3535b9f
Merge pull request #6454 from SimonBrandner/feature/image-view-load-anim/18186 
* Give lightbox a background load animation
* Extends IMediaEventContent by thumbnail info
* Give image view panel a loading animation
* Initial implementation of loading animation
* Take panel height into account
* Update animation speed
* Add some null guards
* Fix animation issues
* Move animations into _animations
* Where does that magic number come from?
* Remove awaiting setState()
* Use CSS var in JS
* Handle prefers-reduced-motion
* More prefers-reduced-motion friendliness

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 18:05:13 +02:00
Šimon Brandner
b2c0f57c4b
More prefers-reduced-motion friendliness 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 17:59:13 +02:00
Dariusz Niemczyk
2d1d42b90e
Globally replace all console.logs via codemod (#6827) 
This commit replaces all the `console.log` to `logger.log` via an automated script.
Related: vector-im/element-web#18425
 2021-09-21 09:48:09 -06:00
Šimon Brandner
7022ab4f8a
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186 2021-09-21 17:36:26 +02:00
Šimon Brandner
499b470d07
Use CSS var in JS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 17:36:16 +02:00
Travis Ralston
3a548d4c9c
Merge pull request #6547 from SimonBrandner/feature/call-upgrades 
Update muting in calls to work with the js-sdk call upgrade changes
 2021-09-21 09:18:54 -06:00
Travis Ralston
a655dde5eb
Merge pull request #6839 from SimonBrandner/task/rooms-ts 
Convert `/src/components/views/rooms` to TS
 2021-09-21 09:13:23 -06:00
Travis Ralston
2eea606442
Merge pull request #6815 from SimonBrandner/task/elements-ts 
Convert `/src/components/views/elements` to TS
 2021-09-21 09:12:56 -06:00
Šimon Brandner
7862f9842a
Use IDialogProps 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 15:10:28 +02:00
Šimon Brandner
0bae01c824
Convert SecureBackupPanel to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 15:10:23 +02:00
Šimon Brandner
9051df45c1
Convert ChangePassword to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 15:00:08 +02:00
Šimon Brandner
073eff4c71
Convert SecurityUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:59:29 +02:00
Šimon Brandner
222427dae8
Convert GeneralUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:45:38 +02:00
Šimon Brandner
e88227dac8
Convert LabsUserSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 13:19:13 +02:00
Šimon Brandner
f62e0795f0
Convert NotificationsSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:51:47 +02:00
Šimon Brandner
c5a1de961b
Convert GeneralRoomSettingsTab to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:44:40 +02:00
Šimon Brandner
76f8543c22
Convert PhoneNumber to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:40:32 +02:00
Šimon Brandner
2ebbda482d
Convert EmailAddress to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:33:11 +02:00
Šimon Brandner
39f92c4ddc
Convert PhoneNumbers to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:22:14 +02:00
Šimon Brandner
a2ecf18096
Convert EmailAddresses to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 12:22:07 +02:00
Germain
14c92b72b2
Merge pull request #6842 from matrix-org/gsouquet/fix-19016 2021-09-21 10:14:01 +01:00
Ekaterina Gerasimova
d2fe8aff11 Improve string for leaving space in leave dialog 
Doesn't leave subspaces either, but those are in Beta so we probably
shouldn't mention them for now so the user doesn't get confused

Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
 2021-09-21 08:55:28 +01:00
Šimon Brandner
24df63abd7
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 09:09:21 +02:00
Šimon Brandner
f84a98b933
Fix enum casing once again 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-21 08:25:25 +02:00
Šimon Brandner
bce4d44d0d
Revert Firefox composer delation hacks 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 17:32:54 +02:00
Šimon Brandner
ec4f672a13
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 17:19:03 +02:00
Šimon Brandner
26ae71f093
Lose underscore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 17:16:01 +02:00
Šimon Brandner
459e028137
Fix some regressions 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 17:15:36 +02:00
Šimon Brandner
0df67d005e
Ditch displayName 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 17:11:14 +02:00
Šimon Brandner
6d916bfdde
Fix enum casing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 17:10:22 +02:00
Travis Ralston
5b8279dd16
Merge pull request #6837 from SimonBrandner/fix/ctrl-backspace 
Don't `fakeDeletion()` when `CTRL` is pressed
 2021-09-20 08:34:31 -06:00
Šimon Brandner
60e47c759d
Convert AppsDrawer to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 16:20:00 +02:00
Germain
e4e696f409
Merge pull request #6838 from SimonBrandner/task/room_settings-ts 2021-09-20 14:52:40 +01:00
David Baker
b69f3f2dff
Merge pull request #6830 from matrix-org/t3chguy/fix/npe2 
Fix accessing field on oobData which may be undefined
 2021-09-20 13:38:20 +01:00
Germain Souquet
0a5e1772a5 hide thread info when there are 0 replies 2021-09-20 12:55:57 +01:00
Germain Souquet
225380b248 Do not hide the root event of a thread 2021-09-20 12:53:08 +01:00
Šimon Brandner
d9e8c32341
Convert E2EIcon to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-20 13:41:38 +02:00
Šimon Brandner
6f004d219c
Convert UrlPreviewSettings to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-19 09:59:53 +02:00
Šimon Brandner
a43e3450a5
Convert RoomProfileSettings to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-19 09:55:22 +02:00
Šimon Brandner
756b3fb681
Merge remote-tracking branch 'upstream/develop' into feature/call-upgrades 2021-09-19 07:45:13 +02:00
Šimon Brandner
4eda5b186a
Handle MacOS option key 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-19 07:37:25 +02:00
Šimon Brandner
649b655a48
Don't fake deletion when CTRL is pressed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-18 20:43:23 +02:00
Šimon Brandner
a2977f5b17
Update muting to work with the js-sdk call upgrade changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-18 12:40:32 +02:00
Travis Ralston
eb0859c4a6
Merge pull request #6831 from SimonBrandner/fix/end-of-line-emoji-edit/19084 
Convert end-of-line emoji when editing
 2021-09-18 00:47:06 -06:00
Travis Ralston
45058dfde9
Merge pull request #6832 from SimonBrandner/fix/ff-esr-pills 
Fix pill deletion on Firefox 78
 2021-09-18 00:46:51 -06:00
Eric Eastwood
9c3439a1aa
Show updated relation reply from edited message - v2 (#6817) 
Part of https://github.com/vector-im/element-web/issues/10391

When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.

ex.

```json
{
  "type": "m.room.message",
  "content": {
    "body": " * foo bar",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo bar",
      "msgtype": "m.text",
      "m.relates_to": {
        "m.in_reply_to": {
          "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
        }
      }
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
    }
  }
}
```
 2021-09-17 15:18:52 -05:00
Šimon Brandner
36decbb6dd
Fix pill deletion on FF 78 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 19:25:28 +02:00
Šimon Brandner
b1ba5fb48c
Convert end-of-line emoji when editing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 19:13:46 +02:00
Michael Telatynski
1db2a745e8 Fix accessing field on oobData which may be undefined 2021-09-17 18:03:31 +01:00
Šimon Brandner
e1445f71bd
Convert AppTile to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:47:15 +02:00
Šimon Brandner
03ce568a5d
Convert EditableText to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:47:14 +02:00
Šimon Brandner
af853e1d86
Convert DialogButtons to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:47:14 +02:00
Šimon Brandner
cebf256dc0
Convert PersistedElement to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:47:08 +02:00
Šimon Brandner
a8d3bb76ef
Convert PersistentApp to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:54 +02:00
Šimon Brandner
819a2b4416
Convert PowerSelector to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:54 +02:00
Šimon Brandner
6f2ef34dd7
Convert SyntaxHighlight to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:54 +02:00
Šimon Brandner
8bf5d97b9e
Convert TextWithTooltip to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:54 +02:00
Šimon Brandner
96d1519ac5
Convert Spoiler to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:53 +02:00
Šimon Brandner
9e2bc28c06
Convert LazyRenderList TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:53 +02:00
Šimon Brandner
1ee606c693
Convert LanguageDropdown to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:53 +02:00
Šimon Brandner
17d2998ec1
Convert EditableTextContainer to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:53 +02:00
Šimon Brandner
ea623e79bb
Convert DirectorySearchBox to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:52 +02:00
Šimon Brandner
971d375a5c
Convert AppWarning to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:52 +02:00
Šimon Brandner
88cadd52a8
Convert VerificationQRCode to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-17 18:41:52 +02:00
Šimon Brandner
3428d83b23
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-17 18:41:03 +02:00
Šimon Brandner
31e1831f02
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-17 18:25:14 +02:00
Šimon Brandner
9a2d61bf20
Merge remote-tracking branch 'upstream/develop' into fix/emoji-dupe/19073 2021-09-17 17:54:07 +02:00
Michael Telatynski
d615952337 Add fallback warning 2021-09-17 16:02:12 +01:00
Michael Telatynski
1858c63c4a Allow options to cascade kicks/bans throughout spaces 2021-09-17 15:34:49 +01:00
Michael Telatynski
b91ece1bcf
Merge pull request #6828 from matrix-org/t3chguy/fix/a11y-label 2021-09-17 12:27:28 +01:00
Michael Telatynski
8c08293654 Fix reactions aria-label not being a string and thus being read as [Object object] 2021-09-17 11:36:22 +01:00
Michael Telatynski
af42a31794 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-17 10:22:57 +01:00
Michael Telatynski
68768002bb use more generic room type instead of boolean flag 2021-09-17 10:19:30 +01:00
Michael Telatynski
80caa5646f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/npe1 2021-09-17 09:39:55 +01:00
Michael Telatynski
2fc3662830 Fix space admin check false positive on multiple admins 2021-09-17 09:38:59 +01:00
Dariusz Niemczyk
58ffa5138b
Merge pull request #6822 from matrix-org/palid/thread-typescriptify 
Transcriptify thread events a bit
 2021-09-17 10:19:20 +02:00
Šimon Brandner
a5ee20febf
Simplifie code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-16 21:04:55 +02:00
Šimon Brandner
f4f40ce558
Fix code to move end of range more simply and safely 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-16 21:02:28 +02:00
Dariusz Niemczyk
0be6073058
Fix PR comments 2021-09-16 17:13:41 +02:00
Dariusz Niemczyk
d6788b023b
Fix PR comments 2021-09-16 16:04:18 +02:00
Dariusz Niemczyk
78587558d8
Transcriptify thread events a bit 2021-09-16 16:02:06 +02:00
Michael Telatynski
1e91191fa2 Fix missing null guard in space hierarchy pagination 2021-09-16 14:28:55 +01:00
Dariusz Niemczyk
f7d8ae2b13
Fix invalid accessor for method. 2021-09-16 15:21:40 +02:00
Michael Telatynski
1e04dfa11d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064 2021-09-16 11:46:00 +01:00
Michael Telatynski
ec4650c60d Fix abuse of MainSplit in LegacyCommunityPreview 2021-09-16 11:23:41 +01:00
Michael Telatynski
febd3df5ac Fix MainSplit IProps 2021-09-16 11:22:55 +01:00
Michael Telatynski
28bc8010a7 Say Joining space instead of Joining room where we know its a space 2021-09-16 11:20:01 +01:00
Michael Telatynski
4bb9eeb7a5 Convert RoomPreviewBar to Typescript 2021-09-16 11:09:58 +01:00
Michael Telatynski
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Michael Telatynski
3b39ba6590
Merge pull request #6787 from SimonBrandner/task/structures-ts 2021-09-16 10:45:12 +01:00
Michael Telatynski
bbc8e4da23
Merge pull request #6594 from matrix-org/t3chguy/fix/18088 2021-09-16 10:16:33 +01:00
Michael Telatynski
b052d0730d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858 2021-09-16 10:15:43 +01:00
Michael Telatynski
edf7764a3e
Merge pull request #6319 from SimonBrandner/fix/user-info-dm/17877 2021-09-16 10:09:22 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Travis Ralston
a103a2ceaa Revert "Show updated relation reply from edited message (#6809)" 
This reverts commit eaab8e1570.
 2021-09-15 14:34:28 -06:00
Eric Eastwood
eaab8e1570
Show updated relation reply from edited message (#6809) 
Part of https://github.com/vector-im/element-web/issues/10391#issuecomment-906131724

When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.

ex.

```json
{
  "type": "m.room.message",
  "content": {
    "body": " * foo bar",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo bar",
      "msgtype": "m.text",
      "m.relates_to": {
        "m.in_reply_to": {
          "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
        }
      }
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
    }
  }
}
```
 2021-09-15 11:49:04 -05:00
David Baker
4f53e6cddd Merge remote-tracking branch 'origin/develop' into dbkr/fix_roomlist_prompt 2021-09-15 15:13:52 +01:00
David Baker
0f98c9127d Fix checks to show prompt to start new chats 
We compared the length of the list rooms but not historical or favourite.

Caught by new version of typescript when I tried to upgrade.
 2021-09-15 15:08:23 +01:00
Šimon Brandner
a571460871
Use a universal copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-15 15:30:23 +02:00
Šimon Brandner
8094a34384
Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-15 15:28:05 +02:00
Travis Ralston
34ce61862d
Merge pull request #6782 from SimonBrandner/fix/screensharing-dialog 
Don't show screensharing dialog on web
 2021-09-14 13:36:35 -06:00
Travis Ralston
7b9dc09cd4
Merge pull request #6784 from SimonBrandner/fix/end-of-line-emoji 
Replace plain text emoji at the end of a line
 2021-09-14 13:33:34 -06:00
Travis Ralston
18d406421b
Merge pull request #6806 from SimonBrandner/task/remove-message_send_failed 
Remove `message_send_failed` dispatch
 2021-09-14 13:10:07 -06:00
Travis Ralston
333418232d
Merge pull request #6808 from SimonBrandner/task/context_menus-ts 
Convert `/context_menus` and `/avatars` to TS
 2021-09-14 13:07:15 -06:00
Šimon Brandner
6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed 2021-09-14 19:31:12 +02:00
Šimon Brandner
67d328c7fd
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 19:30:52 +02:00
Eric Eastwood
fddc20dd89
Remove replies from hidden events when shown with messages.ViewSourceEvent (#6796) 
As discovered in https://github.com/vector-im/element-web/issues/10391#is

Previously, if you turned on the `showHiddenEventsInTimeline` labs flag, edit (`m.replace`) events
that also have a `m.in_reply_to` field, will show the reply in the timeline.

ex.
```
{
  "type": "m.room.message",
  "content": {
    "body": " * foo",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo",
      "msgtype": "m.text"
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$yvuev9bF2nLRf8fscG55njpVjY3FHJzWgZ4BKI9_0eg",
      "m.in_reply_to": {
        "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
      }
    }
  }
}
```
 2021-09-14 12:28:28 -05:00
Šimon Brandner
0f55fde03a
Convert StatusMessageContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:19 +02:00
Šimon Brandner
11e61075b4
Convert GenericTextContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:18 +02:00
Šimon Brandner
8e4529d6ce
Convert GenericElementContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:18 +02:00
Šimon Brandner
5baaa6b77e
Convert MemberStatusMessageAvatar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:12 +02:00
Šimon Brandner
aab030d105
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-14 18:29:41 +02:00
Šimon Brandner
f5d8bb7cbe
Remove awaiting setState() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 18:15:27 +02:00
Šimon Brandner
ccc042b7d7
Where does that magic number come from? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 18:06:01 +02:00
Šimon Brandner
db25147a19
Remove message_send_failed as it was unused 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 17:49:18 +02:00
Šimon Brandner
047767bab0
Improve typing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 17:38:34 +02:00
Šimon Brandner
2f6239770a
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 17:32:00 +02:00
Šimon Brandner
b26bec949d
Use React.Children.count() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 17:19:57 +02:00
Michael Telatynski
b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski
6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Michael Telatynski
60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Michael Telatynski
5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +01:00
Michael Telatynski
e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski
e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Dariusz Niemczyk
74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012 
Fix emoji picker and stickerpicker not appearing correctly when opened
 2021-09-14 14:56:49 +02:00
Dariusz Niemczyk
60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +02:00
Michael Telatynski
3c44969645 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-09-14 11:42:51 +01:00
Michael Telatynski
be58a5e623
Merge pull request #6790 from matrix-org/t3chguy/fix/19007 
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
 2021-09-14 09:07:37 +01:00
Michael Telatynski
73a2225b10
Merge pull request #6792 from matrix-org/t3chguy/fix/19005 
Fix automatic field population in space create menu not validating
 2021-09-14 09:06:49 +01:00
Šimon Brandner
c460d56e50
Remove unused import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 06:37:08 +02:00
Šimon Brandner
eae45d8a7e
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 06:31:43 +02:00
Šimon Brandner
ffb3e98e3e
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-14 06:22:53 +02:00
Dariusz Niemczyk
ceafa83392
Fix invalid ContextualMenu positions 2021-09-13 22:11:58 +02:00
Dariusz Niemczyk
e913f03a67
Add missing types 2021-09-13 22:11:43 +02:00
Šimon Brandner
8a86407a4c
Use MatrixClientContext 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:28:52 +02:00
Šimon Brandner
807792dc69
Revert some changes that are unncessary due to js-sdk changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:24:53 +02:00
Šimon Brandner
44141bf048
Iterate PR first round 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:23:37 +02:00
Michael Telatynski
4a470e4341 Fix automatic field population in space create menu not validating 2021-09-13 17:15:52 +01:00
Šimon Brandner
e4cf7314f5
Fix init value 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:14:55 +02:00
Šimon Brandner
29ff5f3f9c
Add IDialogAesthetics 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:12:47 +02:00
Šimon Brandner
27b9175ca3
Use defer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:09:45 +02:00
Šimon Brandner
c9dea9948f
Use IAuthData 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:06:35 +02:00
Šimon Brandner
adb325b3bd
Use enums 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:05:59 +02:00
Šimon Brandner
71e84ccb75
Iterate PR first round 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:03:05 +02:00
Michael Telatynski
b6b099f6c8 Fix broken edge case with public space creation with no alias 2021-09-13 16:27:46 +01:00
Michael Telatynski
d75820a491 Hide mute/unmute button in UserInfo for Spaces as it makes no sense 2021-09-13 13:49:24 +01:00
Šimon Brandner
1590fe32cf
Convert RoomStatusBar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 10:15:34 +02:00
Šimon Brandner
e48407a1d6
Convert ViewSource to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 10:15:34 +02:00
Šimon Brandner
9a7e2b31d4
Convert IndicatorScrollbar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 10:15:28 +02:00
Šimon Brandner
ff7e32cdd1
Convert UserView to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 09:24:55 +02:00
Šimon Brandner
a6a56b455b
Convert GenericErrorPage to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:56:29 +02:00
Šimon Brandner
e882576f86
Convert EmbeddedPage to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:56:00 +02:00
Šimon Brandner
716aba2a0e
Convert MainSplit to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:40:56 +02:00
Šimon Brandner
4673e1aa49
Convert SearchBox to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:24:17 +02:00
Aaron Raimist
354d0cfba4
Redirect from /#/welcome to /#/home if already logged in 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-09-11 10:52:33 -05:00
Šimon Brandner
1a128c3a00
Merge remote-tracking branch 'upstream/develop' into feature/image-view-load-anim/18186 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 15:32:44 +02:00
Šimon Brandner
f4ca073b4a
Don't auto replace if not enabled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 10:26:15 +02:00
Šimon Brandner
fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 10:21:56 +02:00
Šimon Brandner
0defc4b14b
Don't show screensharing dialog on web 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 09:03:04 +02:00
Šimon Brandner
6e674b97c2
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-10 20:33:21 +02:00
Šimon Brandner
3fffbb0845
Use ISasEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 19:19:29 +02:00
Šimon Brandner
0efd599014
Fix types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 19:12:33 +02:00
Šimon Brandner
52d203dd8e
Add missing types 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 19:07:55 +02:00
Šimon Brandner
6568e22d70
Add missing import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 19:06:09 +02:00
Šimon Brandner
f2b2a04a21
Make room optional 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 19:03:29 +02:00
Michael Telatynski
ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Šimon Brandner
6e11f2478c
Use IDialogProps 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 19:01:05 +02:00
Šimon Brandner
ee90ff0b98
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-10 18:49:55 +02:00
Germain
1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code 2021-09-10 16:14:24 +01:00
Michael Telatynski
d15ea932f6 fix unrelated issues 2021-09-10 15:35:35 +01:00
Michael Telatynski
d46181385c Also default to PL invite=50 for private space creation 2021-09-10 13:05:04 +01:00
Michael Telatynski
6fcd930d0b fix unrelated issues 2021-09-10 11:54:25 +01:00
Michael Telatynski
41676b4a9b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891 2021-09-10 11:09:52 +01:00
Michael Telatynski
aff9be6120 Surface unsent messages on the sublist notification badge too 2021-09-10 10:58:13 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
2a8e8b93aa add comment 2021-09-10 09:48:46 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Robin Townsend
def1c68c16 Fix message bubble corners being wrong in the presence of hidden events 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-09-09 16:11:36 -04:00
Germain
051e166c68
Merge pull request #6772 from matrix-org/gsouquet/fix-18947 2021-09-09 18:56:49 +01:00
Germain
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00
David Baker
3f28454a8e
Merge pull request #6771 from matrix-org/dbkr/debounce_read_marker_update 
Debounce read marker update on scroll
 2021-09-09 18:24:08 +01:00
David Baker
bd5d02d690
Update comment too 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-09-09 18:15:51 +01:00
Travis Ralston
a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776 
Render guest settings only in public rooms/spaces
 2021-09-09 10:42:38 -06:00
Travis Ralston
bdb29e96fa
Merge pull request #6766 from matrix-org/travis/measure-encryption-perf 
Add config option to turn on in-room event sending timing metrics
 2021-09-09 10:38:15 -06:00
Germain Souquet
672dab1998 Force refresh threads timeline 
Fixes vector-im/element-web#18947

In the absence of a proper pending events / remote echo setup it seems fairly difficult to get the timeline to update

Adding a temporary helper to force refresh the timeline and not swallow local events when sending a message from the thread sidebar
 2021-09-09 17:31:05 +01:00
David Baker
a4aa6dfcd7 Debounce read marker update on scroll 
Reverts https://github.com/matrix-org/matrix-react-sdk/pull/6751 in
favour of debouncing the updates to read markers, because it seems
allowing the scroll to be 1px away from the bottom was important for
some browsers and meant they never got to the bottom.

We can fix the problem instead by debouncing the update to read
markers, because the scroll state gets reset back to the bottom when
componentDidUpdate() runs which happens after the read marker code
does a setState(). This should probably be debounced anyway since
it doesn't need to be run that frequently.

Fixes https://github.com/vector-im/element-web/issues/18961
Type: bugfix
 2021-09-09 15:58:19 +01:00
Germain Souquet
07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00