Š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
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
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
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
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
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