Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin Townsend 48d3e41351 Cache frequently used settings values in RoomContext 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:23:51 -04:00
Robin Townsend 40d2f8228f Fix watching settings 
An accidental variable shadowing was preventing setting watcher
callbacks from being fired.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 01:16:52 -04:00
Aaron Raimist 03e59aa60c Remove translation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-04 17:18:02 -05:00
David Baker 31604c13c0 Lint the typescript tests 
Turns out we hadn't told eslint to lint .ts in tests/

Also fix all the lint errors, including removing a use of assert that
had randomly crept in.
 2021-06-04 16:52:50 +01:00
J. Ryan Stinnett abfe6d85a0 Merge pull request #6141 from matrix-org/jryans/repair-event-status 
Repair event status position in timeline
 2021-06-04 14:16:59 +01:00
J. Ryan Stinnett ab96d5f8af Repair event status position in timeline 
https://github.com/matrix-org/matrix-react-sdk/pull/6079 caused a regression in
the event status indicator. The `mx_EventTile_msgOption` container was folded
into the avatars code path, but the event status is a special case of this, so
it now needs to also have this container to preserve its positioning.

Fixes https://github.com/vector-im/element-web/issues/17552
 2021-06-04 11:54:58 +01:00
Michael Telatynski 93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01:00
Michael Telatynski 48bd6583ed Fix unpinning of pinned messages 2021-06-04 11:34:54 +01:00
Jaiwanth f32726d5ed Begin extended implementation 2021-06-04 15:08:17 +05:30
Michael Telatynski 330e230f2c Merge pull request #200 from aaronraimist/macos-preferences 2021-06-04 09:53:30 +01:00
Michael Telatynski dee2ecdf6c Merge pull request #202 from aaronraimist/zoomin 2021-06-04 09:50:18 +01:00
Šimon Brandner befcbf8e75 Add spaces into curly braces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:32:30 +02:00
Šimon Brandner 641c902408 i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:24:20 +02:00
Šimon Brandner 6cd76086a7 Improve wording 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:23:32 +02:00
Šimon Brandner 1d3bf91e83 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 08:19:29 +02:00
Šimon Brandner 8c533c7f8b Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-04 08:09:31 +02:00
Šimon Brandner 48c57610df Merge remote-tracking branch 'upstream/develop' into fix/mute-incoming-call/15591 2021-06-04 08:08:34 +02:00
Aaron Raimist c99c42f341 Merge branch 'develop' into share-room 2021-06-04 01:08:09 -05:00
Travis Ralston 12e013508d Merge pull request #6132 from matrix-org/travis/ts-mtxcli 
Adapt for js-sdk MatrixClient conversion to TS
 2021-06-04 00:07:22 -06:00
Šimon Brandner 629201a074 Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Šimon Brandner 6eb33ac730 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:49:05 +02:00
Šimon Brandner 3b2d6d442f Translate unknown call state 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:43:30 +02:00
Šimon Brandner ae54a8f546 Return null 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:42:17 +02:00
Aaron Raimist f109065606 lint 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-04 00:23:02 -05:00
Aaron Raimist 344800d835 Remove accelerator 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-04 00:16:51 -05:00
Aaron Raimist 8c99f0ad12 Switch zoomIn accelerator to CommandOrControl+Plus 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-04 00:07:05 -05:00
Aaron Raimist bc0e3bb317 Add warning dialog when custom config.json is invalid 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-03 23:39:33 -05:00
Aaron Raimist b7e4e9e075 Follow HIG: use ellipsis for Preferences menu item, add app name to About menu item 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-03 23:07:28 -05:00
Aaron Raimist 5055ad0aec Put Preferences menu item in correct location on macOS 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-03 22:56:06 -05:00
Michael Telatynski f22fd7aa3b Merge pull request #6096 from matrix-org/t3chguy/fix/6606 2021-06-04 00:00:31 +01:00
Michael Telatynski 5d0d81e79a not sure how I butchered this merge conflict resolution this much. 2021-06-03 19:37:26 +01:00
Michael Telatynski 93010d34fd Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
David Baker 7421efe8f9 Merge pull request #6136 from matrix-org/dbkr/map_phone_number_lookup_to_native 
Map phone number lookup results to their native rooms
 2021-06-03 19:01:46 +01:00
Michael Telatynski 0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Germain a36063704d Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet 5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Michael Telatynski f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-03 16:22:59 +01:00
David Baker 8ef95a6237 Interface dispatcher payload 
& use constant in test
 2021-06-03 14:38:13 +01:00
Jaiwanth e7f0df7fcc Small fix 2021-06-03 13:39:14 +05:30
Michael Telatynski dbaa394d65 i18n 2021-06-03 08:54:30 +01:00
Jaiwanth 4c22d1f2a1 Refactor 2021-06-03 13:21:56 +05:30
Germain 7f83590846 Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski 4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Michael Telatynski 83d223475b delint imports 2021-06-03 08:41:22 +01:00
Germain Souquet a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski 4765216280 Merge branch 't3chguy/fix/6606' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 2021-06-03 08:36:04 +01:00
Michael Telatynski 42a3ace82a Iterate PR based on feedback 2021-06-03 08:35:12 +01:00
Michael Telatynski e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Michael Telatynski 3f12b7280d Make AutoHideScrollbar pass through all unknown props 2021-06-03 08:31:06 +01:00
Germain 430cfa9c06 Merge pull request #6127 from matrix-org/gsouquet/css-containment 
Add CSS containment rules for shorter reflow operations
 2021-06-03 08:10:29 +01:00