93a142480c
RoomView: Handle joining federated rooms
...
This hopefully fixes an issue where joining a federated room via the directory
would get stuck at a spinner of doom, due to us not recognising the room in
question when it came down the /sync. We now catch the room id in the response
from the /join, and use it to match up the room in onRoom.
props.roomAlias, props.roomId, and state.room.roomId were somewhat confusing,
so I've tried to rationalise them:
* props.roomAlias (named thus to stop you assuming it's a room id) is the
thing that the parent component uses to identify the room of interest, and
can be either an ID or an alias (ie, it replaces props.roomId and
props.roomAlias)
* Everything that needs a room ID now has to get it from state.room.roomId.
2016-04-13 08:59:28 +01:00
f9785f68af
filter out conference bots from membership list
2016-04-12 01:54:51 +01:00
bf1e0da598
fix ability to save room settings if you don't have ops
2016-04-12 01:27:12 +01:00
f9c7ae1ab9
Merge pull request #260 from matrix-org/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:15 +01:00
9845e5ef0e
move all the localstorage crap to TextualBody
2016-04-11 23:53:36 +01:00
8e48bed346
apparently we don't need this. i'm lost now
2016-04-11 17:32:10 +01:00
86130c33c9
Merge pull request #267 from matrix-org/rav/fix_1367
...
Remember to load new timeline events
2016-04-11 14:11:11 +01:00
e051d1528c
Remember to load new timeline events
...
Fixes a bug where we wouldn't load new timeline events if they arrived when we
were scrolled up (https://github.com/vector-im/vector-web/issues/1367 )
2016-04-11 14:05:04 +01:00
825e6702ef
stop ctrl-tab etc from triggering an autocomplete
2016-04-10 14:27:30 +01:00
2e772e2f19
fix whitespace on multiupload prompt
2016-04-10 14:02:22 +01:00
6c372d37f7
add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback
2016-04-08 21:42:29 +01:00
23d6edbf63
forceupdate the whole scrollPanel rather than the geminiPanel at vdh's PR review request
2016-04-08 20:21:27 +01:00
4abc5d0d36
add comment
2016-04-08 20:21:12 +01:00
967528608f
Merge pull request #265 from matrix-org/rav/limit_pagination
...
Stop trying to paginate after we get a failure
2016-04-08 16:00:51 +01:00
5f96e9980b
Merge pull request #264 from matrix-org/rav/react_testing_tweaks
...
Improvements to the react-sdk test framework
2016-04-08 15:55:59 +01:00
15d0df5d3b
Stop trying to paginate after we get a failure
...
Once TimelineWindow.paginate fails to return any results, set
can*Paginate=false, and use it as a flag to stop us trying to paginate any
further.
2016-04-08 15:05:15 +01:00
7e6ea192fd
Build our own stub MatrixClient for the tests
...
It turns out that a bunch of things rely on MatrixClient methods to return
promises rather than undefined. Rather than having to undo half the work done
by sinon.createStubInstance, just build our own object with as many methods as
we need stubbed out.
2016-04-08 14:50:04 +01:00
1d8b08040e
incorporate PR feedback
2016-04-07 18:58:50 +01:00
1125c62505
add comments for thumbHeight
2016-04-07 18:10:35 +01:00
7a821ce9d1
Make it possible to only run one test file each time
2016-04-07 17:49:39 +01:00
7884c13d0d
Merge branch 'develop' into matthew/preview_urls
2016-04-07 17:25:48 +01:00
a2168efcda
Correctly restore MatrixClientPeg after each test case
2016-04-07 16:47:17 +01:00
f3aa7c8a01
Merge pull request #263 from matrix-org/dbkr/fix_forgot_password
...
Fix password resetting
2016-04-07 13:46:45 +01:00
a0c41e2d57
Fix password resetting
...
Fixes https://github.com/vector-im/vector-web/issues/1349
2016-04-07 12:59:30 +01:00
b64604964d
Fix exception in key handling
...
Fix a typo introduced in PR #262 which caused scroll keys to throw console
errors.
2016-04-07 12:05:07 +01:00
b70f518d66
Merge pull request #262 from matrix-org/rav/pageup_down
...
Catch pageup/down and ctrl-home/end at the top level
2016-04-06 12:00:39 +01:00
8b8ee21765
Catch pageup/down and ctrl-home/end at the top level
...
Make the scroll keys work when the focus is outside the message panel.
2016-04-05 13:40:36 +01:00
c5c9cad0cb
Merge pull request #261 from matrix-org/rav/issue_1151
...
Fix an issue where the scroll stopped working.
2016-04-05 12:55:59 +01:00
6a82d1a94c
Merge pull request #254 from matrix-org/rav/fix_rm_animation
...
Fix a bug where we tried to show two ghost read markers at once.
2016-04-05 12:55:38 +01:00
ae1220a6a4
Fix test for npm 3
...
npm 3 puts files in slightly saner places, so we have to look for the gemini
css in two places
2016-04-05 11:08:02 +01:00
0d7adae100
Back out animation timing changes for now
...
... since they seem to be a bit contentious
2016-04-05 10:46:08 +01:00
51fe77122b
Fix an issue where the scroll stopped working.
...
Under certain conditions, it was possible to get stuck in a state where any
user-initiated scroll would be met with "Working around
vector-im/vector-web#528" and overridden. Fix this by removing the duplication
between _lastSetScroll and recentEventScroll, and using _lastSetScroll which is
more reliable.
2016-04-05 10:41:32 +01:00
1de4e0d2dd
label previews with the target URL if all else fails
2016-04-04 01:06:54 +01:00
96b0f42db2
support lightboxes for image previews
2016-04-04 00:18:18 +01:00
0eb7b627fc
ugly impl to track whether to hide the widget or not
2016-04-03 23:30:48 +01:00
e61c99f7f3
support cancelling previews
2016-04-03 02:50:36 +01:00
f9c914c40e
specify timestamps for historical previews
2016-04-03 01:21:56 +01:00
f195d2eb24
Merge branch 'develop' into matthew/preview_urls
2016-04-03 01:10:33 +01:00
2d289b321d
Merge branch 'develop' into matthew/preview_urls
2016-04-03 01:09:50 +01:00
2d3a237101
Merge pull request #258 from aviraldg/fix-219
...
File upload improvements
2016-04-02 23:07:50 +01:00
d5ed8f7eb7
Merge pull request #257 from aviraldg/fix-65
...
Show full-size avatar on MemberInfo avatar click
2016-04-02 23:02:46 +01:00
0762fe2841
Merge pull request #256 from aviraldg/fix-1339
...
Whitelist <u> tag: (fixes #1339 )
2016-04-02 23:01:46 +01:00
0574a28e36
Add confirmation dialog for file upload
...
fixes vector-im/vector-web#92
2016-04-03 02:22:05 +05:30
0eeaac88b4
Allow multiple files to be uploaded at once
...
fixes vector-im/vector-web#219
2016-04-03 01:26:50 +05:30
31e09ebe63
Show full-size avatar on MemberInfo avatar click
...
fixes vector-im/vector-web#65
2016-04-03 00:54:23 +05:30
4ef148eaec
whitelist <u> tag ( fixes vector-im/vector-web#1339 )
2016-04-02 22:15:29 +05:30
bffb482133
add FIXME
2016-04-02 02:46:19 +01:00
a6b6be7f79
add ImageUtils
2016-04-02 00:36:33 +01:00
4388334e30
fix up scroll behaviour when loading widgets
2016-04-02 00:36:19 +01:00
62d04c38ef
fix typo and add linkify descriptions
2016-04-01 02:23:29 +01:00
Richard van der Hoff