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

38956 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
c2036dbd05 Merge branch 'origin/develop' into Weblate. 2021-09-24 14:05:44 +00:00
Germain
79b52f8a22
Merge pull request #6857 from matrix-org/gsouquet/composer-reply-18989 2021-09-24 15:05:40 +01:00
Weblate
13a806ceb1 Merge branch 'origin/develop' into Weblate. 2021-09-24 13:44:12 +00:00
David Baker
d33bc4c0e2
Merge pull request #6860 from matrix-org/dbkr/fix_user_view 
Fix the User View
 2021-09-24 14:44:07 +01:00
David Baker
9f26cca256 Fix the User View 
Extreme confusion between users and members, and presumably we were
passing one as the other and they were similar enough that it
worked.

UserView still makes fake member objects but this at least fixes
the user view in the right panel.

Fixes https://github.com/vector-im/element-web/issues/19158
 2021-09-24 14:35:00 +01:00
Germain Souquet
8348add67f Add MessageActionBar to ThreadView 2021-09-24 14:19:11 +01:00
Weblate
522d16d92e Merge branch 'origin/develop' into Weblate. 2021-09-24 12:27:56 +00:00
Germain
a2917a4a30
Merge pull request #6859 from matrix-org/gsouquet/threads-timestamp-fix 2021-09-24 13:27:50 +01:00
Germain Souquet
bb7319f632 move timestamp to the right in thread's context 2021-09-24 11:44:11 +01:00
Germain Souquet
836e427dc8 Scope editor reset when reply changed for thread view 2021-09-24 11:13:57 +01:00
Weblate
d3b7764e4e Merge branch 'origin/develop' into Weblate. 2021-09-24 10:11:47 +00:00
Priit Jõerüüt
6dbe61de2b Translated using Weblate (Estonian) 
Currently translated at 99.9% (3165 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-09-24 10:11:47 +00:00
random
8694d88177 Translated using Weblate (Italian) 
Currently translated at 99.9% (3165 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2021-09-24 10:11:44 +00:00
Hubert Jasudowicz
5c7f5dae6f Translated using Weblate (Polish) 
Currently translated at 65.6% (2078 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-09-24 10:11:42 +00:00
Wiktor Przybylski
7dbdeacd2b Translated using Weblate (Polish) 
Currently translated at 65.6% (2078 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
 2021-09-24 10:11:42 +00:00
LinAGKar
0c59389ae1 Translated using Weblate (Swedish) 
Currently translated at 100.0% (3166 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2021-09-24 10:11:40 +00:00
Germain
6be12ea47e
Merge pull request #6858 from matrix-org/gsouquet/switch-room-threads-18987 2021-09-24 11:11:33 +01:00
Germain Souquet
82d685e410 Only switch to ThreadPanel when roomId changes 2021-09-24 11:06:07 +01:00
Germain Souquet
070f279ae7 Close thread view when changing room 2021-09-23 14:44:03 +01:00
Germain Souquet
bd599c96a3 Add React lifecycle methods publicity and return types 2021-09-23 14:43:39 +01:00
Germain Souquet
a9f7ab785c Change CIDER state persistence key to cater for threads 
Extending the CIDER state persistence to threads and make sure that SendMessageComposer can restore drafts for specific threads

This also prevents the thread's replyToEvent to leaking in the room composer
 2021-09-23 10:59:33 +01:00
Jaiwanth
f35dae8c94 i18n 2021-09-22 22:22:45 +05:30
Jaiwanth
d1e3d35d40 Change export bundle filename format, light theme for all exports and import jszip after export cta 2021-09-22 22:17:23 +05:30
Weblate
f72320c040 Merge branch 'origin/develop' into Weblate. 2021-09-22 16:23:13 +00:00
Germain
2cd5b731bf
Merge pull request #6851 from matrix-org/gsouquet/timeline-rendering-18719 2021-09-22 17:23:07 +01:00
Weblate
bc8253e2a8 Merge branch 'origin/develop' into Weblate. 2021-09-22 16:23:03 +00:00
Travis Ralston
7cd7cf87e3
Merge pull request #6853 from videogame-hacker/patch/undefined-3pids 
Fix Notifications settings view when threepids is undefined
 2021-09-22 10:22:58 -06:00
Weblate
80bed6b3fd Merge branch 'origin/develop' into Weblate. 2021-09-22 13:56:06 +00:00
David Baker
f69854b274
Merge pull request #6856 from SimonBrandner/fix/soft-crash 
Fix `AppsDrawer` soft crash
 2021-09-22 14:56:00 +01:00
Šimon Brandner
96c16354ca
Fix soft crash 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 15:47:15 +02:00
RiotRobot
a22e2ef874 v3.31.0-rc.2 2021-09-22 14:35:24 +01:00
RiotRobot
672cdf5330 Prepare changelog for v3.31.0-rc.2 2021-09-22 14:35:24 +01:00
David Baker
c5a059d6f3
Merge pull request #6854 from matrix-org/dbkr/fix-18999-rel 
Fix spacing for message composer buttons
 2021-09-22 14:18:30 +01:00
Germain Souquet
9c69869f63 Fix spacing for message composer buttons 2021-09-22 13:43:37 +01:00
Weblate
dd977f0cb1 Merge branch 'origin/develop' into Weblate. 2021-09-22 12:39:37 +00:00
iaiz
8a8b8a156e Translated using Weblate (Spanish) 
Currently translated at 99.7% (3158 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
 2021-09-22 12:39:37 +00:00
David Baker
40dedfa44a
Merge pull request #6852 from matrix-org/gsouquet/fix-18999 
Fix spacing for message composer buttons
 2021-09-22 13:39:28 +01:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
videogame hacker
d323bc4c07 Fix Notifications settings view when threepids is undefined 
Signed-off-by: Charlotte Som <half-kh-hacker@hackery.site>
 2021-09-22 13:17:49 +01:00
Germain Souquet
dc979a33a1 Fix spacing for message composer buttons 2021-09-22 11:55:25 +01:00
Germain Souquet
1265fe6b86 Set comprehensive set of props for thread's MessagePanel 2021-09-22 10:48:24 +01:00
Weblate
d0b5d85460 Merge branch 'origin/develop' into Weblate. 2021-09-22 09:43:25 +00:00
Germain
b13fdb698c
Merge pull request #6743 from SimonBrandner/task/dialogs-ts 2021-09-22 10:43:19 +01:00
Šimon Brandner
4adc900d00
Remove autoFocus 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 10:46:59 +02:00
Šimon Brandner
d3e340e7ce
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 10:42:02 +02:00
Weblate
3196d41b71 Merge branch 'origin/develop' into Weblate. 2021-09-22 07:47:32 +00:00
David Baker
f0bf39a09a
Merge pull request #6850 from SimonBrandner/fix/resizer 
Fix resizers not letting go
 2021-09-22 08:47:27 +01:00
Šimon Brandner
d4665979b8
Fix resizer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-22 08:29:04 +02:00
Weblate
8479dca81f Merge branch 'origin/develop' into Weblate. 2021-09-22 06:17:14 +00:00
XoseM
350f93191a Translated using Weblate (Galician) 
Currently translated at 100.0% (3166 of 3166 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-09-22 06:17:14 +00:00