Šimon Brandner
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
2021-08-02 11:32:57 +02:00
Travis Ralston
711210d16e
Merge pull request #6437 from matrix-org/travis/voice-messages/delabs
...
Remove voice messages labs flag
2021-08-02 02:02:36 -06:00
Travis Ralston
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
...
Improve download interactions
2021-07-30 10:50:27 -06:00
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Travis Ralston
d1e7c79333
Change "Downloading" tooltip to "Decrypting"
...
Fixes https://github.com/vector-im/element-web/issues/18239
2021-07-29 15:37:09 -06:00
Michael Telatynski
02dbdc5c0a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
src/dispatcher/actions.ts
src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Michael Telatynski
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
Michael Telatynski
251b6eb04e
update copy
2021-07-29 15:30:49 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
08c883ed07
Update all copy of subspace
to space
2021-07-29 13:02:07 +01:00
Michael Telatynski
9fb1c8e4cd
Iterate PR
2021-07-28 19:33:07 +01:00
Michael Telatynski
ac800ad94d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
2021-07-28 19:24:26 +01:00
Michael Telatynski
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
Michael Telatynski
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
Michael Telatynski
6123ccb2eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
2021-07-28 17:45:15 +01:00
Michael Telatynski
67ef263940
Refactor SpaceButton to be more reusable and add context menu to Home button
2021-07-28 17:40:33 +01:00
Šimon Brandner
e0762827fe
Fix typo
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 17:19:32 +02:00
Šimon Brandner
168a32902e
Remove additional word
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:50:40 +02:00
Šimon Brandner
9ec4507da5
Update copy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:49:03 +02:00
Michael Telatynski
07b9d6b30b
Fix styling of setting flag descriptions in preferences
...
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
Michael Telatynski
f91a20cb02
Merge pull request #6484 from matrix-org/t3chguy/fix/18095
2021-07-28 13:51:45 +01:00
Šimon Brandner
e445c9c3ff
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 13:28:11 +02:00
James Salter
bd7e2dee3d
Merge remote-tracking branch 'origin' into posthog-analytics
2021-07-28 11:13:22 +01:00
James Salter
c3e715c1ca
i18n
2021-07-28 10:45:32 +01:00
Michael Telatynski
52e50863f8
Fix CreateRoomDialog exploding when making public room outside of a space
2021-07-28 08:39:59 +01:00
Michael Telatynski
776435f620
Switch all-rooms toggle for spaces to non-feature settings key
2021-07-27 21:17:24 +01:00
Paulo Pinto
6c945ee4ed
Add missing translations
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:58:19 +01:00
Šimon Brandner
507dcd91d9
Fix i18n?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:53:57 +02:00
Šimon Brandner
9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:39:22 +02:00
Paulo Pinto
3f2dadf0fe
When a single message is unpinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Paulo Pinto
8fe7df9171
When a single message is pinned, link to it
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-27 17:14:50 +01:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Michael Telatynski
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
Michael Telatynski
353c70ad75
i18n
2021-07-27 14:45:36 +01:00
Germain Souquet
92394daa62
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-07-27 14:37:50 +02:00
Šimon Brandner
29b0d03fe4
Update copy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 21:27:22 +02:00
Jaiwanth
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
Jaiwanth
30a64a1b5a
Gray out and hide some options during export
2021-07-26 12:41:36 +05:30
Jaiwanth
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
Jaiwanth
3d4d1d32d9
Modify design according to the design team
2021-07-26 00:09:59 +05:30
Šimon Brandner
456800af21
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:57:51 +02:00
Šimon Brandner
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
Šimon Brandner
85095df4b9
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:03:26 +02:00
Michael Telatynski
7ccc429bea
Change spaces beta feedback to not be so beta-centric
2021-07-23 15:47:11 +01:00
Michael Telatynski
9c7fa71a4a
Remove spaces beta feedback prompts except a couple more strategic ones
2021-07-23 15:07:24 +01:00
Michael Telatynski
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +01:00
Michael Telatynski
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Travis Ralston
0bb0c8105d
Merge pull request #6434 from matrix-org/travis/voice-messages/upload-failed
...
Handle upload errors in voice messages
2021-07-22 03:40:26 -06:00
Šimon Brandner
2df4f7b859
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
2021-07-22 07:51:58 +02:00
Travis Ralston
363175e9a6
Clean up i18n
2021-07-21 18:13:01 -06:00
Travis Ralston
079e75aae9
Handle upload errors in voice messages
...
Fixes https://github.com/vector-im/element-web/issues/17148
Mostly adding some try/catch blocks, and a generic dialog.
2021-07-21 16:11:10 -06:00
Travis Ralston
3d72b9e227
Render error state for audio components
...
Fixes https://github.com/vector-im/element-web/issues/17148
Both `AudioPlayer` and `RecordingPlayback` got a fragment added to their DOM structure, to incorporate the rarely seen error message below it. Additionally, a missing try/catch was added to the `Playback` class to handle uncaught decoding issues.
The similarity of the components is tracked in https://github.com/vector-im/element-web/issues/18161
2021-07-21 15:47:52 -06:00
Travis Ralston
36d4eb85e1
Restore 'use default' naming on room notifications
...
Fixes https://github.com/vector-im/element-web/issues/18139
Following https://github.com/matrix-org/matrix-react-sdk/pull/6352
2021-07-21 13:01:19 -06:00
Šimon Brandner
ddd4b4bc12
Show a "Your camera is turned off" toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:22:47 +02:00
Šimon Brandner
51cf426179
Update the toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:08:18 +02:00
Šimon Brandner
be52eba027
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-21 15:56:08 +02:00
Šimon Brandner
e8760736ba
Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +02:00
Michael Telatynski
fd64d37305
Add iconography to Create Room Dialog dropdown
...
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Michael Telatynski
a58edcb241
tweak copy
2021-07-21 10:43:12 +01:00
Michael Telatynski
bc87dc3c56
remove duplicated content
2021-07-21 10:17:09 +01:00
Michael Telatynski
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
Libexus
4c7c10abf8
Remove misplaced bracket in a translation string
2021-07-21 09:44:39 +02:00
Jaiwanth
1ed316851a
Merge upstream and resolve conflicts
2021-07-21 11:35:27 +05:30
Travis Ralston
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
Šimon Brandner
3751f04cef
Add "You are presenting toast"
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:17:07 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
Šimon Brandner
621aee6f9a
Merge remote-tracking branch 'upstream/develop' into feature-surround-with
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:21:52 +02:00
Šimon Brandner
c16827272d
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:19:31 +02:00
Šimon Brandner
ff5ebb4657
Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:16:56 +02:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Michael Telatynski
b94886a291
i18n irc and fix lint from merge conflict
2021-07-20 11:18:27 +01:00
Germain Souquet
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
Travis Ralston
6862d97961
APPEASE THY JSON
2021-07-19 10:18:15 -06:00
Šimon Brandner
3250b35151
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:10:31 +02:00
Michael Telatynski
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
James Salter
f9fbf6f210
Rename Copy Link to Copy Room Link
...
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
2021-07-19 15:05:04 +01:00
Jaiwanth
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
Travis Ralston
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
Travis Ralston
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Šimon Brandner
27b02617c2
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:16:14 +02:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
James Salter
767d97065d
Run i18n
2021-07-16 09:36:59 +01:00
James Salter
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
Šimon Brandner
d9b3c4d19c
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 10:22:02 +02:00
James Salter
7464900f95
Change menu label to Copy Link
2021-07-16 09:05:01 +01:00
Michael Telatynski
5986609731
i18n
2021-07-15 10:05:37 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
James Salter
e054af7f38
Run yarn i18n
2021-07-14 15:35:57 +01:00
Germain Souquet
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00
Germain Souquet
f4dfe9832b
change labs flag wording
2021-07-14 16:20:25 +02:00
James Salter
2fe5ad5d4b
Slightly refine error message
2021-07-14 15:07:22 +01:00
James Salter
7f70b982cd
Add English i18n string
2021-07-14 15:02:59 +01:00
Robin Townsend
d568e92e06
Merge branch 'develop' into e2ee-history-visibility
2021-07-13 23:07:11 -04:00
Paulo Pinto
76157a7b48
Standardise casing of integration manager
...
Replace instances of 'Integration Manager' with 'Integration manager', when at start of
sentence, or 'integration manager' when not.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:44 +01:00
Paulo Pinto
09d08882e3
Standardise casing of identity server
...
Replace instances of 'Identity Server' with 'Identity server', when at start of
sentence, or 'identity server' when not.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Šimon Brandner
d7acaa9fb0
Update onEncryptionChange dialog
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 13:38:48 +02:00
Germain Souquet
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
Travis Ralston
9d60d29368
Clean up i18n
2021-07-13 00:04:07 -06:00
Travis Ralston
ff7a18da56
Rewrite Notifications component for modern UI & processing
2021-07-12 23:57:54 -06:00
Travis Ralston
436563be7b
Change label on notification dropdown for a room
...
by request of design, to reduce mental load
2021-07-12 18:30:42 -06:00
Šimon Brandner
c478b4efb5
Improve "Are you sure you want to make this encrypted room public?" dialog
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 19:20:19 +02:00
Šimon Brandner
0618460833
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 18:00:34 +02:00
Michael Telatynski
cecc43281b
i18n
2021-07-12 11:33:33 +01:00
Šimon Brandner
1b993ef1bd
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 10:36:56 +02:00
Jaiwanth
6a4e2672f6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-10 19:18:01 +05:30
Šimon Brandner
cdeb0be847
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 14:22:41 +02:00
Šimon Brandner
9c67679b35
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-07-08 13:30:57 +02:00
Germain Souquet
6868478044
Add threaded messaging feature flag
2021-07-08 11:30:56 +02:00
Michael Telatynski
b9a539eaa2
Improve URL Previews
...
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
2021-07-07 18:04:30 +01:00
Germain Souquet
10bdb3cefa
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-07 13:07:43 +02:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
Šimon Brandner
0b52ad48bb
Show "Open chat" if DM already exists
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-06 21:56:53 +02:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1
2021-07-06 12:04:18 +01:00
Germain Souquet
8d34767768
Fix i18n after deprecation
2021-07-05 09:18:16 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Jaiwanth
190ccb6f00
Merge and add export support for the modified MAudioBody
2021-07-02 10:41:04 +05:30
Šimon Brandner
4f70d9021a
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-01 19:05:11 +02:00
Šimon Brandner
e355bf0db1
Merge remote-tracking branch 'upstream/develop' into reorganize-preferences
2021-07-01 18:53:53 +02:00
David Baker
404aa96f48
i18n
2021-07-01 15:13:24 +01:00
Travis Ralston
12d7be2b6a
Merge branch 'develop' into travis/new-audio
2021-06-30 13:25:41 -06:00
Germain Souquet
209344d443
improvements to bubble layout
2021-06-30 17:06:51 +01:00
Jaiwanth
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
Jaiwanth
7d5db4689c
Disable close icon during export
2021-06-30 10:03:33 +05:30
Peter Vágner
46f59be7f3
Merge branch 'develop' into voip-a11y
2021-06-29 23:08:13 +02:00
Germain
640fc591bb
Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
...
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
J. Ryan Stinnett
14ef38e057
Merge pull request #6280 from robintown/group-acls
...
Group ACLs with MELS
2021-06-29 10:02:12 +01:00
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu
2021-06-29 08:18:07 +01:00
Jaiwanth
e404fa3cae
Apply suggestions
2021-06-29 10:57:02 +05:30
Travis Ralston
964a97d59e
Merge remote-tracking branch 'origin/develop' into travis/new-audio
2021-06-28 20:52:44 -06:00
Robin Townsend
a11193e243
Group ACLs with MELS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-28 12:36:40 -04:00
Germain Souquet
6607294573
Deprecate Tinter and TintableSVG
2021-06-28 17:13:23 +01:00
Jaiwanth
64b683a0df
Add cancel warning and progress completion modals
2021-06-28 12:20:41 +05:30
Jaiwanth
d8f763664b
Add warning modal during export
2021-06-27 22:18:43 +05:30
Jaiwanth
398d49245f
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-06-26 23:42:42 +05:30
Jaiwanth
46f34ba455
Add validation
2021-06-26 23:07:38 +05:30
Jaiwanth
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
Jaiwanth
92e34c7993
Format dropdown
2021-06-26 13:04:10 +05:30
Jaiwanth
c3dc51c452
Create export dialog and async import export utils
2021-06-26 12:14:18 +05:30
Jaiwanth
4d6ad91e52
Add export option to right panel
2021-06-25 22:45:14 +05:30
Michael Telatynski
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770
2021-06-25 15:43:33 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click
2021-06-25 14:42:18 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu ( #6237 )
...
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
Michael Telatynski
a8649ca091
i18n
2021-06-25 11:02:33 +01:00
Jaiwanth
c885cd719f
i18n
2021-06-25 14:58:59 +05:30
Michael Weimann
086042f078
update message context texts and icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
Michael Weimann
9a1be63baa
reorder message context menu items
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:52 +02:00
Michael Weimann
c2d51a115b
tweak message context labels
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:52 +02:00
Travis Ralston
9c752680ba
Tile styling and early behaviour
2021-06-24 13:56:11 -06:00
Jaiwanth
91b8b2ac5a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 22:54:40 +05:30
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
Travis Ralston
006c6df205
Merge pull request #6253 from matrix-org/travis/leave-reasons
...
Update membership reason handling, including leave reason displaying
2021-06-24 08:52:34 -06:00
Jaiwanth
544761329c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 18:33:30 +05:30
Šimon Brandner
6333d4aa36
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:02:06 +02:00
Michael Telatynski
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
Šimon Brandner
7eb3642692
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:42:01 +02:00
Jaiwanth
4bfac11911
i18n
2021-06-24 14:04:37 +05:30
Michael Telatynski
0e2f617d94
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051
2021-06-24 09:33:39 +01:00
Travis Ralston
72099c1a08
Update punctuation
2021-06-23 19:42:47 -06:00
Travis Ralston
e696a1d5dc
Update membership reason handling, including leave reason displaying
...
Incorporates ideas from https://github.com/matrix-org/matrix-react-sdk/pull/6198
2021-06-23 10:31:08 -06:00
Jaiwanth
b2162c3be9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-23 12:09:46 +05:30
Michael Telatynski
d5581f00cc
Merge pull request #6239 from matrix-org/t3chguy/fix/17605
2021-06-22 22:56:49 +01:00
Michael Telatynski
9f20d6661d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
Michael Telatynski
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Michael Telatynski
99e3aea1e5
i18n and regen yarn lock
2021-06-22 21:17:33 +01:00
Michael Telatynski
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski
4a66794236
update copy
2021-06-22 17:26:19 +01:00
Michael Telatynski
3c9cd938d0
remove spurious full stop
2021-06-22 15:29:53 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
Michael Telatynski
847e3dcbce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-22 14:11:37 +01:00
Michael Telatynski
1f0fdb95cd
Improve accessibility of subspaces in the space panel
2021-06-22 11:59:04 +01:00
Jaiwanth
36a69313cd
Display redactedBecauseUserId for redacted events
2021-06-22 14:53:48 +05:30
Jaiwanth
db875508d8
Add text for room avatar events and skip empty text events
2021-06-22 12:50:15 +05:30
Jaiwanth
12ecaf30df
i18n
2021-06-22 12:14:31 +05:30
Šimon Brandner
1bf9e592e9
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 08:19:57 +02:00
Jaiwanth
45be4a6d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-22 09:27:37 +05:30
Germain Souquet
7825c30bf7
Improve event index initialisation failure message in search bar for supported platforms
2021-06-21 15:41:47 +01:00
Šimon Brandner
ce47662b55
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 11:26:39 +02:00
Šimon Brandner
686e7d18c3
Merge remote-tracking branch 'upstream/develop' into feature-surround-with
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-20 08:14:12 +02:00
David Teller
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:09:02 +02:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
2021-06-17 15:53:25 +02:00
Michael Telatynski
100de336a1
i18n
2021-06-16 20:12:31 +01:00
Peter Vágner
b05e0263d2
Merge branch 'develop' into voip-a11y
2021-06-16 14:44:12 +02:00
Michael Telatynski
b4fbc791bb
Add experimental options to the Spaces beta
2021-06-16 09:01:13 +01:00
Jaiwanth
cff4521106
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-16 10:52:00 +05:30
Michael Telatynski
89221bde0f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-15 13:58:13 +01:00
Michael Telatynski
83c30b2280
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-06-15 12:24:26 +01:00
Jaiwanth
bd75849e73
Enable option to set maximum file size
2021-06-15 16:41:31 +05:30
Michael Telatynski
539465ecb4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-06-14 22:22:30 +01:00
Peter Vágner
a94d11235e
Changed the buttons to TooltipButtons and added the tooltip for the hangup button
...
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
2021-06-12 14:17:10 +02:00
Peter Vágner
6458f717cc
i18n
...
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
2021-06-12 13:53:44 +02:00
Šimon Brandner
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-06-12 13:32:49 +02:00
Šimon Brandner
0c55a6c5bf
Add presenting text
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:50:16 +02:00
Germain Souquet
6606a1142d
Update unencrypted room warning copy
2021-06-10 11:29:10 +01:00
Germain Souquet
7f3173f170
Implement unencrypted warning slate in rooms
2021-06-10 11:14:43 +01:00
Germain Souquet
c2d1eb3e8e
Merge branch 'develop' into gsouquet-e2ee-warning
2021-06-10 10:25:20 +01:00
Šimon Brandner
22567a16ef
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 20:10:55 +02:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 19:23:14 +02:00
Jaiwanth
6160b11eb8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-09 16:46:28 +05:30
Jaiwanth
9204ed30ce
Switch to localeDateString for i18n
2021-06-09 16:40:52 +05:30
Jaiwanth
716e2effbc
Enable proper i18n for date utils
2021-06-09 16:12:57 +05:30
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf
2021-06-09 09:13:56 +01:00
Michael Telatynski
2b99afc741
i18n
2021-06-08 17:05:56 +01:00
Michael Telatynski
f34a2e61bc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
2021-06-08 16:54:49 +01:00
Michael Telatynski
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553
2021-06-08 16:45:35 +01:00
Michael Telatynski
90bb7c1482
Switch Space Settings for a tabbed view with a bunch more settings exposed
2021-06-08 16:33:47 +01:00
David Baker
399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error
...
Better handling for widgets that fail to load
2021-06-08 16:28:44 +01:00
David Baker
90a58380fd
Make it translateable
...
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
Jaiwanth
dbb3614374
Merge branch 'develop' into export-conversations
2021-06-08 18:43:03 +05:30
Robin Townsend
b97867271b
Merge branch 'develop' into improved-forwarding-ui
2021-06-07 19:09:36 -04:00
Michael Telatynski
f3aa505673
Add warning to private space creation flow
2021-06-07 14:14:31 +01:00
Michael Telatynski
8c34a8461e
Add way to specify address during public space creation
2021-06-07 08:57:39 +01:00
Michael Telatynski
b2b95257a8
Convert RoomAliasField to Typescript
2021-06-07 08:54:41 +01:00
Robin Townsend
21ff1f521f
Fix i18n strings
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:14:26 -04:00
Robin Townsend
a06306d560
Merge branch 'develop' into improved-forwarding-ui
2021-06-05 11:04:17 -04:00
Jaiwanth
8786c97cdb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-05 11:27:08 +05:30
Michael Telatynski
93f41ce0ab
Actually finish the empty state for the pinned messages card
2021-06-04 11:35:17 +01: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
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
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
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606
2021-06-03 19:33:09 +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
Jaiwanth
183166c460
Unminify CSS and apply suggestions from the design team
2021-06-03 12:40:00 +05:30
David Baker
58652152c1
Strings are now in a different place...
2021-06-02 17:52:26 +01:00
Robin Townsend
56714525f2
Merge branch 'develop' into improved-forwarding-ui
2021-06-01 17:28:55 -04:00
Šimon Brandner
c03f0fb13d
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 14:47:46 +02:00
Šimon Brandner
91288ab525
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-01 11:51:34 +02:00
Jaiwanth
80c0ad82fc
Better file names
2021-06-01 12:40:03 +05:30
Jaiwanth
5f1c9d0f88
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-05-31 22:58:11 +05:30
Michael Telatynski
d319768b2e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-05-28 13:06:48 +01:00
Nique Woodhouse
ea26393709
Styling amends to accommodate the invite dialog footer
2021-05-28 13:00:18 +01:00
David Baker
c4a26893a0
Handle user_busy in voip calls
...
Newly added to MSC2746
2021-05-27 18:57:22 +01:00
Michael Telatynski
f75fb3b349
Add footer and privacy note to the start dm dialog
2021-05-27 15:51:25 +01:00
Michael Telatynski
0758c09d9e
i18n
2021-05-26 14:06:12 +01:00
Michael Telatynski
27ad90760d
Iterate pinned messages
2021-05-26 13:51:17 +01:00
Michael Telatynski
fd74a946e0
add header
2021-05-25 17:24:43 +01:00
Michael Telatynski
42ffc5c9e8
Add support to keyboard shortcuts dialog for [digits]
2021-05-24 18:08:43 +01:00
Germain Souquet
f478cd98f7
fix i18n for UserMenu spinner
2021-05-24 15:12:17 +01:00
Germain Souquet
36d95ff737
Display spinner in user menu when joining a room
2021-05-24 15:02:26 +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
88e0e9b9fb
Merge branch 'develop' into improved-forwarding-ui
2021-05-24 08:23:07 -04: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
8b7a73b3ab
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:24:41 +02:00
Šimon Brandner
7e165384fd
Merge branch 'develop' into reorganize-preferences
2021-05-22 17:25:04 +02:00
Šimon Brandner
a6deef76ea
Merge branch 'develop' into public-e2ee-warn
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 17:17:08 +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
Michael Telatynski
35b9388fc2
Iterate PR
2021-05-21 13:37:21 +01:00
Robin Townsend
f34d61cf5d
Merge branch 'develop' into improved-forwarding-ui
2021-05-21 08:15:09 -04:00
Jaiwanth
ebdb340a5c
Create a basic HTML export tool with support only for text based events
2021-05-21 10:50:56 +05:30
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
aa7ccc1420
Show prompt to create new room from room directory results
2021-05-19 20:07:54 +01:00
Robin Townsend
678b298bab
Merge branch 'develop' into improved-forwarding-ui
2021-05-19 12:39:48 -04:00
Šimon Brandner
17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-05-19 08:46:33 +02:00
Michael Telatynski
367ad1583d
Merge pull request #6053 from matrix-org/t3chguy/fix/17338
...
Add space invaders chat effect
2021-05-18 12:14:40 +01:00
Michael Telatynski
b5a612cd0f
Add space invaders chat effect
2021-05-18 10:29:10 +01:00
Michael Telatynski
f87f0704b9
i18n
2021-05-18 09:42:35 +01:00
Robin Townsend
64e828d069
Merge branch 'develop' into improved-forwarding-ui
2021-05-16 08:13:59 -04:00
Travis Ralston
5093657c71
Remove "read" level language for new API scope
2021-05-14 14:17:10 -06:00
Travis Ralston
98b2e120a7
Merge branch 'develop' into travis/msc2876
2021-05-14 14:09:57 -06: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
034bd9cb02
Merge pull request #6029 from matrix-org/t3chguy/fix/17275
...
Show alternative button during space creation wizard if no rooms
2021-05-14 10:48:39 +01:00
Michael Telatynski
e1df62472d
remove unused imports and run i18n
2021-05-14 10:48:24 +01: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
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation
...
Typo: initilisation -> initialisation
2021-05-13 20:15:08 -06:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622
2021-05-13 16:12:42 +01:00
Michael Telatynski
2f28de8472
Show alternative button during space creation wizard if user opted to create 0 rooms
2021-05-13 13:22:50 +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
236fcecf9c
i18n
2021-05-12 17:13:23 +01:00
Michael Telatynski
607ca17971
Iterate beta feedback dialog
2021-05-12 16:11:38 +01:00
Michael Telatynski
ea9be0dd4c
Merge pull request #6012 from matrix-org/t3chguy/fix/17238
...
Add feedback mechanism for beta features, namely Spaces
2021-05-11 17:46:21 +01:00
Michael Telatynski
7396ce76e5
Tweak the feedbacks a tad
2021-05-11 17:30:33 +01:00
Travis Ralston
92e30f0607
Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev
2021-05-11 10:13:21 -06: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
Michael Telatynski
6ece4ef2ab
i18n
2021-05-11 14:08:09 +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
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
Travis Ralston
12657f0fbc
Merge branch 'develop' into edit-slashcommands
2021-05-10 20:09:33 -06:00
Robin Townsend
c39d9649ba
Merge branch 'develop' into improved-forwarding-ui
2021-05-10 13:38:02 -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
3a75eb1226
Fix handling of enter/return in space creation menu
2021-05-10 14:39:10 +01:00
Šimon Brandner
135cdb2255
Add dialog with info about the screensharing change
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 12:37:40 +02: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
Travis Ralston
aac1f4330d
Remove "in development" flag from voice messages
2021-05-07 19:36:29 -06:00
Michael Telatynski
cb13200c2d
last minute copy tweak
2021-05-07 11:56:41 +01:00
Michael Telatynski
1fc591628a
i18n
2021-05-07 11:51:37 +01:00
Michael Telatynski
57be074811
i18n
2021-05-07 10:48:03 +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
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
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
Aaron Raimist
9aa711b7b7
Merge branch 'develop' into initialisation
2021-05-06 00:09:48 -05:00
Michael Telatynski
650933096a
Iterate Spaces admin UX around room management
2021-05-05 17:25:29 +01:00
J. Ryan Stinnett
5daad1de67
Merge pull request #5961 from SimonBrandner/fix/15460/allow-p2p-calls
...
Add a note about sharing your IP in P2P calls
2021-05-05 16:59:06 +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
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
J. Ryan Stinnett
28128ca45f
Merge pull request #5934 from aaronraimist/security-phrase-2
...
Another change from recovery passphrase to Security Phrase
2021-05-04 11:43:23 +01:00
Šimon Brandner
0fe6a389d4
Add a note about sharing your IP with P2P calls
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-04 12:36:22 +02:00
Travis Ralston
e04490284d
Support UI for MSC2876: Widgets reading events from rooms
...
MSC: https://github.com/matrix-org/matrix-doc/pull/2876
Fixes https://github.com/vector-im/element-web/issues/15747
Requires https://github.com/matrix-org/matrix-widget-api/pull/34
2021-05-03 21:50:25 -06: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
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
Aaron Raimist
03a098887a
Change confirmation string in CreateSecretStorageDialog.js to match
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-30 19:44:43 -05:00
Šimon Brandner
e52fd3791e
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 11:10:45 +02:00
Šimon Brandner
e2bee396bb
Merge branch 'develop' into reorganize-preferences
2021-04-30 10:55:29 +02:00
Robin Townsend
bd602e7089
Hide world readable history option in encrypted rooms
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-29 18:23:39 -04:00
Michael Telatynski
62198601d2
Tweak room list filter placeholder and results copy for spaces
2021-04-29 16:40:08 +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
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
Š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
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
Aaron Raimist
79e03332e3
Another change from recovery passphrase to Security Phrase
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-27 16:51:53 -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
Germain Souquet
fa534e4755
Add room intro warning when e2ee is not enabled
2021-04-27 14:47:56 +01: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
Michael Telatynski
43b43dc685
tidy up code
2021-04-26 16:11:07 +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
Šimon Brandner
38566a3644
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 15:51:56 +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
Aaron Raimist
f3c0fc96a3
Merge branch 'develop' into warn-on-access-token-reveal
2021-04-24 15:01:19 -05:00
Travis Ralston
82119ad595
Merge branch 'develop' into travis/error-states
2021-04-23 15:53:37 -06:00
Šimon Brandner
c54aa86532
Merge branch 'develop' into feed
2021-04-23 18:32:05 +02:00
Aaron Raimist
bf444ce22e
Typo: initilisation -> initialisation
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-04-23 11:31:30 -05:00
Michael Telatynski
60828913d2
Iterate the spaces face pile design
2021-04-22 08:13:03 +01:00
Travis Ralston
c5dd6b4dfb
Update action bar to incorporate sending states
...
This moves most of them out of the context menu.
2021-04-21 16:24:17 -06:00
Travis Ralston
91b3688feb
Redesign "failed to send messages" status bar
2021-04-21 16:24:17 -06:00
Michael Telatynski
c4ef1f9828
Merge pull request #5415 from aaronraimist/only-member-warning
...
Warn when you attempt to leave room that you are the only member of
2021-04-20 12:33:19 +01:00
Michael Telatynski
63ed9c271b
Merge pull request #5866 from ColonisationCaptain/develop
...
Add missing space in seshat dialog and the corresponding string
2021-04-20 09:02:53 +01:00
Travis Ralston
01fc88f88a
Merge pull request #5871 from matrix-org/travis/voice/countdown
...
Limit voice recording length
2021-04-19 10:30:38 -06:00