494779393f
Merge branch 'develop' into bwindels/bacat-scrolling
2019-03-21 13:50:32 +01:00
44f3cac5eb
Merge branch 'master' into develop
2019-03-21 11:28:35 +01:00
4ca90b16c3
Merge branch 'release-v1.0.5'
2019-03-21 11:28:08 +01:00
a483352798
v1.0.5
2019-03-21 11:27:29 +01:00
3ab205b64d
Prepare changelog for v1.0.5
2019-03-21 11:24:01 +01:00
03dbc0b2cc
Merge pull request #2811 from matrix-org/bwindels/disable-typing-jump-prevention
...
Hotfix: disable typing notifs jumping prevention for now
2019-03-21 10:19:40 +00:00
817fe1a520
disable typing notifs jumping prevention for now
2019-03-21 11:01:47 +01:00
ce1febe150
Merge pull request #2810 from matrix-org/dbkr/buildkite_group_logs
...
Add log grouping to buildkite
2019-03-20 21:31:58 +00:00
1ed2e6dcc1
Remove the correct widget listener
2019-03-20 15:03:02 -06:00
4c4d4407bf
Merge pull request #2809 from jryans/git-proto
...
Switch to `git` protocol for CI dependencies
2019-03-20 20:53:25 +00:00
8b1e05542d
Add log grouping to buildkite
2019-03-20 19:10:47 +00:00
324781005d
Merge pull request #2808 from matrix-org/dbkr/velocity-mainline
...
Go back to using mainine velocity
2019-03-20 19:01:20 +00:00
99369a54fe
Typo
...
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-03-20 18:11:42 +00:00
6f79e8503a
Switch to `git` protocol for CI dependencies
...
If you try to clone a repo that doesn't exist via `https`, `git` will prompt for
auth credentials and hang forever. Using `git` avoids this and fails immediately
instead, which is what we want for a missing repo.
Part of https://github.com/vector-im/riot-web/issues/9221
2019-03-20 18:06:07 +00:00
58b2068fbf
Set velocity's mock option in the unit test
2019-03-20 17:43:19 +00:00
3e13a11372
restore scroll position after hiding typing notifs with checkScroll
2019-03-20 17:38:05 +01:00
85d305430f
no need for forceUpdate here
2019-03-20 17:37:34 +01:00
02a5aa3b1f
more logging cleanup
2019-03-20 17:15:43 +01:00
9da13fe430
small cleanup
2019-03-20 17:13:09 +01:00
a8b149cfbb
cleanup scrollpanel logging
2019-03-20 17:12:49 +01:00
460f9a5959
comment typo
2019-03-20 17:10:38 +01:00
f164a78eaa
reimplement typing notif timeline shrinking prevention
...
instead of setting a min-height on the whole timeline,
track how much height we need to add to prevent shrinking
and set paddingBottom on the container element of the timeline.
2019-03-20 17:10:30 +01:00
94e91e6f9a
Merge pull request #2796 from matrix-org/travis/upgrade-warning
...
Warn that members won't be autojoined to upgraded rooms
2019-03-20 08:34:33 -06:00
1a8fe4dd43
Go back to using mainine velocity
...
We moved off to our own fork of velocity many moons ago to fix
a memory leak bug when velocity was being barely maintained. They
have now merged the bugfix, so go back to mainline.
2019-03-20 10:54:06 +00:00
1e372aad47
only log when node was found
2019-03-20 11:10:04 +01:00
c306181fcd
take into account that node might not be in DOM while updating height
2019-03-20 11:00:27 +01:00
88f039fe44
keep track of current updateHeight request outside of method
...
it's only called from one place
2019-03-20 10:59:55 +01:00
d47eb51589
Merge pull request #2807 from jryans/ci-forks
...
Support CI for matching branches on forks
2019-03-20 09:56:57 +00:00
02569fca4b
Support CI for matching branches on forks
...
Currently, people with push access to the main Riot repos can push matching
branch names to Riot and the SDKs, and CI will test all the branches together.
This change allows contributors to access the same ability when submitting
several matching PRs from their fork of each repo.
Part of https://github.com/vector-im/riot-web/issues/9041
2019-03-19 16:59:31 +00:00
2bcced72ad
take (potentially clipped) content height into account for filling
2019-03-19 16:51:39 +01:00
469511aa44
correctly calculate last node in viewport
...
these variables are now relative to bottom of timeline,
before it was the top
2019-03-19 16:50:55 +01:00
9f6b550caa
Merge pull request #2801 from matrix-org/travis/renew-widget
...
Discard old sticker picker when the URL changes
2019-03-19 08:50:33 -06:00
d713c62774
Merge pull request #2799 from matrix-org/travis/widget-reload
...
Reload widget messaging when widgets reload
2019-03-19 08:49:24 -06:00
71f6b08b26
first impl of new scrolling, still a bit broken
2019-03-19 13:42:22 +01:00
6a7e4ba52c
Merge pull request #2806 from matrix-org/t3chguy/explicit_room_name_settings
...
Don't show calculated room name in room settings name input field
2019-03-18 20:32:11 -06:00
6f89c77bf9
Merge pull request #2805 from matrix-org/t3chguy/disableBigEmoji_memote
...
Disable big emoji for m.emote messages as it looks weird
2019-03-18 20:31:32 -06:00
cadf36e1c9
Don't show calculated room name in room settings name input field
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-18 23:33:24 +00:00
d6f31bef8e
Disable big emoji for m.emote messages as it looks weird
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-03-18 23:25:11 +00:00
9a6dcc3e63
Translated using Weblate (Slovak)
...
Currently translated at 89.8% (1401 of 1559 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-03-18 18:05:03 +00:00
a5d12a134d
Translated using Weblate (Slovak)
...
Currently translated at 89.8% (1401 of 1559 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-03-18 17:35:30 +00:00
bb111dc6c5
Update yarn.lock
...
Which wasn't updated at release time
2019-03-18 16:25:52 +00:00
620590bd90
Update yarn.lock
...
Which wasn't updated at release time
2019-03-18 16:24:56 +00:00
5eea443cfb
Merge pull request #2803 from jryans/rm-edge-support
...
Remove Edge from browser support statements
2019-03-18 15:59:16 +00:00
34e533dd4b
Remove Edge from browser support statements
...
At the current time, we do not intend to do additional work specifically to
support Edge. If it works for most use cases, that's great, but we do not
intend to fix issues that affect only Edge.
Fixes https://github.com/vector-im/riot-web/issues/9201
2019-03-18 15:47:48 +00:00
554da0fec3
Merge branch 'master' into develop
2019-03-18 13:57:50 +00:00
fc7db55585
v1.0.4
2019-03-18 13:56:55 +00:00
6ed45b52d3
Prepare changelog for v1.0.4
2019-03-18 13:56:55 +00:00
88cc9b0504
Released js-sdk
2019-03-18 13:51:59 +00:00
b26f733c9c
Merge branch 'bwindels/timeline-nativescrollbars' of github.com:matrix-org/matrix-react-sdk into bwindels/timeline-nativescrollbars
2019-03-18 14:08:25 +01:00
d84003ac44
dont break room directory and search
2019-03-18 14:05:56 +01:00
Bruno Windels