OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
46,272 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

46272 Commits (ab982689012bec6b916c9e3d9094665d6df87693)

Author SHA1 Message Date
Richard van der Hoff 9931ef1971 Merge pull request #61 from matrix-org/rav/fix_postinvite_dnd 
Initialise the messagepanel correctly after accepting an invite
 2015-12-18 10:32:24 +00:00
Richard van der Hoff d6c208a275 Reinstate the DnD event listener removals, with comments 2015-12-18 10:19:07 +00:00
Matthew Hodgson 4baf9d5589 Fix paths 2015-12-18 00:40:01 +00:00
Matthew Hodgson e2ae2dd199 merge stuff from vector 2015-12-18 00:37:56 +00:00
Matthew Hodgson 272d7362fb Merge branch 'develop' into matthew/settings 2015-12-18 00:14:36 +00:00
Matthew Hodgson 0f82b72e07 lost copyright 2015-12-18 00:13:57 +00:00
Matthew Hodgson f30b7eec2f Merge branch 'develop' into matthew/settings 2015-12-18 00:11:43 +00:00
Richard van der Hoff e0d05d4f4b Initialise the messagepanel correctly after accepting an invite 
This should fix vector-im/vector-web#538.

I'm sorry.
 2015-12-17 22:07:56 +00:00
Richard van der Hoff 6ee0c72340 Merge pull request #58 from matrix-org/rav/yet_more_scroll_fixes 
Fix issue with rooms not scrolling down when new events arrive
 2015-12-17 17:40:41 +00:00
Kegan Dougal 8e4d0c0be7 Merge branch 'develop' into kegan/archived-rooms 2015-12-17 17:07:18 +00:00
Kegsay 498990b376 Merge pull request #59 from matrix-org/kegan/3pid-inv 
Finish 3PID invites impl
 2015-12-17 16:54:29 +00:00
Kegan Dougal 12943b11fc Full Stop. 2015-12-17 16:40:46 +00:00
Matthew Hodgson 478ca91b4f s/Conversations/Rooms/ as per https://github.com/vector-im/vector-web/issues/535 2015-12-17 16:27:56 +00:00
Kegan Dougal 17a8eb0109 Display m.room.third_party_invite events. Display sensible text transitions. 2015-12-17 15:48:14 +00:00
Kegan Dougal 6e324a0dd1 Whoops, didn't mean to add this 2015-12-17 15:12:09 +00:00
Kegan Dougal 32bd9d155c Pass a new prop 'startingQueryParams' to pluck out the email from the URL 
This is preferable to doing the way other QPs are passed (secret, etc) because
the link in the email wants to look like "#/room/<room_id_or_alias>" for guest
read-access (only bouncing you to /login if that room is not readable by guests).
This is hard to do in the current arch because we don't preserve QPs on /room
paths, and we do conditional executions depending on if it is a room ID or
alias. Rather than threading through the email in each section and creating
a fragile mess, just pass the *starting* set of query parameters through to
MatrixChat which can then do the Right Thing when the time comes.
 2015-12-17 14:56:55 +00:00
Matthew Hodgson 5c999fe1ab stop the incoming call box from scrolling off the screen 2015-12-17 14:56:09 +00:00
Kegan Dougal 1eeb732625 Supply bind_email=true at registration time - required for 3pid invites to work. 2015-12-17 14:34:45 +00:00
Richard van der Hoff 3ff19dc4db Fix issue with rooms not scrolling down when new events arrive 
Remove an optimisation which tried to avoid recalculating the scroll on every
render. The problem is that sometimes, when new events, the number of event
tiles remains the same, but we still need to do a scroll, because the height of
the message list changes.

The optimisation was a bit of a waste of time anyway - the actual render will
always be much more difficult than recalculating the scroll position.
 2015-12-17 14:14:26 +00:00
Matthew Hodgson bb184c12a1 fix NPE 2015-12-17 11:56:41 +00:00
Matthew Hodgson d979a028a5 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown 2015-12-17 02:49:09 +00:00
Richard van der Hoff 5eff6140e0 Merge pull request #56 from matrix-org/rav/fix_scroll_fail 
Hacky fixes to jumpy scroll when backfilling
 2015-12-16 18:16:04 +00:00
Matthew Hodgson 4327a2302d spell out affected versions 2015-12-16 18:05:15 +00:00
Richard van der Hoff dc13b944bc Hacky fixes to jumpy scroll when backfilling 
Keep resetting our scroll offset until the DOM believes us. Hopefully this will
fix vector-im/vector-web#528.
 2015-12-16 17:57:32 +00:00
