Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages ( #6701 )
...
In case where we had a very long message the experience of going between
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.
Fixes https://github.com/vector-im/element-web/issues/18884
2021-09-27 12:20:37 +02:00
Michael Telatynski
6d0af83df4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
...
Conflicts:
src/components/views/dialogs/LeaveSpaceDialog.tsx
src/i18n/strings/en_EN.json
2021-09-27 11:19:49 +01:00
Jaiwanth
f35dae8c94
i18n
2021-09-22 22:22:45 +05:30
Jaiwanth
d1e3d35d40
Change export bundle filename format, light theme for all exports and import jszip after export cta
2021-09-22 22:17:23 +05:30
Jaiwanth
94e4fb71c1
Merge branch 'develop' into export-conversations
2021-09-22 18:07:01 +05:30
Šimon Brandner
7f8c0e99ea
Merge remote-tracking branch 'upstream/develop' into task/settings-ts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 19:35:42 +02:00
Šimon Brandner
6f7e64d2b4
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-21 15:15:23 +02:00
Ekaterina Gerasimova
d2fe8aff11
Improve string for leaving space in leave dialog
...
Doesn't leave subspaces either, but those are in Beta so we probably
shouldn't mention them for now so the user doesn't get confused
Signed-off-by: Ekaterina Gerasimova <ekaterinag@element.io>
2021-09-21 08:55:28 +01:00
Michael Telatynski
d615952337
Add fallback warning
2021-09-17 16:02:12 +01:00
Michael Telatynski
1858c63c4a
Allow options to cascade kicks/bans throughout spaces
2021-09-17 15:34:49 +01:00
Michael Telatynski
b91ece1bcf
Merge pull request #6828 from matrix-org/t3chguy/fix/a11y-label
2021-09-17 12:27:28 +01:00
Michael Telatynski
8c08293654
Fix reactions aria-label not being a string and thus being read as [Object object]
2021-09-17 11:36:22 +01:00
Michael Telatynski
28bc8010a7
Say Joining space instead of Joining room where we know its a space
2021-09-16 11:20:01 +01:00
Michael Telatynski
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858
2021-09-16 10:48:20 +01:00
Michael Telatynski
bbc8e4da23
Merge pull request #6594 from matrix-org/t3chguy/fix/18088
2021-09-16 10:16:33 +01:00
Michael Telatynski
b052d0730d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858
2021-09-16 10:15:43 +01:00
Michael Telatynski
e17318a364
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-16 10:05:20 +01:00
Šimon Brandner
a571460871
Use a universal copy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-15 15:30:23 +02:00
Šimon Brandner
8094a34384
Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-15 15:28:05 +02:00
Michael Telatynski
b8ee2d2b5b
Add warning that some spaces may not be relinked to the newly upgraded room
2021-09-14 16:14:25 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891
2021-09-14 14:07:43 +01:00
Michael Telatynski
ca0d8116ad
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908
2021-09-10 18:02:48 +01:00
Michael Telatynski
41676b4a9b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891
2021-09-10 11:09:52 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798
2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-10 09:53:04 +01:00
Michael Telatynski
558b292c25
Adapt and re-use the RolesRoomSettingsTab for Spaces
2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e
Show unsent message warning on Space panel button
2021-09-10 09:17:31 +01:00
Germain Souquet
b5bed32973
Fix i18n
2021-09-09 13:40:07 +01:00
Germain Souquet
07ebd85f7e
Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533
2021-09-09 13:30:35 +01:00
Michael Telatynski
630835961b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
...
Conflicts:
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-09-09 11:01:11 +01:00
Michael Telatynski
d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528
...
Improve tooltips on space quick actions and explore button
2021-09-08 22:59:52 +01:00
Michael Telatynski
086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018
...
Make space members and user info behave more expectedly
2021-09-08 22:59:44 +01:00
Michael Telatynski
600375cafe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
...
Conflicts:
src/i18n/strings/en_EN.json
2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-08 15:28:58 +01:00
Michael Telatynski
d4bac4752d
Make space members and user info behave more expectedly
2021-09-08 13:34:26 +01:00
Michael Telatynski
8bd1f384b9
Improve tooltips on space quick actions and explore button
2021-09-08 10:16:20 +01:00
Germain Souquet
bbf66a0011
Make label clickable on narrow mode context menu
2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe
Fix PR UI defects
2021-09-07 16:02:26 +01:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer""
2021-09-06 22:11:35 -06:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer"
2021-09-06 22:08:50 -06:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533
2021-09-07 05:07:00 +01:00
Michael Telatynski
68836b9c68
hide no-op m.room.encryption events and better word param changes
2021-09-06 14:59:30 +01:00
Michael Telatynski
a688e5b8b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/structures/LoggedInView.tsx
src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
Michael Telatynski
6801ec76a7
Merge pull request #6738 from matrix-org/t3chguy/fix/18780
2021-09-06 11:40:55 +01:00
Michael Telatynski
fc84682c81
i18n
2021-09-06 11:35:02 +01:00
Germain Souquet
085d8b46a7
fix i18n
2021-09-06 08:31:54 +01:00
Travis Ralston
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages
...
When pinning or unpinning messages, link to the specific message
2021-09-03 13:27:49 -06:00
David Baker
de01dcfd26
Merge pull request #6700 from SimonBrandner/feature/call-timer/18566
...
Show call length during a call
2021-09-03 17:17:36 +01:00
Michael Telatynski
419eb63e51
Add missing pluralisation i18n strings for Spaces
2021-09-03 13:20:35 +01:00
Germain Souquet
997f43cb82
Implement new narrow mode UI
2021-09-03 12:03:19 +01:00
David Baker
25fb243d0b
Merge pull request #6731 from matrix-org/dbkr/prevent_multiple_calls
...
Fix bug where one party's media would sometimes not be shown
2021-09-03 12:01:54 +01:00
Germain Souquet
6d80976eae
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-09-03 09:20:38 +01:00
David Baker
1a0365f528
i18n
2021-09-02 19:00:30 +01:00
Dariusz Niemczyk
99a0bd935b
Merge pull request #6726 from SimonBrandner/feature/autoplay-split
...
Split autoplay GIFs and videos into different settings
2021-09-02 18:40:42 +02:00
Germain Souquet
e416952c90
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-09-02 08:31:29 +01:00
Travis Ralston
b86a0dcc15
Merge branch 'develop' into travis/cross-room
2021-09-01 11:29:20 -06:00
Šimon Brandner
7fcb8ed488
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-01 17:28:16 +02:00
Michael Telatynski
979bc71609
Deduplicate join rule management between rooms and spaces
2021-09-01 15:52:56 +01:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349
2021-09-01 08:47:10 +01:00
Michael Telatynski
0cd00ae64f
Remove non-functional DuckDuckGo Autocomplete Provider
2021-08-31 16:05:16 +01:00
Šimon Brandner
f75b5f1b17
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 16:39:25 +02:00
Šimon Brandner
0fae3ed233
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-27 09:22:30 +02:00
Travis Ralston
289ac34764
Add support for MSC2762's timeline functionality
...
See https://github.com/matrix-org/matrix-widget-api/pull/41
2021-08-25 18:16:40 -06:00
Germain Souquet
0208d80695
Add missing i18n
2021-08-25 18:11:34 +01:00
Germain Souquet
2d14be9cef
Merge branch 'develop' into gsouquet/compact-composer-18533
2021-08-25 18:07:36 +01:00
Germain Souquet
31b3b2e2ed
Fix Sticker and Emoji picker opening on narrow mode
2021-08-25 15:39:50 +01:00
Germain Souquet
77a463e679
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-25 08:53:16 +01:00
Travis Ralston
9444995305
Merge pull request #6662 from matrix-org/travis/safe-labs
...
Flag a couple features as having dependencies
2021-08-25 01:12:48 -06:00
Travis Ralston
4790b4fc17
Remove advanced room logging setting
...
Fixes https://github.com/vector-im/element-web/issues/14602
This has proven to be less useful month over month, so it's time for it to go. The initial goal for keeping it was to track stability in the ~6 months post-release, which means it should have left around the start of 2021. At the time, Spaces was on the horizon with room list corruption issues though, so it was put on hold. These days, it's rock solid and doesn't appear to be causing issues. As such, the logging can leave in favour of more specific/targeted logging when we need it.
This might even speed things up as it's not hitting the SettingsStore every 0.2 seconds.
2021-08-24 13:17:12 -06:00
Travis Ralston
8237497bc4
Flag a couple features as having dependencies
2021-08-23 20:27:29 -06:00
Travis Ralston
32343f3382
Merge pull request #5698 from SimonBrandner/public-e2ee-warn
...
Add a warning on E2EE rooms if you try to make them public
2021-08-23 16:45:47 -06:00
Travis Ralston
15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089
...
Allow pagination of the space hierarchy and use new APIs
2021-08-23 15:51:34 -06:00
Germain Souquet
edd4d42e7f
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-23 17:31:37 +01:00
David Baker
5344b86de4
Merge pull request #6633 from matrix-org/dbkr/fix_cross_signing_setup_settings
...
Fix cross signing setup from settings screen
2021-08-23 09:41:24 +01:00
Jaiwanth
6a26154271
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-08-20 15:02:13 +05:30
Šimon Brandner
ac9ebd8a10
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-20 08:37:46 +02:00
Germain Souquet
ffc7326b0c
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-19 10:44:32 +01:00
David Baker
08b37eb7c5
Fix cross sisgning setup from settings screen
...
We previously called bootstrap without the cache callbacks set up
which meant it prompted you for you password once for each of the
three keys it fished out of SSSS. Instead, display the same dialog
we display from the verify toast.
Also, in the case where you hadn't verified yet, the button didn't
do anything at all, so make it trigger a verification & change the
caption appropriately.
Add a state to reflect when cross signing is set up but SSSS isn't
(ie. user hasn't yet set up backup / set a passphrase).
2021-08-18 19:22:42 +01:00
James Salter
23f70836b6
Update copy to indicate debug logs contain which UI elements you last interacted with
2021-08-18 17:05:15 +01:00
Jaiwanth
4dae737922
i18n
2021-08-17 20:06:09 +05:30
Germain Souquet
458f860a26
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-17 11:14:21 +01:00
Germain Souquet
e5024c4b71
Adapt threading UI to new backend
2021-08-17 10:38:09 +01:00
Dariusz Niemczyk
7b72931c42
Merge pull request #6422 from libexus/i18n-bracket-fix
...
Remove misplaced bracket in a translation string
2021-08-15 09:20:00 +02:00
Jaiwanth
3efa699b88
Delint
2021-08-14 00:14:57 +05:30
Jaiwanth
0e3ad652af
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-08-14 00:04:30 +05:30
Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Šimon Brandner
032d2866a3
Add "No answer" state
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:19:14 +02:00
Michael Telatynski
0414ea27b8
Iterate PR based on feedback
2021-08-12 15:53:10 +01:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
Michael Telatynski
03e3da885d
i18n
2021-08-12 12:09:28 +01:00
Michael Telatynski
8ddaa7faf1
i18n
2021-08-12 12:08:57 +01:00
Michael Telatynski
57bf64bd28
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/views/spaces/SpacePanel.tsx
2021-08-12 12:05:55 +01:00
Michael Telatynski
85b1f166e8
post-merge tidy up
2021-08-12 12:03:14 +01:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092
2021-08-12 11:28:14 +01:00
Michael Telatynski
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
Michael Telatynski
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y
2021-08-11 23:18:52 +01:00
Michael Telatynski
38dbe89316
Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-08-11 20:53:41 +01:00
Michael Telatynski
5f54abc7e5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-08-11 20:51:47 +01:00
Michael Telatynski
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
Michael Telatynski
cbd6f2de44
Tweak copy on space preview
2021-08-11 15:03:38 +01:00
Michael Telatynski
be85dcd1bf
Delabs Spaces, keeping it as a default-on preference for the time being
2021-08-11 14:52:40 +01:00
Michael Telatynski
6efb699670
Tweak copy in the space create menu
2021-08-10 16:46:11 +01:00
Germain Souquet
d971802789
Create ThreadView phase in RightPanel
2021-08-10 14:30:12 +02:00
Michael Telatynski
77cf5bf613
Update space create menu copy and add link to community migrator
2021-08-10 11:30:00 +01:00
Germain Souquet
7d4698da49
Merge branch 'develop' into gsouquet/threaded-messaging-2349
2021-08-10 11:41:15 +02:00
Michael Telatynski
195b8714fc
Iterate PR based on feedback
2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-10 09:48:22 +01:00
Michael Telatynski
857bb9db44
Add some treeview labels
2021-08-10 09:46:25 +01:00
Germain
298318c0ee
Merge branch 'develop' into i18n-bracket-fix
2021-08-09 09:07:32 +01:00
Jaiwanth
45ce352d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-09 10:44:13 +05:30
Šimon Brandner
eb49960497
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:20:52 +02:00
Travis Ralston
6a9ebc6902
Merge pull request #6390 from SimonBrandner/feature/hidden-rrs
...
Support for MSC2285 (hidden read receipts)
2021-08-06 09:27:14 -06:00
Travis Ralston
f53451df65
Merge pull request #6349 from SimonBrandner/feature/collapse-pinned-mels/17938
...
Group pinned message events with MELS
2021-08-06 09:25:08 -06:00
Michael Telatynski
3fd2c00516
Improve aria labels around spaces avatar uploader
2021-08-06 14:46:02 +01:00
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout
2021-08-06 14:45:54 +01:00
Travis Ralston
2c601e0ff1
Merge pull request #6562 from matrix-org/travis/voice-messages/disable-composer
...
Fix disabled state for voice messages + send button tooltip
2021-08-06 07:19:58 -06:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603
2021-08-06 12:56:38 +01:00
Michael Telatynski
facc882a11
i18n and add space null guard for home space
2021-08-06 12:50:32 +01:00
Michael Telatynski
f7818e0169
iterate PR based on feedback
2021-08-06 12:05:14 +01:00
Michael Telatynski
64995dfae7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-06 11:39:24 +01:00
Šimon Brandner
b05038ebd5
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:47:59 +02:00
Šimon Brandner
1b8aae9556
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:56:56 +02:00
Šimon Brandner
f7e750df60
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:54:56 +02:00
Šimon Brandner
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
2021-08-06 07:53:07 +02:00
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:43:19 +02:00
Travis Ralston
3b73c17465
Merge pull request #6181 from pvagner/voip-a11y
...
Make call control buttons accessible to screen reader users
2021-08-05 13:36:17 -06:00
Travis Ralston
fea30e5f5f
Fix disabled state for voice messages + send button tooltip
...
Fixes https://github.com/vector-im/element-web/issues/18413
2021-08-05 12:38:15 -06:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
...
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
...
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
Michael Telatynski
8ae95ddbb7
i18n
2021-08-05 13:50:50 +01:00
Michael Telatynski
54509fae95
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/voip-a11y1
...
Conflicts:
src/components/views/voip/CallView.tsx
2021-08-05 13:24:16 +01:00
Šimon Brandner
b9b98c6a81
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 18:15:11 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with
2021-08-04 18:14:38 +02:00
Šimon Brandner
a04a8006fc
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376
2021-08-04 15:48:53 +02:00
Šimon Brandner
9681e0e441
Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:15:20 +02:00
Michael Telatynski
2d3211ccf6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092
2021-08-04 12:14:29 +01:00
Šimon Brandner
3232552715
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376
2021-08-04 13:11:36 +02:00
Šimon Brandner
d05be44113
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:07:54 +02:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
...
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Travis Ralston
18b321f8e8
Improve hover states (tooltips) for voice message interactions
...
Fixes https://github.com/vector-im/element-web/issues/18375
2021-08-03 13:34:04 -06:00
Travis Ralston
7b565db02d
Update uploading state designs
2021-08-03 12:52:21 -06:00
James Salter
dc7aad1abf
Revert "Revert "Add support for Posthog Analytics under a labs flag""
...
This reverts commit c5ea253181
.
2021-08-03 11:55:02 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:30:02 +01:00
Travis Ralston
c5d11a9f17
Improve voice messages uploading state
...
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
Jaiwanth
46e2f67f54
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-08-03 10:03:16 +05:30
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
...
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
David Baker
9f8eb22c33
Merge pull request #6526 from SimonBrandner/fix/call-notif-fire
...
Fix broken call notification regression
2021-08-02 13:42:18 +01:00
Šimon Brandner
fd3bb2712a
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 14:35:12 +02:00
Š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