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

29919 commits

Author SHA1 Message Date
Travis Ralston
1f1693cb09
Merge pull request #6781 from SimonBrandner/feature/media-handling 
Improve `MatrixCall` media handling
 2021-09-14 14:40:57 -06:00
Weblate
2e476db30c Merge branch 'origin/develop' into Weblate. 2021-09-14 19:36:39 +00:00
Travis Ralston
34ce61862d
Merge pull request #6782 from SimonBrandner/fix/screensharing-dialog 
Don't show screensharing dialog on web
 2021-09-14 13:36:35 -06:00
Weblate
6b55ba8afb Merge branch 'origin/develop' into Weblate. 2021-09-14 19:33:42 +00:00
Priit Jõerüüt
f56afe219c Translated using Weblate (Estonian) 
Currently translated at 99.9% (3161 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-14 19:33:41 +00:00
Travis Ralston
7b9dc09cd4
Merge pull request #6784 from SimonBrandner/fix/end-of-line-emoji 
Replace plain text emoji at the end of a line
 2021-09-14 13:33:34 -06:00
Weblate
bffd3b4f13 Merge branch 'origin/develop' into Weblate. 2021-09-14 19:10:12 +00:00
Travis Ralston
18d406421b
Merge pull request #6806 from SimonBrandner/task/remove-message_send_failed 
Remove `message_send_failed` dispatch
 2021-09-14 13:10:07 -06:00
Weblate
fc1da27d49 Merge branch 'origin/develop' into Weblate. 2021-09-14 19:07:19 +00:00
Travis Ralston
333418232d
Merge pull request #6808 from SimonBrandner/task/context_menus-ts 
Convert `/context_menus` and `/avatars` to TS
 2021-09-14 13:07:15 -06:00
Šimon Brandner
6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed 2021-09-14 19:31:12 +02:00
Šimon Brandner
67d328c7fd
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 19:30:52 +02:00
Weblate
1059643d3e Merge branch 'origin/develop' into Weblate. 2021-09-14 17:28:32 +00:00
Eric Eastwood
fddc20dd89
Remove replies from hidden events when shown with messages.ViewSourceEvent (#6796) 
As discovered in https://github.com/vector-im/element-web/issues/10391#is

Previously, if you turned on the `showHiddenEventsInTimeline` labs flag, edit (`m.replace`) events
that also have a `m.in_reply_to` field, will show the reply in the timeline.

ex.
```
{
  "type": "m.room.message",
  "content": {
    "body": " * foo",
    "msgtype": "m.text",
    "m.new_content": {
      "body": "foo",
      "msgtype": "m.text"
    },
    "m.relates_to": {
      "rel_type": "m.replace",
      "event_id": "$yvuev9bF2nLRf8fscG55njpVjY3FHJzWgZ4BKI9_0eg",
      "m.in_reply_to": {
        "event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
      }
    }
  }
}
```
 2021-09-14 12:28:28 -05:00
Šimon Brandner
0f55fde03a
Convert StatusMessageContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:19 +02:00
Šimon Brandner
11e61075b4
Convert GenericTextContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:18 +02:00
Šimon Brandner
8e4529d6ce
Convert GenericElementContextMenu to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:18 +02:00
Šimon Brandner
5baaa6b77e
Convert MemberStatusMessageAvatar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 19:23:12 +02:00
James Salter
c2192a78bc More lint 2021-09-14 18:16:48 +01:00
James Salter
6c1dea09e8 lint 2021-09-14 17:46:56 +01:00
James Salter
7344a177e3 Fix tests, swallow errors 2021-09-14 17:35:32 +01:00
Šimon Brandner
db25147a19
Remove message_send_failed as it was unused 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 17:49:18 +02:00
Šimon Brandner
2f6239770a
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 17:32:00 +02:00
Šimon Brandner
b26bec949d
Use React.Children.count() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 17:19:57 +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
c786ef9f69 Fix space keyboard shortcuts conflicting with native zoom shortcuts 2021-09-14 16:02:14 +01:00
Weblate
43fd8fa9f6 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:56:25 +00:00
Michael Telatynski
9928079b82
Merge pull request #6797 from matrix-org/t3chguy/fix/19025 2021-09-14 15:56:20 +01:00
Weblate
9e73d8c976 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:53:07 +00:00
Michael Telatynski
6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Weblate
b0cb05bfe8 Merge branch 'origin/develop' into Weblate. 2021-09-14 14:52:45 +00:00
sr093906
d875e429cc Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-14 14:52:45 +00:00
Michael Telatynski
919270ff0c
Update src/stores/SpaceStore.tsx 
Co-authored-by: Travis Ralston <travisr@matrix.org>
 2021-09-14 15:50:51 +01:00
James Salter
a43f5507a3 Use a UUID instead of hashed user ID for tracking 
Generate a UUID and save it to account data for cross device tracking.
 2021-09-14 15:30:42 +01:00
Michael Telatynski
60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Michael Telatynski
f59baf1efb Tidy some types 2021-09-14 14:41:55 +01:00
Michael Telatynski
5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +01:00
Michael Telatynski
e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski
e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Weblate
3191fb51ac Merge branch 'origin/develop' into Weblate. 2021-09-14 13:07:47 +00:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Weblate
40280c995c Merge branch 'origin/develop' into Weblate. 2021-09-14 12:56:53 +00:00
Dariusz Niemczyk
74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012 
Fix emoji picker and stickerpicker not appearing correctly when opened
 2021-09-14 14:56:49 +02:00
Dariusz Niemczyk
60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +02:00
Michael Telatynski
87c9551507 Fix edge cases around joining new room which does not belong to active space 2021-09-14 12:49:18 +01:00
Weblate
7bdae36a4c Merge branch 'origin/develop' into Weblate. 2021-09-14 10:48:31 +00:00
Michael Telatynski
3c44969645 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-09-14 11:42:51 +01:00
Weblate
5a57406441 Merge branch 'origin/develop' into Weblate. 2021-09-14 08:07:41 +00:00
Michael Telatynski
be58a5e623
Merge pull request #6790 from matrix-org/t3chguy/fix/19007 
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
 2021-09-14 09:07:37 +01:00
Weblate
e2f1846a10 Merge branch 'origin/develop' into Weblate. 2021-09-14 08:06:59 +00:00
random
d3b175f1df Translated using Weblate (Italian) 
Currently translated at 99.9% (3161 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-14 08:06:59 +00:00
jelv
71462b49df Translated using Weblate (Dutch) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-14 08:06:57 +00:00
Michael Telatynski
73a2225b10
Merge pull request #6792 from matrix-org/t3chguy/fix/19005 
Fix automatic field population in space create menu not validating
 2021-09-14 09:06:49 +01:00
Šimon Brandner
c460d56e50
Remove unused import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-14 06:37:08 +02:00
Šimon Brandner
eae45d8a7e
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 06:31:43 +02:00
waclaw66
152f946eed Translated using Weblate (Czech) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-09-14 02:57:52 +00:00
Kaede
ec6b61e623 Translated using Weblate (Japanese) 
Currently translated at 71.2% (2254 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2021-09-14 02:57:49 +00:00
Dariusz Niemczyk
ceafa83392
Fix invalid ContextualMenu positions 2021-09-13 22:11:58 +02:00
Dariusz Niemczyk
e913f03a67
Add missing types 2021-09-13 22:11:43 +02:00
Šimon Brandner
8a86407a4c
Use MatrixClientContext 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:28:52 +02:00
Šimon Brandner
807792dc69
Revert some changes that are unncessary due to js-sdk changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:24:53 +02:00
Šimon Brandner
44141bf048
Iterate PR first round 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:23:37 +02:00
Michael Telatynski
4a470e4341 Fix automatic field population in space create menu not validating 2021-09-13 17:15:52 +01:00
Šimon Brandner
e4cf7314f5
Fix init value 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-13 18:14:55 +02:00
Michael Telatynski
b6b099f6c8 Fix broken edge case with public space creation with no alias 2021-09-13 16:27:46 +01:00
Weblate
46f669737a Merge branch 'origin/develop' into Weblate. 2021-09-13 13:11:40 +00:00
Michael Telatynski
d75820a491 Hide mute/unmute button in UserInfo for Spaces as it makes no sense 2021-09-13 13:49:24 +01:00
Priit Jõerüüt
d83d5563de Translated using Weblate (Estonian) 
Currently translated at 99.9% (3160 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-13 12:02:33 +00:00
Besnik Bleta
cd7ab56cb5 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3154 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-13 12:02:30 +00:00
XoseM
5442f7483a Translated using Weblate (Galician) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-09-13 12:02:26 +00:00
random
d9235108fd Translated using Weblate (Italian) 
Currently translated at 99.9% (3161 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-13 12:02:21 +00:00
Ihor Hordiichuk
d4c3aeebb8 Translated using Weblate (Ukrainian) 
Currently translated at 54.7% (1732 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2021-09-13 12:02:18 +00:00
Jeff Huang
20ab0067ff Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-09-13 12:02:13 +00:00
sr093906
13b2c70947 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-09-13 12:02:09 +00:00
LinAGKar
bfd3d9d8ec Translated using Weblate (Swedish) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-09-13 12:02:06 +00:00
Nikita Epifanov
588a6d1c41 Translated using Weblate (Russian) 
Currently translated at 98.2% (3107 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-09-13 12:02:00 +00:00
jelv
3d14015404 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-09-13 12:01:45 +00:00
Szimszon
574ec26ee8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3162 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-09-13 12:01:41 +00:00
iaiz
8b3ff8096d Translated using Weblate (Spanish) 
Currently translated at 99.9% (3160 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-13 12:01:37 +00:00
libexus
e49aac9802 Translated using Weblate (German) 
Currently translated at 99.1% (3135 of 3162 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-09-13 12:01:32 +00:00
Šimon Brandner
1590fe32cf
Convert RoomStatusBar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 10:15:34 +02:00
Šimon Brandner
e48407a1d6
Convert ViewSource to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 10:15:34 +02:00
Šimon Brandner
9a7e2b31d4
Convert IndicatorScrollbar to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 10:15:28 +02:00
Šimon Brandner
ff7e32cdd1
Convert UserView to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 09:24:55 +02:00
Šimon Brandner
a6a56b455b
Convert GenericErrorPage to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:56:29 +02:00
Šimon Brandner
e882576f86
Convert EmbeddedPage to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:56:00 +02:00
Šimon Brandner
716aba2a0e
Convert MainSplit to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:40:56 +02:00
Šimon Brandner
4673e1aa49
Convert SearchBox to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-12 08:24:17 +02:00
Aaron Raimist
354d0cfba4
Redirect from /#/welcome to /#/home if already logged in 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-09-11 10:52:33 -05:00
Šimon Brandner
f4ca073b4a
Don't auto replace if not enabled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 10:26:15 +02:00
Šimon Brandner
fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 10:21:56 +02:00
Šimon Brandner
0defc4b14b
Don't show screensharing dialog on web 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 09:03:04 +02:00
Šimon Brandner
4c8c64a1cb
Use MediaHandler 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-11 08:19:41 +02:00
Weblate
942dabc199 Merge branch 'origin/develop' into Weblate. 2021-09-10 18:32:08 +00: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
Weblate
92082cb92b Merge branch 'origin/develop' into Weblate. 2021-09-10 15:14:29 +00:00
Germain
1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code 2021-09-10 16:14:24 +01:00
Weblate
02b3b7be51 Merge branch 'origin/develop' into Weblate. 2021-09-10 14:42:10 +00:00
Priit Jõerüüt
ae9726abb6 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3154 of 3157 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-10 14:42:10 +00:00
Besnik Bleta
bb6ccfa65a Translated using Weblate (Albanian) 
Currently translated at 99.7% (3149 of 3157 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-09-10 14:42:07 +00:00