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

30038 commits

This branch
This branch
All branches
Author SHA1 Message Date
schwukas
de7f2ab2e0 Translated using Weblate (German) 
Currently translated at 99.9% (2701 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-12-07 10:18:47 +00:00
J. Ryan Stinnett
d967f01055
Merge pull request #5471 from matrix-org/jryans/rm-temp-test-sl 
Remove old app test script path
 2020-12-07 10:18:31 +00:00
Simon Merrick
b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
Simon Merrick
5544ee6408 extract alias handling to separate function 2020-12-06 23:29:11 +13:00
Lukas
a856484139 Fix typos in some strings 
This commit fixes some typos that I've stumbled upon.
 2020-12-06 10:32:52 +01:00
Aaron Raimist
32f7e3552c
Remove globally defined flex and set just for group queries 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-05 21:56:17 -06:00
Aaron Raimist
3ec9d93cb0 Merge branch 'develop' into searchbox-fix-width 2020-12-05 19:53:08 -06:00
dependabot[bot]
58eaccbba8
Bump highlight.js from 10.1.2 to 10.4.1 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-12-04 17:35:40 +00:00
Weblate
7bc766e33c Merge branch 'origin/develop' into Weblate. 2020-12-04 15:13:58 +00:00
Priit Jõerüüt
0f1f3d4338 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2701 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-12-04 15:13:58 +00:00
Besnik Bleta
5acb81aa44 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2694 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-12-04 15:13:53 +00:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
J. Ryan Stinnett
c63c8540f1 Remove old app test script path 
Now that https://github.com/matrix-org/pipelines/pull/112 has merged, we no
longer need to support this old path for launching app-level tests.
 2020-12-04 11:05:05 +00:00
David Baker
72f858b5bb Empty commit 
as I don't see any other way to make netlify retry
 2020-12-03 19:28:37 +00:00
David Baker
6222ae07ac Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 19:05:21 +00:00
Weblate
fc992e99e1 Merge branch 'origin/develop' into Weblate. 2020-12-03 19:00:10 +00:00
David Baker
0154c5aef1
Merge pull request #5469 from matrix-org/dbkr/fetchdep_netlify 
Add support for Netlify to fetchdep script
 2020-12-03 19:00:03 +00:00
David Baker
c853085e29 Add support for Netlify to fetchdep script 
and remove support for Jenkins
 2020-12-03 18:40:33 +00:00
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
Weblate
347365db6a Merge branch 'origin/develop' into Weblate. 2020-12-03 16:41:32 +00:00
J. Ryan Stinnett
624e43823e
Merge pull request #5467 from matrix-org/jryans/netlify 
Nest other layers inside on automation
 2020-12-03 16:41:24 +00:00
J. Ryan Stinnett
883d5d96a7 Nest other layers inside on automation 
This changes the nesting style because some CI / CD systems do not allow moving
to a directory above the checkout for the primary repo (`react-sdk` in this
case).

Part of https://github.com/vector-im/element-web/issues/12624
 2020-12-03 16:21:40 +00:00
Weblate
2102f4c4d7 Merge branch 'origin/develop' into Weblate. 2020-12-03 16:04:38 +00:00
J. Ryan Stinnett
3dfa535c8c
Merge pull request #5466 from matrix-org/jryans/rebrand-ci 
Rebrand various CI scripts and modules
 2020-12-03 16:04:30 +00:00
Weblate
f9426a69c9 Merge branch 'origin/develop' into Weblate. 2020-12-03 15:50:55 +00:00
Hivaa
52ec76158f Translated using Weblate (Persian) 
Currently translated at 7.2% (197 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2020-12-03 15:50:55 +00:00
Travis Ralston
af49030b2f
Merge pull request #5462 from matrix-org/travis/widget-sanity-2 
Add more widget sanity checking
 2020-12-03 08:50:46 -07:00
Weblate
09bc38bb65 Merge branch 'origin/develop' into Weblate. 2020-12-03 15:20:24 +00:00
Weblate
7d336fc4c3 Merge branch 'origin/develop' into Weblate. 2020-12-03 15:20:20 +00:00
Hivaa
eaa4b17af4 Translated using Weblate (Persian) 
Currently translated at 7.0% (191 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2020-12-03 15:20:20 +00:00
Michael Telatynski
b200211660
Merge pull request #5465 from matrix-org/t3chguy/socials 
Fix React complaining about unknown DOM props
 2020-12-03 15:20:16 +00:00
LinAGKar
fb96cbbba5 Translated using Weblate (Swedish) 
Currently translated at 97.1% (2624 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2020-12-03 15:20:12 +00:00
Michael Telatynski
1e80c936c4
Merge pull request #5464 from matrix-org/t3chguy/fix/15882 
Jump to home page when leaving a room
 2020-12-03 15:19:58 +00:00
J. Ryan Stinnett
a6e69db8f5 Rebrand E2E test Docker image 2020-12-03 14:56:24 +00:00
J. Ryan Stinnett
cdc57cf1f5 Add temporary symlink for pipeline 2020-12-03 13:58:25 +00:00
J. Ryan Stinnett
1fda735222 Rebrand various CI scripts and modules 
This replaces Riot with Element in various CI scripts, modules, parameters, etc.
This _should_ be the last major rebranding pass (hopefully).

Fixes https://github.com/vector-im/element-web/issues/14894
 2020-12-03 13:56:27 +00:00
Michael Telatynski
1afece9a14 Fix React complaining about unknown DOM props 2020-12-03 12:20:48 +00:00
Michael Telatynski
e4b929c6f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882 2020-12-03 11:42:47 +00:00
Weblate
7a54e91c65 Merge branch 'origin/develop' into Weblate. 2020-12-03 11:42:44 +00:00
Priit Jõerüüt
44954ad084 Translated using Weblate (Estonian) 
Currently translated at 99.1% (2679 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-12-03 11:42:44 +00:00
XoseM
0b94e7629d Translated using Weblate (Galician) 
Currently translated at 100.0% (2701 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-12-03 11:42:42 +00:00
Jeff Huang
7d936dea92 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2701 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-12-03 11:42:36 +00:00
Marcelo Filho
6772f30b51 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2701 of 2701 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-12-03 11:42:31 +00:00
Michael Telatynski
675a4b0816
Merge pull request #5463 from matrix-org/t3chguy/socials 
Fix SSO buttons for Social Logins
 2020-12-03 11:42:16 +00:00
Michael Telatynski
f432d4e394 delint 2020-12-03 11:31:14 +00:00
Michael Telatynski
3223b00028 Jump to home page when leaving a room 
so that you don't get thrown into a room you may be ignoring on purpose
 2020-12-03 11:15:55 +00:00
Michael Telatynski
0fd9b55b95 Fix SSO buttons for Social Logins 2020-12-03 11:08:16 +00:00
Travis Ralston
d38a6ad1be Add more widget sanity checking 
This is for https://github.com/vector-im/element-web/issues/15705

https://github.com/matrix-org/matrix-react-sdk/pull/5459 was unable to track down all the instances of where the issue happens, so this commit tries to do a more complete job.

Specifically, this replaces the getRoomId() function given widgets cannot reliably be referenced by widget ID in this way, and the store has been updated to handle a more unique widget ID for the store (just in case).

Further sanity checking has also been added to ensure that we are at least returning a valid result.
 2020-12-02 12:20:59 -07:00
Weblate
f7d45c38aa Merge branch 'origin/develop' into Weblate. 2020-12-02 15:48:58 +00:00
LinAGKar
5787915cb5 Translated using Weblate (Swedish) 
Currently translated at 97.4% (2633 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2020-12-02 15:48:58 +00:00