Germain Souquet
17099c656b
Call renamed room::decryptAllEvents method
2021-05-07 11:25:25 +01:00
Michael Telatynski
6137162786
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1
...
Conflicts:
src/stores/room-list/RoomListStore.ts
2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0
Bring back filter all spaces behaviour
2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs
...
Guard all isSpaceRoom calls behind the labs flag
2021-05-07 10:28:14 +01:00
Aaron Raimist
1f2895dbe9
Merge branch 'develop' into blank-device-name
2021-05-06 20:19:49 -05:00
Aaron Raimist
5d7535738a
Show device ID in UserInfo when there is no device name
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-05-06 20:01:53 -05:00
Šimon Brandner
7ad270928a
Simplifie code a bit
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-06 16:41:09 +02:00
Šimon Brandner
bb9803a94e
Don't try to use the event's metadata to calc the scale
...
That has lead to https://github.com/vector-im/element-web/issues/17184
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-06 16:40:33 +02:00
J. Ryan Stinnett
06a9577858
Merge remote-tracking branch 'origin/develop' into jryans/upload-preview-mimetype
2021-05-06 14:45:48 +01:00
J. Ryan Stinnett
dc50d27985
Adjust MIME type of upload confirmation if needed
...
This filters the MIME type of uploaded files to ensure we display safely.
2021-05-06 14:39:44 +01:00
J. Ryan Stinnett
437f13cf76
Convert UploadConfirmDialog to TSX
2021-05-06 14:11:34 +01:00
Michael Telatynski
d9912651d6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176
...
Conflicts:
src/components/structures/SpaceRoomDirectory.tsx
2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24
Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent
2021-05-06 13:05:58 +01:00
Germain Souquet
0c87a67caf
Lazily decrypt events on room view
2021-05-06 11:46:25 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed
...
Support for multiple streams (not MSC3077)
2021-05-06 11:20:09 +01:00
Michael Telatynski
90538c95aa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
2021-05-06 08:05:14 +01:00
Aaron Raimist
9aa711b7b7
Merge branch 'develop' into initialisation
2021-05-06 00:09:48 -05:00
Michael Telatynski
9518e4d415
Guard all isSpaceRoom calls behind the labs flag
2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119
...
Update space ordering behaviour to match updates in MSC
2021-05-05 22:26:45 +01:00
Travis Ralston
3e1265b9bb
Merge pull request #5970 from matrix-org/travis/voicemessages/colors
...
Update colours and sizing for voice messages
2021-05-05 11:09:18 -06:00
Michael Telatynski
70087b30bf
Add disclaimer about subspaces being experimental in add existing dialog
2021-05-05 17:53:31 +01:00
Michael Telatynski
650933096a
Iterate Spaces admin UX around room management
2021-05-05 17:25:29 +01:00
J. Ryan Stinnett
62774d7c16
Merge pull request #5962 from jaiwanth-v/cleanup-imageview
...
Add cleanup functions for image view
2021-05-05 17:02:43 +01:00
Michael Telatynski
7cae566011
Merge pull request #5975 from matrix-org/t3chguy/fix/16891
...
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 16:32:31 +01:00
J. Ryan Stinnett
4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal
...
Warn on access token reveal
2021-05-05 16:32:12 +01:00
Michael Telatynski
886959f32d
port rate limiting code over to space creation wizard's add existing rooms
2021-05-05 11:54:14 +01:00
Michael Telatynski
07f5b6e8c4
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 11:45:12 +01:00
Šimon Brandner
2044ff0149
Correctly handle defaults
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 11:48:55 +02:00
Šimon Brandner
791f39abcc
Initial support for persistent collapsed states
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-05 08:31:07 +02:00
Travis Ralston
a94c1a90c1
Update colours and sizing for voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17162
2021-05-04 20:45:15 -06:00
Michael Telatynski
a70be45b6e
Experiment switching the Home Space out for an All rooms space
2021-05-04 18:26:49 +01:00
Travis Ralston
54931cb43e
Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline
2021-05-04 09:05:04 -06:00
Travis Ralston
704edfc05b
Merge pull request #5959 from matrix-org/travis/voicemessages/permissions
...
Handle no/blocked microphones in voice messages
2021-05-04 09:03:38 -06:00
Michael Telatynski
caa772348f
Actually fix the layout bug without re-regressing the prior issue
2021-05-04 14:14:06 +01:00
Michael Telatynski
4489f8a6ea
Fix hover behaviour of space invites
2021-05-04 14:01:26 +01:00
Michael Telatynski
ac61c8eca8
Adhere to updated sort order for space children
2021-05-04 12:27:27 +01:00
Jaiwanth
3eea1b8369
Add cleanup functions for image view
2021-05-04 16:42:22 +05:30
J. Ryan Stinnett
96592aa75e
Merge pull request #5948 from jaiwanth-v/room-preview-spaces
...
Generate room preview even when minimized
2021-05-04 11:58:53 +01:00
Jaiwanth
29aec4abdb
Use middlePanelResized instead of noisy
2021-05-04 15:39:46 +05:30
Michael Telatynski
e9f59ed093
Merge pull request #5943 from matrix-org/t3chguy/fix/17082
...
Sort rooms in the add existing to space dialog based on recency
2021-05-04 10:57:23 +01:00
Michael Telatynski
a7642b2b24
Fix space name "Empty room" during creation wizard
2021-05-04 10:48:34 +01:00
Travis Ralston
87a57ec7e5
Handle no/blocked microphones in voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17139
2021-05-03 16:41:39 -06:00
Jaiwanth
54e139a6ad
Generate previews when the room tile is maximised
2021-05-03 23:17:10 +05:30
Travis Ralston
8abd251ec5
delib
2021-05-03 11:43:46 -06:00
Travis Ralston
3f4ee9742a
Simple rendering of voice messages in the timeline
...
Fixes https://github.com/vector-im/element-web/issues/17138
2021-05-03 11:41:14 -06:00
Travis Ralston
d7ed2d3486
Switch to m.audio with extensible events
2021-05-03 10:27:15 -06:00
Jaiwanth
cf9edb1884
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into room-preview-spaces
2021-05-03 21:53:54 +05:30
Aaron Raimist
35c1e54521
lint
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-30 21:55:00 -05:00
Aaron Raimist
626a4ccc34
Make warning bold, close copied tooltip on escape
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-30 21:45:37 -05:00
Michael Telatynski
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043
...
Inhibit sending RR when context switching to a room
2021-04-30 15:13:18 +01:00
Michael Telatynski
39ccecab03
Merge pull request #5950 from matrix-org/t3chguy/fix/17117
...
Prevent room list keyboard handling from landing focus on hidden nodes
2021-04-30 12:55:27 +01:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998
...
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
Michael Telatynski
042ca65806
fix beta dot showing up when beta is disabled
2021-04-30 12:32:42 +01:00
Michael Telatynski
d2959e1acc
Add mechanism for disabling Betas
2021-04-30 12:30:05 +01:00
Michael Telatynski
43410835a3
Prevent room list keyboard handling from landing focus on hidden nodes
2021-04-30 11:53:56 +01:00
J. Ryan Stinnett
83035b6b6a
Merge pull request #5931 from SimonBrandner/fix-indent
...
Enable indent rule and fix indent
2021-04-30 11:51:22 +01:00
Šimon Brandner
2e62b18617
Revert some changes to avoid re-translation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 12:30:14 +02:00
Šimon Brandner
c6bd2c7d67
Fix some more formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:18:26 +02:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth
70204d6111
Prevent peeking members from reacting
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 22:41:57 +05:30
Jaiwanth
d2de115b2f
Generate room preview even when minimized
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 21:37:44 +05:30
Michael Telatynski
73abe51fb9
actually use the new state
2021-04-29 16:46:21 +01:00
Michael Telatynski
62198601d2
Tweak room list filter placeholder and results copy for spaces
2021-04-29 16:40:08 +01:00
Michael Telatynski
279654cc9e
Design iterations based on PR feedback
2021-04-29 16:08:59 +01:00
Michael Telatynski
036bc50b5d
Disable groups routes when spaces is enabled to avoid confusion
2021-04-29 12:29:22 +01:00
Michael Telatynski
a4f02937cb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
res/css/structures/_SpaceRoomView.scss
src/components/structures/SpaceRoomView.tsx
2021-04-29 09:52:21 +01:00
Michael Telatynski
e390c3c732
Inhibit sending RR when context switching to a room
2021-04-29 09:37:21 +01:00
Michael Telatynski
bed52319bc
Sort rooms in the add existing to space dialog based on recency
2021-04-28 23:39:24 +01:00
Michael Telatynski
9f8955fb6c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628
...
Conflicts:
src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2
Iterate styling and decoration for the beta prompts
2021-04-28 22:47:08 +01:00
Ayush PS
81f2e67443
Fixed Linting errors
2021-04-28 23:40:23 +05:30
Ayush PS
8b644e783e
Finally fixes two todays
2021-04-28 23:23:51 +05:30
Travis Ralston
b90c845fcb
Revert "Fixes the two Todays problem in Redaction"
2021-04-28 10:07:22 -06:00
Travis Ralston
3890bec8ad
Merge pull request #5860 from samhh/always-render-ignored-users
...
Render ignored users setting regardless of if there are any
2021-04-28 09:51:57 -06:00
Travis Ralston
14f1388522
Merge pull request #5830 from SimonBrandner/fix-trailing-colon
...
Fix inserting trailing colon after mention/pill
2021-04-28 09:51:50 -06:00
Travis Ralston
e53b3b6634
Merge pull request #5917 from DantrazTrev/Redact
...
Fixes the two Todays problem in Redaction
2021-04-28 09:51:43 -06:00
Travis Ralston
baef98253e
Merge pull request #5920 from aaronraimist/page-up-down
...
Fix page up/down scrolling only half a page
2021-04-28 09:51:36 -06:00
Travis Ralston
8d8525cdeb
Merge pull request #5935 from matrix-org/travis/voice/control-bar
...
Voice messages: Composer controls
2021-04-28 09:38:28 -06:00
Travis Ralston
d4acd0e41c
Remove excess IState
2021-04-28 09:28:46 -06:00
Michael Telatynski
5a921bf38a
Add beta pill to space create menu
2021-04-28 12:10:03 +01:00
Šimon Brandner
653591e806
Use CallChangeRoom in CallViewForRoom
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:56:26 +02:00
Šimon Brandner
40748d3c94
Make CallHandler emit CallChangeRoom
...
Let's hope I changed the tests correctly
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:49:07 +02:00
Šimon Brandner
e5b61f0632
Keep rendering AudioFeeds on hold
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:29:05 +02:00
Šimon Brandner
4c58a95046
Merge branch 'develop' into feed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:59:47 +02:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
David Baker
c95c1aeffd
Merge pull request #5886 from matrix-org/dbkr/asserted_identity
...
Support MSC3086 asserted identity
2021-04-28 09:47:40 +01:00
Michael Telatynski
9dff5cd596
tweak leave space on preview
2021-04-28 08:59:02 +01:00
Michael Telatynski
18a01d9271
Show spaces beta prompt when viewing a space without the beta
2021-04-28 08:41:31 +01:00
Travis Ralston
8fca32d651
Clean up imports from refactoring
2021-04-27 23:48:07 -06:00
Travis Ralston
8213c48b7f
Fix first waveform bar highlighting in playback at 0%
2021-04-27 23:34:26 -06:00
Travis Ralston
617d74f9cd
Treat 119.68 seconds as 1:59 instead of 1:60
2021-04-27 23:07:45 -06:00
Travis Ralston
c4d85c457b
Add progress effect to playback waveform
2021-04-27 22:59:16 -06:00
Ayush PS
e2ce699130
Fixed linting warnings in MessagePanel.js
2021-04-28 10:02:20 +05:30
Travis Ralston
c2d37af1cb
Move playback to its own set of classes
...
This all started with a bug where the clock wouldn't update appropriately, and ended with a whole refactoring to support later playback in the timeline.
Playback and recording instances are now independent, and this applies to the <Playback* /> components as well. Instead of those playback components taking a recording, they take a playback instance which has all the information the components need.
The clock was incredibly difficult to do because of the audio context's time tracking and the source's inability to say where it is at in the buffer/in time. This means we have to track when we started playing the clip so we can capture the audio context's current time, which may be a few seconds by the first time the user hits play. We also track stops so we know when to reset that flag.
Waveform calculations have also been moved into the base component, deduplicating the math a bit.
2021-04-27 22:23:57 -06:00
Travis Ralston
5e646f861c
Wire up the send button for voice messages
...
This fixes a bug where we couldn't upload voice messages because the audio buffer was being read, therefore changing the position of the cursor. When this happened, the upload function would claim that the buffer was empty and could not be read.
2021-04-27 18:59:10 -06:00
Aaron Raimist
31ff05a862
Merge branch 'develop' into warn-on-access-token-reveal
2021-04-27 19:25:38 -05:00
Aaron Raimist
6754a0b483
Switch to <details>
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-27 19:12:22 -05:00
Travis Ralston
c1bb0bb0b8
Add a delete button
2021-04-27 15:02:15 -06:00
Travis Ralston
30e120284d
Add simple play/pause controls
2021-04-27 15:02:15 -06:00
Travis Ralston
32e3ce3dea
Handle basic state machine of recordings
2021-04-27 15:02:15 -06:00
Travis Ralston
afd53d8b53
Merge pull request #5930 from matrix-org/travis/error-view-fix
...
Handle possible edge case with getting stuck in "unsent messages" bar
2021-04-27 11:17:33 -06:00
Michael Telatynski
4f02dc9050
delint
2021-04-27 17:19:34 +01:00
Michael Telatynski
46d35411b4
Add animated mx_BetaDot atop the legacy Communities button
2021-04-27 17:01:22 +01:00
Michael Telatynski
28d3a0c09b
Merge pull request #5932 from matrix-org/t3chguy/fix/17080
...
Fix suggested rooms not showing up regression from room list optimisation
2021-04-27 16:49:52 +01:00
Michael Telatynski
35799c213e
Fix suggested rooms not showing up regression from room list optimisation
2021-04-27 16:30:54 +01:00
Michael Telatynski
c5f653245a
Show Spaces beta card in Labs & My Communities view
...
the image is temporary
2021-04-27 16:29:42 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 17:23:27 +02:00
Travis Ralston
b9bd83ad41
Handle possible edge case with getting stuck in "unsent messages" bar
...
Just in case we're not cleaning up the isResending state properly, here's a catch all.
Unrelated to https://github.com/vector-im/element-web/issues/17078 (this code doesn't affect the js-sdk error the author is seeing)
2021-04-27 08:58:18 -06:00
Germain
4d5fd3ec73
Merge pull request #5913 from matrix-org/gsouquet-desktop-i18n
2021-04-27 15:48:49 +01:00
J. Ryan Stinnett
dd8abb0206
Merge pull request #5912 from matrix-org/jryans/convert-flow-to-ts
...
Convert some Flow-typed files to TypeScript
2021-04-27 13:44:47 +01:00
J. Ryan Stinnett
1df0a82c64
Add types to PreferencesUserSettingsTab
2021-04-27 12:00:36 +01:00
J. Ryan Stinnett
4e7240ebc9
Add types to SecurityRoomSettingsTab
2021-04-27 11:56:45 +01:00
J. Ryan Stinnett
2ebd256590
Add types to RolesRoomSettingsTab
2021-04-27 11:42:11 +01:00
Šimon Brandner
8d014b7fa2
Use getLocalFeeds() for better clarity
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:23:21 +02:00
Michael Telatynski
13a5d06e29
Merge pull request #5926 from matrix-org/t3chguy/fix/17067
...
Fix issues with space hierarchy in layout and with incompatible servers
2021-04-27 11:21:15 +01:00
Šimon Brandner
e367725cce
Fix casing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:05:46 +02:00
Šimon Brandner
a6ad574f4e
Fix typos
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:05:21 +02:00
Šimon Brandner
f3a7ffca60
Remove audio element from VideoFeed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:02:41 +02:00
Šimon Brandner
b612b252e1
Fix a type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 11:59:26 +02:00
Šimon Brandner
a220b8b572
Wire up AudioFeedArrayForCall
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 11:59:08 +02:00
Michael Telatynski
31b9a4c312
Merge pull request #5928 from matrix-org/t3chguy/hidpi
...
Scale all mxc thumbs using device pixel ratio for hidpi
2021-04-27 10:56:23 +01:00
Šimon Brandner
08251a761d
Add AudioFeedArrayForCall
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 10:58:32 +02:00
Michael Telatynski
cc3571c559
fix removed pixelRatio
2021-04-27 09:56:28 +01:00
Michael Telatynski
b9cca469b6
Merge pull request #5918 from matrix-org/t3chguy/fix/17050
...
Fix add existing to space dialog no longer showing rooms for public spaces
2021-04-27 09:46:37 +01:00
Šimon Brandner
9af176f5e2
Add AudioFeed
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 10:20:49 +02:00
Michael Telatynski
915f8b3c9c
Scale all mxc thumbs using device pixel ratio for hidpi
...
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Michael Telatynski
0d538c490a
Merge pull request #5921 from matrix-org/t3chguy/fix/17063
...
Autofocus search box in the add existing to space dialog
2021-04-26 18:24:14 +01:00
Michael Telatynski
e675448062
Merge pull request #5922 from matrix-org/t3chguy/fix/17062
...
Use label element in add existing to space dialog for easier hit target
2021-04-26 18:10:00 +01:00
J. Ryan Stinnett
26bb7c08c2
Add join rule comment
2021-04-26 16:20:16 +01:00
J. Ryan Stinnett
d1649dd301
Tweak interface syntax
2021-04-26 16:16:43 +01:00
J. Ryan Stinnett
d497d62db3
Use enums in SecurityRoomSettingsTab
2021-04-26 16:14:21 +01:00
Michael Telatynski
43b43dc685
tidy up code
2021-04-26 16:11:07 +01:00
Michael Telatynski
a8711dcce9
useSpaceSummary return error for incompatible server notice
2021-04-26 16:06:42 +01:00
J. Ryan Stinnett
cddcedcce2
Merge remote-tracking branch 'origin/develop' into jryans/convert-flow-to-ts
2021-04-26 15:57:28 +01:00
J. Ryan Stinnett
8659c98c44
Add tile shape string type
2021-04-26 15:55:04 +01:00
J. Ryan Stinnett
9401a6d6dc
Merge pull request #5916 from SimonBrandner/image-view-zoom
...
Dynamic max and min zoom in the new ImageView
2021-04-26 15:46:26 +01:00
J. Ryan Stinnett
4b66082b0f
Add change event type
2021-04-26 15:27:30 +01:00
J. Ryan Stinnett
809454e66a
Use new managed prop for emoji composer menu
2021-04-26 15:23:55 +01:00
J. Ryan Stinnett
bf43144f6e
Add ActionPayload type
2021-04-26 15:21:49 +01:00
Šimon Brandner
81164fe152
Add comment about the js-sdk and new incoming feeds
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 16:09:21 +02:00
J. Ryan Stinnett
1b615eebc1
Fix optional props
2021-04-26 14:56:43 +01:00
Šimon Brandner
1fcad1a634
Show zoom buttons only if zooming is enabled
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 15:47:58 +02:00
J. Ryan Stinnett
a3a756fdb2
Rename history visibility type
2021-04-26 14:08:45 +01:00
J. Ryan Stinnett
69fbfdc552
Fix interface syntax
2021-04-26 14:07:45 +01:00
J. Ryan Stinnett
b8a915bb76
Tweak private / underscores for fields and methods
2021-04-26 14:02:53 +01:00
Šimon Brandner
53e8b5e6af
Merge branch 'image-view-zoom' of https://github.com/SimonBrandner/matrix-react-sdk into image-view-zoom
2021-04-26 15:01:47 +02:00
Šimon Brandner
3547d1f93b
Change cursor to default
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 15:01:06 +02:00
Germain Souquet
a43ad8d881
Allow for multiple locale and stabilise set language call
2021-04-26 13:55:14 +01:00
Šimon Brandner
e374fcfe91
Fix spelling
2021-04-26 13:49:29 +02:00