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

26380 commits

Author SHA1 Message Date
Šimon Brandner
262fc40afb
Move comment to the correct place 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-12 07:12:00 +02:00
Travis Ralston
9842bcde50
Merge pull request #6010 from ndarilek/develop 
Catch another instance of unlabeled avatars.
 2021-05-11 21:44:15 -06: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
b1cb2b1d93 Fix bad merge 2021-05-11 10:19:09 -06:00
Travis Ralston
d8e3458c55 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/resample2 2021-05-11 10:15:37 -06:00
Travis Ralston
92e30f0607 Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev 2021-05-11 10:13:21 -06:00
Travis Ralston
d1cfde6f12
Merge pull request #5989 from matrix-org/travis/voicemessages/safari 
Support voice messages on Safari
 2021-05-11 10:12:31 -06:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Weblate
350b5e37d3 Merge branch 'origin/develop' into Weblate. 2021-05-11 15:26:43 +00:00
Michael Telatynski
bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Nolan Darilek
006aa2d5b9 Catch another instance of unlabeled avatars. 
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
 2021-05-11 09:39:06 -05:00
Michael Telatynski
6ece4ef2ab i18n 2021-05-11 14:08:09 +01:00
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Michael Telatynski
df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-05-11 14:07:47 +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
2b2e74b65e
Merge pull request #6006 from matrix-org/t3chguy/fix/17227 
Allow user to progress through space creation & setup using Enter
 2021-05-11 12:02:14 +01:00
c-cal
5b9b878808 Translated using Weblate (French) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-11 10:34:32 +00:00
Germain Souquet
da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:13:13 +02:00
Michael Telatynski
23001cb10d remove unused import 2021-05-11 10:11:51 +01:00
Germain Souquet
be236309c5 use arrayFastClone instead of slice 2021-05-11 10:08:57 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
J. Ryan Stinnett
f3f6bf7c8f
Merge pull request #6007 from matrix-org/jryans/cheerio-upgrade 
Upgrade `cheerio` and resolve type errors
 2021-05-11 09:35:48 +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
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 08:08:02 +02:00
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Šimon Brandner
bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state 2021-05-11 07:38:08 +02:00
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston
7ac12d14af
Merge pull request #5865 from jaiwanth-v/edit-slashcommands 
Add slash commands support to edit message composer
 2021-05-10 20:16:44 -06:00
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Travis Ralston
379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
J. Ryan Stinnett
7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Germain Souquet
c96f11db7d appease linter 2021-05-10 17:22:33 +01:00
J. Ryan Stinnett
9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01: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
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name 
Show device ID in UserInfo when there is no device name
 2021-05-10 16:19:56 +01:00
J. Ryan Stinnett
f41fc7e46c Upgrade cheerio and resolve type errors 
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
 2021-05-10 16:10:39 +01:00
Michael Telatynski
c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
Germain Souquet
d0d2907a07 Decrypt events ahead of storing them in the index 2021-05-10 15:19:46 +01:00
Michael Telatynski
3a75eb1226 Fix handling of enter/return in space creation menu 2021-05-10 14:39:10 +01:00
J. Ryan Stinnett
4311d91372
Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta 
Don't use the event's metadata to calc the scale of an image
 2021-05-10 13:06:08 +01:00
J. Ryan Stinnett
45acf70b00
Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype 
Adjust MIME type of upload confirmation if needed
 2021-05-10 10:21:35 +01:00
