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