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