J. Ryan Stinnett
|
a50cde9b64
|
Merge pull request #5007 from matrix-org/matthew/fix-inter-emoji
stop Inter from clobbering Twemoji
|
2020-07-17 13:35:37 +01:00 |
Michael Telatynski
|
7453f8dd07
|
Fix `this` context in _setupHomeserverManagers for IntegrationManagers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-17 13:25:28 +01:00 |
Michael Telatynski
|
3305ca26f0
|
fix
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-17 12:07:54 +01:00 |
Michael Telatynski
|
5c8d12ab25
|
Null guard no e2ee for UserInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-17 10:49:57 +01:00 |
Travis Ralston
|
87743fe0e8
|
Fix size call for devtools state events
Fixes https://github.com/vector-im/riot-web/issues/14565
It's not a function
|
2020-07-16 18:34:19 -06:00 |
Matthew Hodgson
|
6e5efd0839
|
stop Inter from clobbering Twemoji
Fixes the bug where red heart emoji appear monochrome
|
2020-07-17 00:35:41 +01:00 |
Weblate
|
fa79a95b68
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 22:18:04 +00:00 |
Priit Jõerüüt
|
1271d5dde6
|
Translated using Weblate (Estonian)
Currently translated at 90.3% (2150 of 2380 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
|
2020-07-16 22:18:04 +00:00 |
Hubert Chathi
|
16a084bca7
|
Merge pull request #5006 from uhoreg/sanitize_replies
use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp
|
2020-07-16 18:17:57 -04:00 |
Hubert Chathi
|
b05a19ef13
|
lint
|
2020-07-16 18:07:51 -04:00 |
Hubert Chathi
|
a85af47b0a
|
use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp
|
2020-07-16 17:46:49 -04:00 |
Weblate
|
cbfd9585a1
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 20:50:06 +00:00 |
Travis Ralston
|
ddb5c7fb24
|
Merge pull request #5005 from matrix-org/travis/room-list/log-debug
Convert room list log setting to a real setting
|
2020-07-16 14:50:01 -06:00 |
Weblate
|
04f2d6eb11
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 20:44:38 +00:00 |
Travis Ralston
|
f8f9c4880a
|
Merge pull request #5003 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests
|
2020-07-16 14:44:32 -06:00 |
Weblate
|
24b8e38740
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 20:44:29 +00:00 |
Salamandar
|
ef14459c16
|
Translated using Weblate (French)
Currently translated at 99.6% (2369 of 2379 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2020-07-16 20:44:28 +00:00 |
Tirifto
|
ccacb36574
|
Translated using Weblate (Esperanto)
Currently translated at 99.9% (2376 of 2379 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
|
2020-07-16 20:44:27 +00:00 |
Travis Ralston
|
65d7a82644
|
Merge pull request #5004 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
|
2020-07-16 14:44:21 -06:00 |
Travis Ralston
|
c29da883db
|
Convert room list log setting to a real setting
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
|
2020-07-16 14:43:43 -06:00 |
Weblate
|
82ccc7ae4d
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 19:01:51 +00:00 |
Salamandar
|
f67ac287d4
|
Translated using Weblate (French)
Currently translated at 98.9% (2354 of 2379 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2020-07-16 19:01:51 +00:00 |
Tirifto
|
d4a0ca5df0
|
Translated using Weblate (Esperanto)
Currently translated at 99.6% (2370 of 2379 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
|
2020-07-16 19:01:50 +00:00 |
Travis Ralston
|
8b65b19e60
|
Merge pull request #4936 from matrix-org/travis/general/perf/js-roomstate-map
Convert devtools dialog to use new room state format
|
2020-07-16 13:01:45 -06:00 |
Travis Ralston
|
9c9ff281e7
|
Use .entries()
|
2020-07-16 13:00:02 -06:00 |
Weblate
|
ad83c839a1
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 16:04:41 +00:00 |
Michael Telatynski
|
82f6a6b710
|
Merge pull request #5000 from swapnilraj/swapnilraj/update-discovery-checkbox
Update checkbox
|
2020-07-16 17:04:36 +01:00 |
Jorik Schellekens
|
173ccbcec9
|
Fix handles
|
2020-07-16 16:21:38 +01:00 |
Michael Telatynski
|
5e6f8b20bc
|
Visual WIP
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-16 16:16:41 +01:00 |
Jorik Schellekens
|
d794e17d4d
|
Fix handlebar interaction
|
2020-07-16 16:16:41 +01:00 |
dependabot[bot]
|
4d61d6320a
|
Bump lodash from 4.17.15 to 4.17.19 in /test/end-to-end-tests
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-07-16 15:12:32 +00:00 |
dependabot[bot]
|
4aedf857cb
|
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-07-16 15:12:26 +00:00 |
Weblate
|
431ce991cb
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 15:12:09 +00:00 |
RiotRobot
|
2f9bfdbb69
|
Reset matrix-js-sdk back to develop branch
|
2020-07-16 16:11:59 +01:00 |
Weblate
|
0be9af01f0
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 15:11:30 +00:00 |
RiotRobot
|
1016b35f6c
|
Merge branch 'master' into develop
|
2020-07-16 16:11:04 +01:00 |
Weblate
|
a05cce569c
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 15:09:48 +00:00 |
Michael Telatynski
|
fb222c7eff
|
Merge pull request #5001 from swapnilraj/swapnilraj/country-code-width
Increase width for country code dropdown
|
2020-07-16 16:09:43 +01:00 |
RiotRobot
|
0c89b8d267
|
v2.10.1
|
2020-07-16 16:09:41 +01:00 |
RiotRobot
|
f68ad8f19e
|
Prepare changelog for v2.10.1
|
2020-07-16 16:09:41 +01:00 |
RiotRobot
|
bc97f731fc
|
Upgrade matrix-js-sdk to 7.1.0
|
2020-07-16 16:03:00 +01:00 |
Swapnil Raj
|
8253756276
|
Remove unnecessary import
|
2020-07-16 20:28:19 +05:30 |
Weblate
|
66b8d1e4ee
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 14:55:40 +00:00 |
Michael Telatynski
|
7d14dc08f0
|
Merge pull request #5002 from matrix-org/t3chguy/nad/rampage
Post-launch Element Web polish
|
2020-07-16 15:55:35 +01:00 |
Michael Telatynski
|
a704eefdd5
|
Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage
Conflicts:
src/components/views/elements/AccessibleTooltipButton.tsx
|
2020-07-16 15:47:12 +01:00 |
Michael Telatynski
|
ebb9c4e814
|
Update text input placeholder active colour to 75% inactive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-16 15:46:06 +01:00 |
Swapnil Raj
|
0ddfd9ee8c
|
Use rem to guard against font scaling breakages
|
2020-07-16 20:15:28 +05:30 |
Michael Telatynski
|
e6dff951b8
|
Fix composer text alignment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-16 15:42:58 +01:00 |
Michael Telatynski
|
1a9680b527
|
Update font size of member filter field
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-07-16 15:40:31 +01:00 |
Weblate
|
2c15f5b855
|
Merge branch 'origin/develop' into Weblate.
|
2020-07-16 14:34:26 +00:00 |