e896b009f1
Handle manual hs urls better
2020-12-08 10:58:16 +00:00
603a1c8ffb
Fix linter
2020-12-07 15:37:26 -07:00
87dbc82a9f
Merge branch 'feature_confetti#14676' into develop
2020-12-07 15:12:45 -07:00
550a5220d9
Undocumented linter cleanup
2020-12-07 15:12:26 -07:00
2c992c456e
Merge remote-tracking branch 'origin/develop' into feature_confetti#14676
2020-12-07 14:58:56 -07:00
f5ce50a472
Merge pull request #5391 from su-ex/fix-inverted-settings-default
...
Fix inverted settings default value
2020-12-07 14:51:28 -07:00
14600adf66
Merge pull request #5474 from matrix-org/t3chguy/socials
...
Improve usability of the Server Picker Dialog
2020-12-07 20:08:04 +00:00
499f7e8af7
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-12-07 16:08:11 +00:00
d06a00bcce
Improve usability of the Server Picker Dialog
2020-12-07 16:05:41 +00:00
52ada641ba
Merge pull request #5473 from schwukas/fixed-typos
...
Fix typos in some strings
2020-12-07 14:35:30 +00:00
9bb04a857b
Add generated i18n json
2020-12-07 15:21:31 +01:00
07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1
...
Bump highlight.js from 10.1.2 to 10.4.1
2020-12-07 12:58:21 +00:00
7d41604569
Reset matrix-js-sdk back to develop branch
2020-12-07 12:33:18 +00:00
6360bc7a01
Merge branch 'master' into develop
2020-12-07 12:32:20 +00:00
fefe84d101
v3.10.0
2020-12-07 12:31:08 +00:00
ae835fb8a9
Prepare changelog for v3.10.0
2020-12-07 12:31:07 +00:00
1241b7c335
Upgrade matrix-js-sdk to 9.3.0
2020-12-07 12:13:04 +00:00
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
a856484139
Fix typos in some strings
...
This commit fixes some typos that I've stumbled upon.
2020-12-06 10:32:52 +01:00
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
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
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
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
Michael Telatynski