Jaiwanth
1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4 Save edited state when switching rooms 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-09 13:42:01 +05:30
Besnik Bleta
7bd06d5d3a Translated using Weblate (Albanian) 
Currently translated at 99.5% (2919 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-05-08 08:35:06 +00:00
XoseM
91e05b9152 Translated using Weblate (Galician) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-05-08 08:35:03 +00:00
Šimon Brandner
4b49281aaa Translated using Weblate (Czech) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-08 08:34:59 +00:00
waclaw66
60091a663f Translated using Weblate (Czech) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-05-08 08:34:59 +00:00
random
ee86a87ba2 Translated using Weblate (Italian) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-05-08 08:34:57 +00:00
sebmod78
0faaf3ce82 Translated using Weblate (Polish) 
Currently translated at 71.7% (2103 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-05-08 08:34:54 +00:00
Jeff Huang
39e754e41f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-05-08 08:34:52 +00:00
LinAGKar
b04109df2f Translated using Weblate (Swedish) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-05-08 08:34:48 +00:00
jelv
42d6032d64 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-05-08 08:34:45 +00:00
Szimszon
a7744c5153 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-05-08 08:34:42 +00:00
Thibault Martin
28fbe32ba7 Translated using Weblate (French) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-05-08 08:34:38 +00:00
iaiz
d27b4ee9ce Translated using Weblate (Spanish) 
Currently translated at 100.0% (2931 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-05-08 08:34:35 +00:00
libexus
f4052fe487 Translated using Weblate (German) 
Currently translated at 99.5% (2919 of 2931 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-05-08 08:34:31 +00:00
Travis Ralston
389e0b8e8e wrong const 2021-05-07 21:11:31 -06:00
Travis Ralston
90798c2c8e copy/paste will end me one day 2021-05-07 21:09:10 -06:00
Travis Ralston
b007ea81b2 Rescale and smooth playback waveform to better match expectation 2021-05-07 21:06:07 -06:00
Travis Ralston
aac1f4330d Remove "in development" flag from voice messages 2021-05-07 19:36:29 -06:00
Aaron Raimist
fa307ee14c
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-05-07 18:41:47 -05:00
Robin Townsend
119c14c3f9 Forbid redaction of encryption events 
Redacting m.room.encryption events will leave the room in a broken
state, and so we shouldn't allow the user to do this.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-07 12:49:37 -04:00
Germain Souquet
6e3f8d6a0a Decrypt last events first to avoid shifts when scrolling up 2021-05-07 15:26:16 +01:00
Germain Souquet
fa30285c6b Decrypt messages on when used on a timeline 2021-05-07 15:16:54 +01:00
Ayush PS
32edbc155f Merge remote-tracking branch 'origin/develop' into err 2021-05-07 19:16:00 +05:30
Michael Telatynski
74bcb921ff
Merge pull request #5990 from matrix-org/t3chguy/ts/parse5 
Add dev dependency for parse5 typings
 2021-05-07 13:49:13 +01:00
Germain Souquet
5bd4120920 Decrypt breadcrumb events for better UX 2021-05-07 12:58:37 +01: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
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
Michael Telatynski
6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176 
Iterate Spaces admin UX around room management
 2021-05-07 11:47:45 +01:00
Germain Souquet
17099c656b Call renamed room::decryptAllEvents method 2021-05-07 11:25:25 +01:00
Michael Telatynski
f0e61e6286 short circuit automatic switch to related space behaviour and fix tests 2021-05-07 11:08:18 +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
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs 
Guard all isSpaceRoom calls behind the labs flag
 2021-05-07 10:28:14 +01:00
Michael Telatynski
db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01:00
Travis Ralston
65f591b69b Make the tests happier 
Here we just override the workers because we're not expecting to be able to test them this way. The code paths involved shouldn't be touched.
 2021-05-06 22:08:00 -06:00
Travis Ralston
f65773ef95 Appease the linter 2021-05-06 21:49:53 -06:00
Travis Ralston
b08e47bfe1 Support compatibility points for Safari 
Tested on MacOS Big Sur, Safari 14.0.3
 2021-05-06 21:43:17 -06:00
Travis Ralston
b61fe2f8e6 Improve error recovery when starting a recording 
This helps return the microphone access to the user.
 2021-05-06 21:43:17 -06:00
Aaron Raimist
1f2895dbe9 Merge branch 'develop' into blank-device-name 2021-05-06 20:19:49 -05:00
Aaron Raimist
5d7535738a
Show device ID in UserInfo when there is no device name 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-05-06 20:01:53 -05:00
Šimon Brandner
7ad270928a
Simplifie code a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-06 16:41:09 +02:00
Šimon Brandner
bb9803a94e
Don't try to use the event's metadata to calc the scale 
That has lead to https://github.com/vector-im/element-web/issues/17184

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-06 16:40:33 +02:00
J. Ryan Stinnett
06a9577858 Merge remote-tracking branch 'origin/develop' into jryans/upload-preview-mimetype 2021-05-06 14:45:48 +01:00
J. Ryan Stinnett
dc50d27985 Adjust MIME type of upload confirmation if needed 
This filters the MIME type of uploaded files to ensure we display safely.
 2021-05-06 14:39:44 +01:00
J. Ryan Stinnett
437f13cf76 Convert UploadConfirmDialog to TSX 2021-05-06 14:11:34 +01:00
J. Ryan Stinnett
6e0c7611c3 Extract blob-safe MIME types 2021-05-06 13:53:27 +01:00