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
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
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
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
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
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
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
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
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
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
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
45dc9f697d
Merge branch 'origin/develop' into Weblate.
2020-12-02 13:22:07 +00:00
5c6b040983
Translated using Weblate (French)
...
Currently translated at 86.5% (2338 of 2702 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2020-12-02 13:22:07 +00:00
80e7aa7fe6
Merge pull request #5460 from matrix-org/dbkr/something_something_dark_theme
...
Fix VoIP call plinth on dark theme
2020-12-02 13:21:56 +00:00
4a503fb32e
Fix VoIP call plinth on dark theme
...
Fixes https://github.com/vector-im/element-web/issues/15873
2020-12-02 12:14:41 +00:00
04001e22f9
Merge branch 'origin/develop' into Weblate.
2020-12-01 20:40:33 +00:00
89eaa9654f
Translated using Weblate (Arabic)
...
Currently translated at 53.9% (1458 of 2702 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ar/
2020-12-01 20:40:32 +00:00
58ed858f40
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 83.2% (2250 of 2702 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2020-12-01 20:40:23 +00:00
3a3e42e439
Translated using Weblate (Russian)
...
Currently translated at 88.1% (2383 of 2702 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2020-12-01 20:40:20 +00:00
3b9a1d90af
Merge pull request #5459 from matrix-org/travis/pinned-fixes
...
Add sanity checking around widget pinning
2020-12-01 13:40:09 -07:00
5df6932051
Add various amounts of sanity checking for widget pinning
...
This should also help https://github.com/vector-im/element-web/issues/15705 by either implicitly fixing the problem, causing chaos as described in the issue, or by forcing a crash to identify the problem more easily.
2020-12-01 13:19:51 -07:00
bd1de8d45b
Require a room ID for WidgetStore's pinned widget contracts
...
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.
Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
2020-12-01 13:05:48 -07:00
d8e46c7797
Merge remote-tracking branch 'origin/t3chguy/socials' into t3chguy/socials
...
# Conflicts:
# src/i18n/strings/en_EN.json
2020-12-01 16:39:51 +00:00
e0b68441bc
i18n
2020-12-01 16:39:26 +00:00
eb25c39318
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
...
Conflicts:
src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
ba542f291b
Merge branch 'develop' into t3chguy/socials
2020-12-01 15:50:07 +00:00
26e1cdb82c
Update i18n
2020-12-01 12:04:41 +00:00
f6532859fd
Merge branch 'origin/develop' into Weblate.
2020-11-30 20:43:09 +00:00
2d74bb0dcc
Merge pull request #5457 from CodingAnonymous/patch-1
...
Update i18n for Appearance User Settings
2020-11-30 13:43:01 -07:00
9b6f93da5f
Update i18n
2020-11-30 13:42:29 -07:00
b1b0e93d5e
Update i18n for Appearance User Settings
...
The variable has to be added to the i18n files as well (I don't know how to do that)
2020-11-30 21:33:52 +01:00
8a0c1248cb
Merge branch 'origin/develop' into Weblate.
2020-11-30 16:20:53 +00:00
f2c79c1e8c
Translated using Weblate (Russian)
...
Currently translated at 87.9% (2376 of 2702 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2020-11-30 16:20:53 +00:00
9f42d3e549
Merge pull request #5455 from matrix-org/dbkr/answered_elsewhere
...
Only show 'answered elsewhere' if we tried to answer too
2020-11-30 16:20:35 +00:00
3a3775b523
Only show 'answered elsewhere' if we tried to answer too
...
and don't play the hangup tone
Fixes https://github.com/vector-im/element-web/issues/15735
2020-11-30 15:17:20 +00:00
909b0af934
Merge branch 'origin/develop' into Weblate.
2020-11-30 09:49:12 +00:00
J. Ryan Stinnett