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

39250 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaiwanth
edfc8af6cf Apply PR Suggestions 2021-08-13 08:30:50 +05:30
Jaiwanth
d32f945e24 Merge branch 'export-conversations' of https://github.com/jaiwanth-v/matrix-react-sdk into export-conversations 2021-08-13 08:08:39 +05:30
Weblate
b29c35f48c Merge branch 'origin/develop' into Weblate. 2021-08-12 18:19:17 +00:00
David Baker
ecb2d9908d
Merge pull request #6608 from matrix-org/dbkr/kill_persistent_jitsi 
Fix video call persisting when widget removed
 2021-08-12 19:19:12 +01:00
Weblate
a56a0118f8 Merge branch 'origin/develop' into Weblate. 2021-08-12 17:58:10 +00:00
Andrew Morgan
1ad35b1564
Keep number field in focus when pressing dialpad buttons (#6520) 2021-08-12 18:58:06 +01:00
David Baker
3528d87f30 Remove old version 2021-08-12 18:39:11 +01:00
David Baker
657dcaf989 Fix video call persisting when widget removed 
Fixes https://github.com/vector-im/element-web/issues/15703
Type: defect
 2021-08-12 18:36:57 +01:00
James Salter
065a70b63f Add copyright header 2021-08-12 17:46:28 +01:00
Šimon Brandner
c34dedb57b
Fix legacy themes backports 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:20:05 +02:00
Šimon Brandner
25a3a8ddfd
$roomlist-header-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
4604d817c4
$roomlist-filter-active-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
8e610e5947
$dialpad-button-bg-color -> $quinary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
0faedebb92
$roomheader-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:30 +02:00
Šimon Brandner
a3a6f73049
$avatar-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:30 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:18:18 +02:00
Šimon Brandner
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:37 +02:00
Šimon Brandner
57ce895445
$text-primary-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:37 +02:00
Šimon Brandner
79d76d8b49
$base-text-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:36 +02:00
Šimon Brandner
eea3b31993
$bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:36 +02:00
Šimon Brandner
04bb07cdad
$base-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:35 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:34 +02:00
Weblate
f742f6a892 Merge branch 'origin/develop' into Weblate. 2021-08-12 15:09:08 +00:00
James Salter
1a1a76e2d7
Merge pull request #6606 from SimonBrandner/fix/toast-colors 
Fix toast colors
 2021-08-12 16:09:03 +01:00
Michael Telatynski
f2becd9698 Fix e2e test 2021-08-12 15:59:24 +01:00
Travis Ralston
23221ceb2e
Merge pull request #6602 from SimonBrandner/release/fix/correct-button 
[Release] Use the correct button component for the Call View sidebar button
 2021-08-12 08:55:02 -06:00
Weblate
a080ddb1ce Merge branch 'origin/develop' into Weblate. 2021-08-12 14:54:57 +00:00
Travis Ralston
772b8fb3fa
Merge pull request #6593 from SimonBrandner/fix/correct-button 
Use the correct button component for the Call View sidebar button
 2021-08-12 08:54:53 -06:00
Michael Telatynski
4f0ae0a849 Only show spaces blue flashy dot if user is in 0 spaces 2021-08-12 15:54:41 +01:00
Travis Ralston
f99e0d111e
Merge pull request #6607 from SimonBrandner/release/fix/toast-colors 
[Release] Fix toast colors
 2021-08-12 08:54:18 -06:00
Michael Telatynski
0414ea27b8 Iterate PR based on feedback 2021-08-12 15:53:10 +01:00
Weblate
c646965f25 Merge branch 'origin/develop' into Weblate. 2021-08-12 14:35:05 +00:00
Priit Jõerüüt
5c808eaba0 Translated using Weblate (Estonian) 
Currently translated at 97.9% (3078 of 3141 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-08-12 14:35:05 +00:00
Besnik Bleta
300a1b12e7 Translated using Weblate (Albanian) 
Currently translated at 99.7% (3132 of 3141 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-08-12 14:35:02 +00:00
waclaw66
d465d6c9c6 Translated using Weblate (Czech) 
Currently translated at 100.0% (3141 of 3141 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-08-12 14:34:55 +00:00
Tirifto
1f406d646e Translated using Weblate (Esperanto) 
Currently translated at 93.3% (2931 of 3141 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2021-08-12 14:34:50 +00:00
jelv
c259e25f52 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3141 of 3141 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-08-12 14:34:42 +00:00
Šimon Brandner
bf5c94572c
$toast-bg-color -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:34:41 +02:00
Andrew Morgan
adce43600d
Update link to matrix-js-sdk CONTRIBUTING file (#6557) 2021-08-12 15:34:33 +01:00
Šimon Brandner
9249a6e80c
$system-... -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:32:04 +02:00
Šimon Brandner
7ce88c9966
$toast-bg-color -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:20:30 +02:00
Šimon Brandner
aca073f5da
$system-... -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:16:13 +02:00
David Baker
ca207da38f
Merge pull request #6601 from matrix-org/dbkr/allchange_npm 
Use changelog generator from npm
 2021-08-12 15:02:21 +01:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Michael Telatynski
03e3da885d i18n 2021-08-12 12:09:28 +01:00
Michael Telatynski
8ddaa7faf1 i18n 2021-08-12 12:08:57 +01:00
Michael Telatynski
57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/views/spaces/SpacePanel.tsx
 2021-08-12 12:05:55 +01:00
Michael Telatynski
85b1f166e8 post-merge tidy up 2021-08-12 12:03:14 +01:00