99b8193ce7
Use the new ShallowRenderer over ReactTestUtils
...
Mostly because the ReactTestUtils renderer doesn't exist anymore.
2019-09-17 14:33:32 -06:00
202ae1b715
Merge branch 'origin/develop' into Weblate.
2019-09-17 17:17:43 +00:00
acf474c402
Merge pull request #3450 from matrix-org/matthew/read-marker-timings
...
make the lifetimes of the RM configurable
2019-09-17 18:17:39 +01:00
2deeb9f8e7
Merge branch 'origin/develop' into Weblate.
2019-09-17 17:01:51 +00:00
3facb9be82
Merge pull request #3451 from matrix-org/travis/bump2
...
Point to develop dependencies and fixed react-gemini-scrollbar
2019-09-17 11:01:47 -06:00
9c474da831
Bump to master commit of react-gemini-scrollbar
2019-09-17 10:55:49 -06:00
90691ada3c
normalise translations
2019-09-17 17:51:03 +01:00
11c7d02a2d
Point to develop dependencies and fixed react-gemini-scrollbar
...
Fixes https://github.com/vector-im/riot-web/issues/10894
See https://github.com/matrix-org/react-gemini-scrollbar/pull/3
2019-09-17 10:44:29 -06:00
b2f44237b8
dangling comma
2019-09-17 17:36:29 +01:00
832123524d
make the lifetimes of the RM configurable
2019-09-17 17:34:30 +01:00
c060e58ea2
Merge branch 'origin/develop' into Weblate.
2019-09-17 14:44:47 +00:00
26b646613d
Translated using Weblate (French)
...
Currently translated at 99.9% (1797 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-17 14:44:46 +00:00
b1618056c0
Merge pull request #3449 from matrix-org/jryans/picker-types-regression
...
Fix address type props to state conversion
2019-09-17 15:44:41 +01:00
4e42dbe418
Fix address type props to state conversion
...
The address picker recently started tracking props and state versions of valid
address types separately
(https://github.com/matrix-org/matrix-react-sdk/pull/3408 ), where props
represents the maximal set of possible types and the state is the current
available types right now (since it can change while the dialog is open).
For the case where there is no a IS, a regression was introduced by that PR by
mutating the props in place instead returning a modified copy for the state.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3408
Fixes https://github.com/vector-im/riot-web/issues/10878
2019-09-17 15:00:32 +01:00
a2c60312ae
Merge branch 'origin/develop' into Weblate.
2019-09-17 09:56:51 +00:00
2a67970d32
Merge pull request #3445 from matrix-org/t3chguy/nvl/historical_preview
...
Only put a room in Historical if === 'leave' not peeked
2019-09-17 10:56:46 +01:00
dd0ffa8e72
Merge branch 'master' into develop
2019-09-16 17:49:46 +01:00
9a6e44a700
Merge branch 'release-v1.5.3'
2019-09-16 17:48:08 +01:00
74cbdf28ed
v1.5.3
2019-09-16 17:47:22 +01:00
a1b13e51a0
Prepare changelog for v1.5.3
2019-09-16 17:47:22 +01:00
838b1859b9
Merge branch 'origin/develop' into Weblate.
2019-09-16 16:47:14 +00:00
44cf99d5d4
released js-sdk
2019-09-16 17:44:16 +01:00
51dd0cd88a
Merge pull request #3448 from matrix-org/bwindels/joinrdfix
...
Release: Directory should use the alias or server information to join the room
2019-09-16 17:34:44 +01:00
5d1056e1ef
don't fire onFinished twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-16 18:20:31 +02:00
597433d549
Reuse showRoom for onJoinClick so we join using alias if its available
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-16 18:20:24 +02:00
da521796fd
Merge branch 'origin/develop' into Weblate.
2019-09-16 16:13:32 +00:00
129d3693b2
Merge pull request #3444 from matrix-org/t3chguy/nvl/fix_room_directory
...
Reuse showRoom for onJoinClick so we join using alias if its available
2019-09-16 16:13:28 +00:00
ffe84bfc61
Merge branch 'origin/develop' into Weblate.
2019-09-16 15:43:07 +00:00
deddf77a05
Merge pull request #3446 from matrix-org/bwindels/fixscalarurlcheck
...
Fix: make sure scalarUrls is never undefined
2019-09-16 15:43:03 +00:00
4760da1666
Merge branch 'origin/develop' into Weblate.
2019-09-16 13:28:15 +00:00
7316df70da
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1798 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-09-16 13:28:15 +00:00
e50889d9e6
Merge pull request #3447 from matrix-org/jryans/react-16-lock-tweak
...
Tweak lock file to pull in only one React version
2019-09-16 15:28:10 +02:00
16a412e7d0
Tweak lock file to pull in only one React version
...
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.
For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
2019-09-16 14:07:05 +01:00
166364ba03
Fix: make sure scalarUrls is never undefined
2019-09-16 10:12:15 +02:00
3fdaeea3a2
allow rooms we were banned from into Historical also
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 22:24:23 +01:00
4fb4c5b744
Only put a room in Historical if === 'leave' not peeked
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 22:19:07 +01:00
7f5d38772d
don't fire onFinished twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 21:30:01 +01:00
54d98c22ba
Reuse showRoom for onJoinClick so we join using alias if its available
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 21:25:36 +01:00
cd45c84b15
Translated using Weblate (Korean)
...
Currently translated at 100.0% (1798 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-09-15 14:50:44 +00:00
5ee4950a47
Translated using Weblate (English (United States))
...
Currently translated at 42.0% (756 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2019-09-15 14:50:43 +00:00
354a1275dc
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (1798 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-09-15 14:50:43 +00:00
1d7d3b6357
Merge branch 'origin/develop' into Weblate.
2019-09-13 21:59:11 +00:00
6c72978192
Translated using Weblate (French)
...
Currently translated at 100.0% (1798 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-13 21:59:11 +00:00
fcd5db0b2e
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1798 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-09-13 21:59:10 +00:00
e18b38c409
Merge pull request #3437 from matrix-org/travis/fix-deactivate
...
Wrap deactivation check with sanity conditions
2019-09-13 15:59:04 -06:00
3150d65bd7
De-async _calculateCanPermissions
2019-09-13 12:43:57 -06:00
d18d15311f
Remove extraneous guard on deactivation check
2019-09-13 12:43:47 -06:00
0556d34534
v1.5.3-rc.3
2019-09-13 16:21:15 +01:00
195afab8fb
Prepare changelog for v1.5.3-rc.3
2019-09-13 16:21:15 +01:00
93d76cef36
js-sdk rc.1 to get report API
2019-09-13 16:17:40 +01:00
Travis Ralston