mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 20:41:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
35592 commits 219 branches 562 tags 474 MiB
Commit graph

9107 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Weblate
14e024b17f Merge branch 'origin/develop' into Weblate. 2021-07-14 10:44:59 +00:00
Phuc D**
769c91387c Translated using Weblate (Vietnamese) 
Currently translated at 10.0% (307 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/vi/
 2021-07-14 10:44:48 +00:00
Robin Townsend
d568e92e06 Merge branch 'develop' into e2ee-history-visibility 2021-07-13 23:07:11 -04:00
Paulo Pinto
45a265a59a Undo changes to translation files other than en_EN 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-13 18:24:45 +01: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
Paulo Pinto
7a8400e5c7 Standardise spelling and casing of homeserver 
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