Germain Souquet
f156c2db15
prevent reflow in app when accessing window dimensions
2021-05-25 10:28:43 +01:00
Germain Souquet
a57887cc61
Prevent layout trashing on EffectsOverlay
2021-05-25 10:28:32 +01:00
Germain Souquet
ac93cc514f
Prevent layout trashing when resizing the window
2021-05-25 10:28:20 +01:00
Germain Souquet
73d51a91d6
Prevent unneeded state updates to hide StickerPicker
2021-05-25 10:27:59 +01:00
Michael Telatynski
4a5c634d82
Iterate PR
2021-05-24 22:02:50 +01:00
Michael Telatynski
a757f589bd
post-merge fixup
2021-05-24 21:57:59 +01:00
Michael Telatynski
d8acc0612a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
...
Conflicts:
src/components/views/rooms/EditMessageComposer.js
src/components/views/rooms/SendMessageComposer.js
2021-05-24 21:57:38 +01:00
Michael Telatynski
4be8bbeef9
Close creation menu when expanding space panel via expand hierarchy
2021-05-24 21:17:30 +01:00
Germain Souquet
cdecc156df
Remove unused prop
2021-05-24 17:30:37 +01:00
Germain Souquet
3b69c0203c
Remove resize notifier prop from RoomTile
2021-05-24 17:05:59 +01:00
Germain Souquet
fdc22bfdf7
Adhere to TypeScript codestyle better
2021-05-24 16:40:55 +01:00
Germain Souquet
0bbfb1a6d9
remove unused variable checkObjectHasNoAdditionalKeys
2021-05-24 16:18:55 +01:00
Germain Souquet
671f169457
Remove unused middlePanelResized event listener
2021-05-24 16:08:48 +01:00
Germain Souquet
19569f3897
Convert Tooltip to TypeScript
2021-05-24 15:01:59 +01:00
Germain Souquet
d6bc1861ae
Migrate InlineSpinner to TypeScript
2021-05-24 14:33:31 +01:00
Robin Townsend
5c7da97ff6
Give forward dialog send buttons an accessible label
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:55:08 -04:00
Robin Townsend
121ed5eba9
Pass Matrix client around as matrixClient
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:51:04 -04:00
Robin Townsend
6ced61b709
Use camelCase
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:34:03 -04:00
Robin Townsend
400917623c
Make myself the copyright holder for forward dialog code
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-24 08:33:28 -04:00
Robin Townsend
88e0e9b9fb
Merge branch 'develop' into improved-forwarding-ui
2021-05-24 08:23:07 -04:00
Germain Souquet
4851e96297
Switch rooms documentation and polishing
2021-05-24 09:17:29 +01:00
Michael Telatynski
a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360
...
Improve explore rooms when no results are found
2021-05-23 21:17:35 +01:00
Šimon Brandner
b08b36c14f
Add silencing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:24:36 +02:00
Robin Townsend
cd460a2555
Adjust forward dialog copy
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:59:13 -04:00
Robin Townsend
7a04502151
Iterate on forward dialog design feedback
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-21 12:41:29 -04:00
J. Ryan Stinnett
44ecf62758
Add explicit member access
2021-05-21 13:15:54 +01:00
Robin Townsend
f34d61cf5d
Merge branch 'develop' into improved-forwarding-ui
2021-05-21 08:15:09 -04:00
J. Ryan Stinnett
3b50808cb0
Use any instead of object
2021-05-21 13:11:33 +01:00
J. Ryan Stinnett
320c8d2091
Move function prop to bottom
2021-05-21 13:10:50 +01:00
J. Ryan Stinnett
e4cf66f0e4
Move state init to constructors
2021-05-21 13:09:24 +01:00
J. Ryan Stinnett
5d6f16ff64
Add explicit public
2021-05-21 12:59:54 +01:00
J. Ryan Stinnett
66077e3a05
Add spaces to imports
2021-05-21 12:57:51 +01:00
Germain Souquet
ccfd6ba4b1
fix linting issues
2021-05-21 12:53:26 +01:00
J. Ryan Stinnett
f8e61a982b
One less Set
2021-05-21 12:41:59 +01:00
J. Ryan Stinnett
d59b2b3579
Fix unintended buttons class change
2021-05-21 12:38:32 +01:00
J. Ryan Stinnett
d0da4b2a25
Use separate name for verification request component
2021-05-21 12:37:34 +01:00
Germain Souquet
5ba419db54
split room header and header wrapper
2021-05-21 10:21:54 +01:00
Germain Souquet
47e007e08f
batch load events in ReplyThread before adding them to the state
2021-05-21 10:20:24 +01:00
Robin Townsend
332412782e
Remove logo spinner
...
Removed since design wants to avoid associating slowness with the brand.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-20 17:31:10 -04:00
Michael Telatynski
d0d56d4b42
Merge pull request #6073 from matrix-org/t3chguy/fix/17412
...
Fix add reaction prompt showing even when user is not joined to room
2021-05-20 21:00:10 +01:00
Travis Ralston
767c7a1e38
Merge pull request #5680 from robintown/better-spinners
...
Vectorize spinners
2021-05-20 13:31:35 -06:00
Michael Telatynski
073127aa3c
Fix handling of via servers for suggested rooms
2021-05-20 18:47:12 +01:00
Germain Souquet
0f63098c59
Remove typo semicolon
2021-05-20 18:02:44 +01:00
Germain Souquet
229c4b98b4
use userGroups cached value to avoid re-render
2021-05-20 18:02:03 +01:00
J. Ryan Stinnett
d9e490926b
Add types to DevtoolsDialog
2021-05-20 17:59:45 +01:00
J. Ryan Stinnett
df09bdf823
Add types to InteractiveAuthEntryComponents
2021-05-20 17:59:45 +01:00
J. Ryan Stinnett
6574ca98fa
Fix basic lint errors
2021-05-20 17:56:16 +01:00
J. Ryan Stinnett
21c1179f8d
Update extensions for more files with types
...
This migrates the another bucket of files using some amount of Flow typing to
mark them as TypeScript instead. The remaining type errors are fixed in
subsequent commits.
2021-05-20 17:56:16 +01:00
Germain Souquet
9e55f24092
Remove extraenous DOM nodes
2021-05-20 16:11:33 +01:00
Germain Souquet
f058fd8869
Reduce amount of DOM nodes
2021-05-20 15:39:25 +01:00
Germain Souquet
171539d42d
Simplify EventTile structure
...
Only render MessageTimestamp to the DOM when a tile is hovered
2021-05-20 15:26:02 +01:00
Germain Souquet
d362321706
Simplify SenderProfile DOM structure
2021-05-20 15:25:20 +01:00
Michael Telatynski
dab75f9b88
Fix add reaction prompt showing even when user is not joined to room
2021-05-20 12:20:53 +01:00
Michael Telatynski
35710da174
Merge pull request #6069 from matrix-org/t3chguy/fix/17386
...
Fix room name issues in right panel summary card
2021-05-20 12:08:33 +01:00
Germain Souquet
422740f13b
normalize displayName
2021-05-20 11:04:17 +01:00
Michael Telatynski
8b67cdb80b
Pre-populate create room dialog name when going from room directory
2021-05-19 19:20:58 +01:00
Michael Telatynski
b3aade075d
Convert CreateRoomDialog to Typescript
2021-05-19 19:18:28 +01:00
Michael Telatynski
d10a45c6a3
Convert RoomDirectory and NetworkDropdown to Typescript
2021-05-19 18:40:03 +01:00
Robin Townsend
6cb6c7f3d0
Combine forward dialog room and DM lists
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-19 13:33:48 -04:00
Robin Townsend
678b298bab
Merge branch 'develop' into improved-forwarding-ui
2021-05-19 12:39:48 -04:00
Michael Telatynski
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite
...
Update MemberList to reflect changes for invite permission change
2021-05-19 17:35:58 +01:00
Michael Telatynski
f52dc9a3ea
Fix room name not updating whilst summary card is open
2021-05-19 17:12:31 +01:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview ( #6056 )
2021-05-19 13:25:52 +01:00
Jaiwanth
d73eb0c70f
Update MemberList.js
2021-05-19 17:46:10 +05:30
Michael Telatynski
f985918859
Merge pull request #6057 from matrix-org/t3chguy/fix/17350
...
Support filtering by alias in add existing to space dialog
2021-05-19 12:29:00 +01:00
Germain Souquet
8f945ce846
Render nothin rather than an empty div
2021-05-19 11:57:32 +01:00
Michael Telatynski
78a8c9e10e
Fix issue when a room without a name or alias is marked as suggested
2021-05-19 10:46:11 +01:00
Jaiwanth
e78206301f
Modify to avoid forceUpdate
2021-05-19 14:31:04 +05:30
Jaiwanth
0d8a7eabc7
Update MemberList on invite permission change
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-19 12:49:55 +05:30
Germain
cf384c2a54
Merge pull request #6052 from matrix-org/gsouquet/decrypt-relations
2021-05-18 17:21:13 +01:00
Michael Telatynski
edb2026780
Support any alias not just first
2021-05-18 13:31:53 +01:00
Michael Telatynski
655010844a
Switch to using QueryMatcher for add existing to space dialog
...
This helps it support filtering by alias
2021-05-18 13:27:34 +01:00
Germain Souquet
f9f10de0da
use renamed decrypt event method
2021-05-18 13:01:38 +01:00
Germain Souquet
1cfd4b6e1a
Use client.decryptEvent to avoid accessing js-sdk private members
2021-05-18 11:41:20 +01:00
Michael Telatynski
afd9843722
Fix broken string interpolation in chat effects warning
2021-05-18 10:28:37 +01:00
Germain Souquet
871c48f69b
stop assuming that decryption happens ahead of time
2021-05-18 10:02:21 +01:00
Travis Ralston
6ccb0d487a
Merge branch 'develop' into travis/msc2873
2021-05-17 16:27:20 -06:00
Michael Telatynski
6e5847ea6b
Fix right clicking on add reactions prompt button behaviour
2021-05-17 10:01:56 +01:00
Michael Telatynski
a22a1918e1
Fix add reactions prompt button showing up even if all reactions have been removed
2021-05-17 10:01:43 +01:00
Robin Townsend
e798b36f1d
Decorate forward dialog room avatars
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:39:22 -04:00
Robin Townsend
64e828d069
Merge branch 'develop' into improved-forwarding-ui
2021-05-16 08:13:59 -04:00
Robin Townsend
555b2e3266
Reuse Spinner styles for InlineSpinner
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:00:54 -04:00
Robin Townsend
74cc00b319
Merge branch 'develop' into better-spinners
2021-05-16 07:47:34 -04:00
Michael Telatynski
b06514273f
Merge pull request #6043 from SimonBrandner/fix/add-ids
...
Add ids to homeserver and passphrase fields
2021-05-15 15:22:27 +01:00
Šimon Brandner
bdf7837044
Add mx to homeserverInput
2021-05-15 16:13:26 +02:00
Šimon Brandner
ce4439e118
Add mx to passPhraseInput
2021-05-15 16:13:02 +02:00
Šimon Brandner
37348375a2
Add id for passpharase
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-15 15:07:35 +02:00
Šimon Brandner
fef081c736
Add id for homeserver field
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-15 15:07:15 +02:00
Travis Ralston
89933d779c
Merge branch 'develop' into travis/msc2873
2021-05-14 14:22:53 -06:00
Travis Ralston
55eddae096
Merge pull request #6035 from matrix-org/travis/voicemessages/playback-time
...
Improve progress bar progression for smaller voice messages
2021-05-14 10:17:35 -06:00
Michael Telatynski
49b24408bb
Merge pull request #6039 from matrix-org/t3chguy/public-space-no-invite
...
Fix share space edge case where space is public but not invitable
2021-05-14 16:46:50 +01:00
Travis Ralston
6df079a5bd
Merge pull request #6033 from matrix-org/travis/rel-imageview
...
Add missing 'rel' to image view download button
2021-05-14 08:12:11 -06:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276
...
Decorate room avatars with publicity in add existing to space flow
2021-05-14 11:23:46 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674
...
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski
6f9c2f05a2
remove unused vars/imports
2021-05-14 10:49:53 +01:00
Michael Telatynski
f31f7b243d
Fix share space edge case where space is public but not invitable
2021-05-14 10:46:09 +01:00
Travis Ralston
ddf9027daa
Improve progress bar progression for smaller voice messages
...
Instead of chunking the thing, we'll improve our precision and clock accuracy. Clock accuracy is improved by flagging the "load time" of the clip in the context, which can be about 500ms (or more) off the context's start line. The precision is just a number in the PlaybackWaveform component.
2021-05-13 22:35:43 -06:00
Jaiwanth
26dd6d5510
Swap rotate left and right buttons
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-14 08:26:29 +05:30
Travis Ralston
b9f775d969
Add missing 'rel' to image view download button
...
We're supposed to have this on every link off-site.
2021-05-13 20:55:14 -06:00
Travis Ralston
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation
...
Typo: initilisation -> initialisation
2021-05-13 20:15:08 -06:00
Travis Ralston
2d2c0d54c0
Merge pull request #6001 from jaiwanth-v/save-edited-state-messages
...
Save edited state of a message when switching rooms
2021-05-13 20:06:31 -06:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622
2021-05-13 16:12:42 +01:00
Michael Telatynski
6aa477f0f5
Decorate room avatars with publicity in add existing to space flow
2021-05-13 14:23:28 +01:00
Michael Telatynski
f6e8d38b87
Remove redundant tag
prop
2021-05-13 14:23:10 +01:00
Michael Telatynski
a41d76b588
fix typos
2021-05-13 14:14:01 +01:00
Michael Telatynski
76afc1100a
Convert to Typescript and move from ClientPeg to Context
2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61
tweak reactions row some more, third try lucky
2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025
Tweak alignment of reactions row, move add reaction to right and only show on hover
2021-05-13 13:32:38 +01:00
Michael Telatynski
b5fa4d88bf
Add extra add reactions button to encourage more diverse reactions to content
2021-05-13 10:56:51 +01:00
Michael Telatynski
423c515708
Consolidate AddExistingToSpace between Dialog and Just Me integrated flow
2021-05-13 09:46:45 +01:00
Travis Ralston
f98eee318e
Fill out fields for MSC2873 values
...
As required by https://github.com/matrix-org/matrix-widget-api/pull/36
2021-05-12 14:10:02 -06:00
Travis Ralston
3aef3b72b5
Move language handling into languageHandler
2021-05-12 14:08:32 -06:00
Michael Telatynski
52420feab0
Merge pull request #6021 from matrix-org/t3chguy/fix/17268
...
Iterate beta feedback dialog
2021-05-12 17:42:42 +01:00
Michael Telatynski
5430f44c27
Convert verification and UntrustedDeviceDialog to TS
2021-05-12 17:08:44 +01:00
Michael Telatynski
565e41c3df
Extract UntrustedDeviceDialog and fix e2ee icon
2021-05-12 17:04:24 +01:00
Michael Telatynski
607ca17971
Iterate beta feedback dialog
2021-05-12 16:11:38 +01:00
Michael Telatynski
2c89be312a
Disable space fields whilst their form is busy
2021-05-12 13:30:00 +01:00
J. Ryan Stinnett
23869cdaa7
Add missing space on beta feedback dialog
2021-05-12 12:32:39 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results ( #6016 )
2021-05-12 12:18:56 +01:00
Travis Ralston
7bd1a2b87f
Merge pull request #5972 from SimonBrandner/fix/17164/remember-collapsed-state
...
Persistent space collapsed states
2021-05-11 23:23:48 -06:00
Šimon Brandner
262fc40afb
Move comment to the correct place
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-12 07:12:00 +02:00
Travis Ralston
9842bcde50
Merge pull request #6010 from ndarilek/develop
...
Catch another instance of unlabeled avatars.
2021-05-11 21:44:15 -06:00
Michael Telatynski
7396ce76e5
Tweak the feedbacks a tad
2021-05-11 17:30:33 +01:00
Michael Telatynski
7de626824e
Sprinkle some more feedback prompts in the spaces beta
2021-05-11 17:01:31 +01:00
Michael Telatynski
bf4c8f048f
Add feedback mechanism for beta features
2021-05-11 15:58:19 +01:00
Nolan Darilek
006aa2d5b9
Catch another instance of unlabeled avatars.
...
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-05-11 09:39:06 -05:00
Jaiwanth
240753a84f
Check for a pending edit only once per render and clear any pending events while switching between edits
2021-05-11 18:37:57 +05:30
Michael Telatynski
df72fbb22a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179
...
Conflicts:
src/i18n/strings/en_EN.json
2021-05-11 14:07:47 +01:00
Michael Telatynski
2e19c7fd24
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-05-11 13:40:28 +01:00
Michael Telatynski
f0342b0ea7
Merge pull request #6009 from matrix-org/t3chguy/fix/15359
...
Improve permissions error when adding new server to room directory
2021-05-11 12:36:40 +01:00
Michael Telatynski
b0f23aa65b
Improve permissions error when adding new server to room directory
2021-05-11 12:20:18 +01:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 11:13:13 +02:00
Michael Telatynski
5eed9f6cba
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227
2021-05-11 09:14:01 +01:00
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 08:08:02 +02:00
Jaiwanth
87d95d0cb1
Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages
2021-05-11 11:12:32 +05:30
Šimon Brandner
bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state
2021-05-11 07:38:08 +02:00
Jaiwanth
4ea3fbc5ba
Add comments and newlines back and resolve merge conflicts
2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:37:53 +05:30
Travis Ralston
12657f0fbc
Merge branch 'develop' into edit-slashcommands
2021-05-10 20:09:33 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js
2021-05-10 20:03:20 -06:00
Robin Townsend
c39d9649ba
Merge branch 'develop' into improved-forwarding-ui
2021-05-10 13:38:02 -04:00
Robin Townsend
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1
...
Switch the Home Space out for an All rooms space
2021-05-10 16:26:05 +01:00
Michael Telatynski
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name
...
Show device ID in UserInfo when there is no device name
2021-05-10 16:19:56 +01:00
Michael Telatynski
3a75eb1226
Fix handling of enter/return in space creation menu
2021-05-10 14:39:10 +01:00
J. Ryan Stinnett
4311d91372
Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta
...
Don't use the event's metadata to calc the scale of an image
2021-05-10 13:06:08 +01:00
J. Ryan Stinnett
45acf70b00
Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype
...
Adjust MIME type of upload confirmation if needed
2021-05-10 10:21:35 +01:00
Robin Townsend
09ba74a851
Disable forward buttons for rooms without send permissions
...
…and add a tooltip to explain why they can't accept forwarded messages.
It was chosen to disable the buttons rather than hide the entries from
the list, since hiding them without explanation could cause confusion.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 01:10:41 -04:00
Robin Townsend
100efb1a90
Fix ForwardDialog crashing when rendering reply
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:40:54 -04:00
Robin Townsend
c96888c9cb
Make ForwardDialog more readable
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 00:38:01 -04:00
Robin Townsend
219c983d19
Use import instead of sdk.getComponent
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-09 10:58:44 -04:00
Jaiwanth
1f77048750
Minor refactor
2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4
Save edited state when switching rooms
...
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-09 13:42:01 +05:30
Robin Townsend
e46bc93178
Fall back to MXID when no display name is present
...
MemberAvatar requires a display name, or else it refuses to render.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:22:31 -04:00
Robin Townsend
44b143c8c3
Match requested avatar size to displayed size
...
Reduces the blurriness of avatars in the EventTilePreview.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:17:05 -04:00
Robin Townsend
7fa81766db
Remove old forwarding code
...
This has been replaced by ForwardDialog.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Robin Townsend
b9b237fc9a
Replace forwarding UI with dialog
...
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690 .
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Aaron Raimist
fa307ee14c
Update src/components/views/right_panel/UserInfo.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-05-07 18:41:47 -05:00
Robin Townsend
119c14c3f9
Forbid redaction of encryption events
...
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-07 12:49:37 -04:00
Michael Telatynski
cb13200c2d
last minute copy tweak
2021-05-07 11:56:41 +01:00
Michael Telatynski
a8c4aabb52
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +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
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
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
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
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
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
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
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
d2959e1acc
Add mechanism for disabling Betas
2021-04-30 12:30:05 +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
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
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
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
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
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
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
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
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
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
Germain
4d5fd3ec73
Merge pull request #5913 from matrix-org/gsouquet-desktop-i18n
2021-04-27 15:48:49 +01:00
Germain Souquet
fa534e4755
Add room intro warning when e2ee is not enabled
2021-04-27 14:47:56 +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
Š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
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
Robin Townsend
3a62f6cdaa
Merge branch 'develop' into better-spinners
2021-04-26 14:12:44 -04:00
Robin Townsend
d3db5fe77f
Vectorize mini avatar uploader spinner
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-26 14:10:09 -04: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
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
Šimon Brandner
dbca370497
Try to precalculate the zoom from width and height props
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:48:14 +02:00
Šimon Brandner
b741b3112a
If the image is small don't scale
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:47:06 +02:00
Michael Telatynski
8656212eb9
Space creation prompt user to add existing rooms instead of creating new ones
2021-04-26 12:41:04 +01:00
Šimon Brandner
33107a1f47
Fall back to natural height and width
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:30:14 +02:00
Šimon Brandner
c1a4204ad3
Use a ref instead of that ugly thing
...
Sometimes I do really weird things and don't know why :D
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 13:11:41 +02:00
Michael Telatynski
1e7eedba02
Use label element in add existing to space dialog for easier hit target
2021-04-26 11:29:08 +01:00
Michael Telatynski
9319dd5400
Autofocus search box in the add existing to space dialog
2021-04-26 11:24:28 +01:00
Michael Telatynski
1c7d68bb16
invert and outdent
2021-04-25 09:35:18 +01:00
Michael Telatynski
4411498057
Fix add existing to space dialog no longer showing rooms for public spaces
2021-04-25 09:33:44 +01:00
Aaron Raimist
f3c0fc96a3
Merge branch 'develop' into warn-on-access-token-reveal
2021-04-24 15:01:19 -05:00
Šimon Brandner
0e312977e3
Rework zooming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 10:36:53 +02:00
Šimon Brandner
90f2423eb7
Fix zoom step and coeficient
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 10:35:25 +02:00
Šimon Brandner
bcc6e5c5d5
Add some comments
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 09:41:46 +02:00
Šimon Brandner
9b7a9fc865
Use MAX_SCALE for maxZoom
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 09:24:25 +02:00
Šimon Brandner
dcc060f6f7
Use correct cursor when we can't zoom
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 09:00:15 +02:00
Šimon Brandner
e0e9ccbf95
Remove logline
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-24 08:38:13 +02:00