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
7bc766e33c
Merge branch 'origin/develop' into Weblate.
2020-12-04 15:13:58 +00:00
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
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
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
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
72f858b5bb
Empty commit
...
as I don't see any other way to make netlify retry
2020-12-03 19:28:37 +00:00
6222ae07ac
Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui
2020-12-03 19:05:21 +00:00
fc992e99e1
Merge branch 'origin/develop' into Weblate.
2020-12-03 19:00:10 +00:00
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
c853085e29
Add support for Netlify to fetchdep script
...
and remove support for Jenkins
2020-12-03 18:40:33 +00:00
6916b5d7c6
Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui
2020-12-03 17:57:22 +00:00
347365db6a
Merge branch 'origin/develop' into Weblate.
2020-12-03 16:41:32 +00:00
624e43823e
Merge pull request #5467 from matrix-org/jryans/netlify
...
Nest other layers inside on automation
2020-12-03 16:41:24 +00:00
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
2102f4c4d7
Merge branch 'origin/develop' into Weblate.
2020-12-03 16:04:38 +00:00
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
f9426a69c9
Merge branch 'origin/develop' into Weblate.
2020-12-03 15:50:55 +00:00
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
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
09bc38bb65
Merge branch 'origin/develop' into Weblate.
2020-12-03 15:20:24 +00:00
7d336fc4c3
Merge branch 'origin/develop' into Weblate.
2020-12-03 15:20:20 +00:00
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
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
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
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
a6e69db8f5
Rebrand E2E test Docker image
2020-12-03 14:56:24 +00:00
cdc57cf1f5
Add temporary symlink for pipeline
2020-12-03 13:58:25 +00:00
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
1afece9a14
Fix React complaining about unknown DOM props
2020-12-03 12:20:48 +00:00
e4b929c6f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882
2020-12-03 11:42:47 +00:00
7a54e91c65
Merge branch 'origin/develop' into Weblate.
2020-12-03 11:42:44 +00:00
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
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
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
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
675a4b0816
Merge pull request #5463 from matrix-org/t3chguy/socials
...
Fix SSO buttons for Social Logins
2020-12-03 11:42:16 +00:00
f432d4e394
delint
2020-12-03 11:31:14 +00:00
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
0fd9b55b95
Fix SSO buttons for Social Logins
2020-12-03 11:08:16 +00:00
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
f7d45c38aa
Merge branch 'origin/develop' into Weblate.
2020-12-02 15:48:58 +00:00
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
a1159545c4
Merge pull request #5426 from matrix-org/t3chguy/socials
...
Social Login and login delight tweaks
2020-12-02 15:48:48 +00:00
8593845e3d
i18n
2020-12-02 15:12:16 +00:00
3fda7e3f46
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-12-02 15:08:13 +00:00
db354ff888
v3.10.0-rc.1
2020-12-02 14:38:28 +00:00
054dff31d5
Prepare changelog for v3.10.0-rc.1
2020-12-02 14:38:28 +00:00
ed59b50448
Upgrade matrix-js-sdk to 9.3.0-rc.1
2020-12-02 14:25:55 +00:00
2574ba1cfe
Merge pull request #5461 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
...
Translations update from Weblate
2020-12-02 13:41:34 +00:00
dependabot[bot]