Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,358 Commits 206 Branches 552 Tags 519 MiB
4c82f161c3
Commit Graph

35358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint 2021-07-20 11:23:36 +01:00
Germain Souquet
596fb774e3 Remove sdk.getComponent instructions 2021-07-20 12:22:32 +02:00
Michael Telatynski
b94886a291 i18n irc and fix lint from merge conflict 2021-07-20 11:18:27 +01:00
Weblate
1c6aa25070 Merge branch 'origin/develop' into Weblate. 2021-07-20 10:16:58 +00:00
J. Ryan Stinnett
364bee9ebd
Merge pull request #6414 from matrix-org/gsouquet/fix-jsx-coma 
Remove unwanted coma in EventTile
 2021-07-20 11:16:54 +01:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Germain Souquet
e38682d75c Remove unwanted coma in EventTile 2021-07-20 12:05:18 +02:00
Michael Telatynski
9fe9534e01 fix three lints 2021-07-20 10:33:52 +01:00
Weblate
e3897fb978 Merge branch 'origin/develop' into Weblate. 2021-07-20 09:22:50 +00:00
René-Maximilian Malsky
96ab4fd022 Translated using Weblate (German) 
Currently translated at 99.0% (3013 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-20 09:22:50 +00:00
Germain
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635 2021-07-20 10:22:41 +01:00
Germain Souquet
dd65d47fba lint fix 2021-07-20 11:12:17 +02:00
Michael Telatynski
848b83015d not sure how these happened :/ 2021-07-20 09:37:54 +01:00
Michael Telatynski
e6869797d7 remove unused prop 2021-07-20 09:27:32 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Michael Telatynski
53b0ef20f4 Update eslint-plugin-matrix-org 2021-07-20 09:15:25 +01:00
Weblate
6e0d8c4616 Merge branch 'origin/develop' into Weblate. 2021-07-20 08:11:41 +00:00
XoseM
7033d160f1 Translated using Weblate (Galician) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-20 08:11:41 +00:00
Jeff Huang
734b44ebdb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-20 08:11:39 +00:00
libexus
3f3ffbb616 Translated using Weblate (German) 
Currently translated at 99.1% (3014 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-07-20 08:11:37 +00:00
Michael Telatynski
e11e17eb85
Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014 2021-07-20 09:11:28 +01:00
Germain Souquet
fdd98bbf3f linter fix 2021-07-20 09:55:26 +02:00
Germain Souquet
bb03fd90c8 Merge branch 'develop' into gsouqet/ts-migration-1 2021-07-20 09:02:48 +02:00
Šimon Brandner
5db20d9431
Fix placeholder centering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 08:54:32 +02:00
Robin Townsend
e9963cd22c Make emoji skins type more specific 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 21:57:03 -04:00
Robin Townsend
5614ef1675 Rename some variables since their purpose has changed 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 21:54:25 -04:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Robin Townsend
f8a922eaa1 Apply code review suggestions 
including filling in gaps in emoji shortcode coverage.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 15:09:15 -04:00
Weblate
5ff5b9f45e Merge branch 'origin/develop' into Weblate. 2021-07-19 16:56:29 +00:00
Michael Telatynski
b6feaf74bc
Merge pull request #6407 from robintown/uppercase-avatar-placeholders 2021-07-19 17:56:25 +01:00
Robin Townsend
b36c748940 Fix avatar placeholders not getting capitalized 
Regressed by 096d0a7d12.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 12:48:44 -04:00
Weblate
310c7807a1 Merge branch 'origin/develop' into Weblate. 2021-07-19 16:24:11 +00:00
Travis Ralston
4856559661
Merge pull request #6406 from matrix-org/travis/notifications-ui-order 
Revert order of notification setting radios
 2021-07-19 10:24:06 -06:00
Travis Ralston
6862d97961 APPEASE THY JSON 2021-07-19 10:18:15 -06:00
Travis Ralston
b31043b5eb Revert order of notification setting radios 
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
 2021-07-19 10:15:42 -06:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
Weblate
5ba54ea3da Merge branch 'origin/develop' into Weblate. 2021-07-19 15:16:43 +00:00
RiotRobot
676d2aa187 Resetting package fields for development 2021-07-19 16:16:18 +01:00
RiotRobot
13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot
e7ad33db0f v3.26.0 2021-07-19 16:00:26 +01:00
RiotRobot
4d11d5d5ea Prepare changelog for v3.26.0 2021-07-19 16:00:25 +01:00
Weblate
3f75e9f224 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:58:45 +00:00
Michael Telatynski
a3e5d76064
Merge pull request #6397 from matrix-org/t3chguy/fix/18040 
Respect compound emojis in default avatar initial generation
 2021-07-19 15:58:40 +01:00
RiotRobot
3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +01:00
Dariusz Niemczyk
5acc7fe8d4
Make errorText properly optional instead of null 2021-07-19 16:49:39 +02:00
Weblate
0c6d3563e1 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:34:24 +00:00
David Baker
96ddfefc03
Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org 
Update eslint-plugin-matrix-org
 2021-07-19 15:34:21 +01:00
Dariusz Niemczyk
9e9992078b
Update src/@types/global.d.ts 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-19 16:34:07 +02:00
Dariusz Niemczyk
97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-19 16:28:30 +02:00
Dariusz Niemczyk
c2394b9161
Fix styling comments 2021-07-19 16:27:39 +02:00