Kegan Dougal e8f82527d1 Listen for room deletions and refresh the room list when it happens 2015-12-16 16:27:46 +00:00
Kegan Dougal f7aa8be1c1 Add a forget button. Add left rooms to the "historical" tab. 
Call /forget when the forget button is clicked. Number of shortcomings:
 - We need to lazy load the historical list (atm we never get the list of left
   rooms; things only go into that list if you leave the room whilst running)
 - Once a room is forgotten we need to physically nuke it from the JS SDK.
 - Need icon for forget room.
 2015-12-16 16:06:29 +00:00
Kegsay 186b727303 Merge pull request #54 from matrix-org/kegan/hide-fs-users 
Do not show conf user join/parts
 2015-12-16 13:56:55 +00:00
Richard van der Hoff 524563d627 Merge pull request #55 from matrix-org/rav/codedup 
use RoomView.ScrollToBottom instead of reimplementing it
 2015-12-16 13:41:03 +00:00
Richard van der Hoff f24b7ba67c use RoomView.ScrollToBottom instead of reimplementing it 2015-12-16 13:31:36 +00:00
Kegan Dougal 09e0d10d32 Do not show conf user join/parts 2015-12-16 11:54:29 +00:00
Kegsay 8aaef34319 Merge pull request #53 from matrix-org/kegan/dont-notify-immediately 
Don't notify for events until the SDK is PREPARED
 2015-12-15 17:07:09 +00:00
Kegan Dougal 6aefb3be90 Don't notify for events until the SDK is PREPARED else you can notify for stale events 2015-12-15 17:01:16 +00:00
Matthew Hodgson 8ebacc572b apply class to typing text to fix typing notifs 2015-12-15 15:59:31 +00:00
Kegan Dougal 28908c2edb Auto-focus username box 2015-12-15 15:27:56 +00:00
Kegan Dougal a670a7e4c4 Don't spam logging 2015-12-15 14:23:58 +00:00
Matthew Hodgson a8d7810bfc add fullscreen button back 2015-12-15 00:01:47 +00:00
Matthew Hodgson 39c628d4a1 implement the 'correct' voip calling design 2015-12-14 23:37:46 +00:00
Kegsay e81a401bba Merge pull request #52 from matrix-org/kegan/inviter-name 
Use getSender() instead of gut wrenching event.user_id for v2 compat
 2015-12-14 15:46:59 +00:00
Kegan Dougal 4488844ad9 Use getSender() instead of gut wrenching event.user_id for v2 compat 2015-12-14 15:36:34 +00:00
Kegan Dougal 0f62388d3c Don't re-render after each /sync call 2015-12-14 11:32:22 +00:00
Richard van der Hoff 5e02522685 Merge pull request #51 from matrix-org/rav/fix_bottomleft_menu 
Fix 'Create room' and 'Settings' buttons
 2015-12-14 11:25:32 +00:00
Richard van der Hoff 68cdff1159 Fix 'Create room' and 'Settings' buttons 
These buttons were broken by PR #49... wire them up correctly.
 2015-12-14 11:07:59 +00:00
Matthew Hodgson ead6d5a25e backfill on accepting invites 2015-12-13 15:18:44 +00:00
Matthew Hodgson 352865ee9d Merge pull request #49 from matrix-org/rav/preserve_room_scroll 
Preserve scroll offset when switching rooms
 2015-12-13 14:48:44 +00:00
Matthew Hodgson 5ce917ba84 merge in develop 2015-12-13 14:47:53 +00:00
Matthew Hodgson 6ad6ed2a49 factor out room-leaving code into MatrixChat for now, and add a dedicated leave button in to the header bar for now 2015-12-13 13:49:28 +00:00
Matthew Hodgson 43ab6074c9 sacrifice a herd of goats to correctly size the remote video element when on a call. turns out flexbox isn't smart enough to let us say that the minimum height of the element should be the (scaled) intrinsic height of the video stream, and that the max height should be ~80% of the height of the normal timeline. so we fudge it with JS instead, which turns out to work fine. after a lot of poking at flexbox i'm fairly convinced this is a fundamental limitation: the implicit height of the video tag can only be used as the minimum height of the auxPanel if you give up on the flexbox shrink/grow being able to constrain it too. there's a chance I made a mistake, but whatever, this works well enough. 2015-12-13 04:32:48 +00:00
Matthew Hodgson bf70376d16 hoverover for full name of room 2015-12-12 17:29:53 +00:00
Matthew Hodgson b78add39f4 fix d&d ui 2015-12-12 16:35:40 +00:00
Matthew Hodgson 1f54467e6f Merge pull request #50 from matrix-org/rav/mute_icon 
Use the 'muted' icon when the mic is muted during a call
 2015-12-11 15:31:27 +00:00