Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • f30b7eec2f Merge branch 'develop' into matthew/settings Matthew Hodgson 2015-12-18 00:11:43 +00:00
  • e0d05d4f4b Initialise the messagepanel correctly after accepting an invite Richard van der Hoff 2015-12-17 22:07:56 +00:00
  • 6ee0c72340 Merge pull request #58 from matrix-org/rav/yet_more_scroll_fixes Richard van der Hoff 2015-12-17 17:40:41 +00:00
  • 8e4d0c0be7 Merge branch 'develop' into kegan/archived-rooms Kegan Dougal 2015-12-17 17:07:18 +00:00
  • 498990b376 Merge pull request #59 from matrix-org/kegan/3pid-inv Kegsay 2015-12-17 16:54:29 +00:00
  • 5f3a1cb6e1 Merge pull request #537 from vector-im/kegan/3pid-inv Kegsay 2015-12-17 16:43:13 +00:00
  • 12943b11fc Full Stop. Kegan Dougal 2015-12-17 16:40:46 +00:00
  • 478ca91b4f s/Conversations/Rooms/ as per https://github.com/vector-im/vector-web/issues/535 Matthew Hodgson 2015-12-17 16:27:56 +00:00
  • 17a8eb0109 Display m.room.third_party_invite events. Display sensible text transitions. Kegan Dougal 2015-12-17 15:48:14 +00:00
  • 6e324a0dd1 Whoops, didn't mean to add this Kegan Dougal 2015-12-17 15:12:09 +00:00
  • 63d0477223 Pass through the starting query params from the URL Kegan Dougal 2015-12-17 15:01:07 +00:00
  • 32bd9d155c Pass a new prop 'startingQueryParams' to pluck out the email from the URL Kegan Dougal 2015-12-17 14:56:55 +00:00
  • 5c999fe1ab stop the incoming call box from scrolling off the screen Matthew Hodgson 2015-12-17 14:56:09 +00:00
  • 1eeb732625 Supply bind_email=true at registration time - required for 3pid invites to work. Kegan Dougal 2015-12-17 14:34:45 +00:00
  • 3ff19dc4db Fix issue with rooms not scrolling down when new events arrive Richard van der Hoff 2015-12-17 14:14:26 +00:00
  • bb184c12a1 fix NPE Matthew Hodgson 2015-12-17 11:56:41 +00:00
  • 1a90a2c426 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown Matthew Hodgson 2015-12-17 02:53:53 +00:00
  • d979a028a5 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown Matthew Hodgson 2015-12-17 02:49:09 +00:00
  • 5eff6140e0 Merge pull request #56 from matrix-org/rav/fix_scroll_fail Richard van der Hoff 2015-12-16 18:16:04 +00:00
  • 4327a2302d spell out affected versions Matthew Hodgson 2015-12-16 18:05:15 +00:00
  • dc13b944bc Hacky fixes to jumpy scroll when backfilling Richard van der Hoff 2015-12-16 17:57:32 +00:00
  • e8f82527d1 Listen for room deletions and refresh the room list when it happens Kegan Dougal 2015-12-16 16:27:46 +00:00
  • f7aa8be1c1 Add a forget button. Add left rooms to the "historical" tab. Kegan Dougal 2015-12-16 16:06:29 +00:00
  • 186b727303 Merge pull request #54 from matrix-org/kegan/hide-fs-users Kegsay 2015-12-16 13:56:55 +00:00
  • 856156ef5c Merge pull request #527 from vector-im/kegan/hide-fs-user Kegsay 2015-12-16 13:56:50 +00:00
  • 524563d627 Merge pull request #55 from matrix-org/rav/codedup Richard van der Hoff 2015-12-16 13:41:03 +00:00
  • f24b7ba67c use RoomView.ScrollToBottom instead of reimplementing it Richard van der Hoff 2015-12-16 13:31:36 +00:00
  • c8ca1dd8d0 Pass a userId rather than a RoomMember to isConferenceUser Kegan Dougal 2015-12-16 11:55:13 +00:00
  • 09e0d10d32 Do not show conf user join/parts Kegan Dougal 2015-12-16 11:54:29 +00:00
  • 8aaef34319 Merge pull request #53 from matrix-org/kegan/dont-notify-immediately Kegsay 2015-12-15 17:07:09 +00:00
  • 6aefb3be90 Don't notify for events until the SDK is PREPARED else you can notify for stale events Kegan Dougal 2015-12-15 17:01:16 +00:00
  • d945050de6 fix typing notifs Matthew Hodgson 2015-12-15 15:59:40 +00:00
  • 8ebacc572b apply class to typing text to fix typing notifs Matthew Hodgson 2015-12-15 15:59:25 +00:00
  • 28908c2edb Auto-focus username box Kegan Dougal 2015-12-15 15:27:56 +00:00
  • a670a7e4c4 Don't spam logging Kegan Dougal 2015-12-15 14:23:58 +00:00
  • a8d7810bfc add fullscreen button back Matthew Hodgson 2015-12-15 00:01:47 +00:00
  • d3ecce2d2e add fullscreen button Matthew Hodgson 2015-12-15 00:01:32 +00:00
  • a495aecdd8 assets for VoIP and DnD file upload Matthew Hodgson 2015-12-14 23:38:24 +00:00
  • 39c628d4a1 implement the 'correct' voip calling design Matthew Hodgson 2015-12-14 23:37:34 +00:00
  • e81a401bba Merge pull request #52 from matrix-org/kegan/inviter-name Kegsay 2015-12-14 15:46:59 +00:00
  • 4488844ad9 Use getSender() instead of gut wrenching event.user_id for v2 compat Kegan Dougal 2015-12-14 15:36:34 +00:00
  • 0f62388d3c Don't re-render after each /sync call Kegan Dougal 2015-12-14 11:32:08 +00:00
  • 5e02522685 Merge pull request #51 from matrix-org/rav/fix_bottomleft_menu Richard van der Hoff 2015-12-14 11:25:32 +00:00
  • 68cdff1159 Fix 'Create room' and 'Settings' buttons Richard van der Hoff 2015-12-14 11:07:59 +00:00
  • ead6d5a25e backfill on accepting invites Matthew Hodgson 2015-12-13 15:18:44 +00:00
  • 352865ee9d Merge pull request #49 from matrix-org/rav/preserve_room_scroll Matthew Hodgson 2015-12-13 14:48:44 +00:00
  • 5ce917ba84 merge in develop Matthew Hodgson 2015-12-13 14:47:53 +00:00
  • c553258aff add dedicated leave button to header Matthew Hodgson 2015-12-13 13:49:54 +00:00
  • 6ad6ed2a49 factor out room-leaving code into MatrixChat for now, and add a dedicated leave button in to the header bar for now Matthew Hodgson 2015-12-13 13:49:28 +00:00
  • 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. Matthew Hodgson 2015-12-13 04:32:48 +00:00
  • 9c8984b308 fix vertical alignment of voip buttons Matthew Hodgson 2015-12-13 04:14:20 +00:00
  • c2061ed439 revert dd08f53756 - do this in JS instead Matthew Hodgson 2015-12-13 04:08:35 +00:00
  • 96cddc5ca8 fix layout for long room names & topics Matthew Hodgson 2015-12-12 17:30:08 +00:00
  • bf70376d16 hoverover for full name of room Matthew Hodgson 2015-12-12 17:29:53 +00:00
  • dd08f53756 don't let auxpanel push out the height of the roomview Matthew Hodgson 2015-12-12 17:15:45 +00:00
  • 056017007a improve look and feel of upload cancel Matthew Hodgson 2015-12-12 16:41:32 +00:00
  • b78add39f4 fix d&d ui Matthew Hodgson 2015-12-12 16:35:40 +00:00
  • 7cfca3ff4d Merge pull request #499 from vector-im/rav/mute_icon Matthew Hodgson 2015-12-11 15:32:08 +00:00
  • 1f54467e6f Merge pull request #50 from matrix-org/rav/mute_icon Matthew Hodgson 2015-12-11 15:31:27 +00:00
  • 0beafeddb9 Use the 'muted' icon when the mic is muted during a call Richard van der Hoff 2015-12-11 15:01:16 +00:00
  • c36d1df417 Add a 'muted' icon for voip calls Richard van der Hoff 2015-12-11 14:59:53 +00:00
  • 0d47495e04 RoomView: Remove another redundant unreadMessageCount reset Richard van der Hoff 2015-12-11 11:04:12 +00:00
  • 762281cd96 fix vertical spacing of roomheader Matthew Hodgson 2015-12-11 03:39:13 +00:00
  • 3b245f0131 discard stale search results Matthew Hodgson 2015-12-11 03:22:44 +00:00
  • af3c43ca76 show result counts Matthew Hodgson 2015-12-11 02:58:59 +00:00
  • 898cb399a3 show results Matthew Hodgson 2015-12-11 02:58:47 +00:00
  • 3fb0c9883b escape key to cancel search box Matthew Hodgson 2015-12-11 02:32:30 +00:00
  • f2fb1836df only flash whilst searching Matthew Hodgson 2015-12-11 02:25:51 +00:00
  • f38c71d34b update the UI whilst searching Matthew Hodgson 2015-12-11 02:25:33 +00:00
  • fea3fed460 animate the search button whilst searching Matthew Hodgson 2015-12-11 02:24:58 +00:00
  • 4c82d86092 nice green highlights Matthew Hodgson 2015-12-11 01:35:05 +00:00
  • 1c9d61d731 dedicated search button Matthew Hodgson 2015-12-11 01:19:48 +00:00
  • 7b702c4594 don't grey out invites randomly Matthew Hodgson 2015-12-11 00:40:40 +00:00
  • 77464c669f switch to fake tag names for fake tags, and highlight new invites Matthew Hodgson 2015-12-11 00:40:28 +00:00
  • ee0f0e332a Remove redundant 'waiting_for_paginate' Richard van der Hoff 2015-12-10 22:08:35 +00:00
  • a863839063 Don't try to fiddle with the scroll state in search mode Richard van der Hoff 2015-12-10 22:04:52 +00:00
  • 669fae48ea Merge remote-tracking branch 'origin/develop' into rav/preserve_room_scroll Richard van der Hoff 2015-12-10 21:53:59 +00:00
  • b7699c0544 Save scroll state when swapping to non-room pages too Richard van der Hoff 2015-12-10 21:53:14 +00:00
  • d9782b35e1 Fix review comments Richard van der Hoff 2015-12-10 21:44:30 +00:00
  • 1a3fb9aca9 Preserve scroll position when backfilling Richard van der Hoff 2015-12-10 21:34:10 +00:00
  • a1d88722aa Avoid kicking off two pagination requests at once Richard van der Hoff 2015-12-10 20:53:21 +00:00
  • d6bcf80431 make the settings button more discoverable by having the whole leftRow be a hover target Matthew Hodgson 2015-12-10 19:48:05 +00:00
  • 00656fc1dc Preserve scroll offset when switching rooms Richard van der Hoff 2015-12-10 16:26:36 +00:00
  • 1bb0f4859f Merge pull request #48 from matrix-org/erikj/search-compat Erik Johnston 2015-12-10 14:05:09 +00:00
  • 5a1853210e Handle the fact that newer homeservers return lists rather than dicts Erik Johnston 2015-12-10 13:58:06 +00:00
  • e26efd475c preload warning.svg - fixes bug https://github.com/vector-im/vector-web/issues/455 Matthew Hodgson 2015-12-09 13:52:04 +00:00
  • 9d15bf2847 clean up broken renaming of /icons Matthew Hodgson 2015-12-09 13:24:56 +00:00
  • 8ecf70dda0 show images with unknown height - fixes issue 475 hopefully Matthew Hodgson 2015-12-09 13:24:15 +00:00
  • 072130466c hopefully fix vector-im/vector-web#475 Matthew Hodgson 2015-12-08 19:49:16 +00:00
  • 4b8d7a612a make the mx_RoomView_statusAreaBox_line full width as per the ribot design Matthew Hodgson 2015-12-08 19:45:30 +00:00
  • 1d97a5f06b Merge pull request #470 from vector-im/rav/olm Richard van der Hoff 2015-12-08 16:03:54 +00:00
  • f8e5bbef0b Add a link to E2E bug in the README Richard van der Hoff 2015-12-08 16:03:12 +00:00
  • b532fd046a actually use SVGs - oops Matthew Hodgson 2015-12-08 10:28:00 +00:00
  • a8e24802ab rename icons to avoid namespace clash with /icons Matthew Hodgson 2015-12-08 10:27:42 +00:00
  • 8edfd60b64 Actually use room.name on invites. Fixes #321 Kegan Dougal 2015-12-08 10:21:40 +00:00
  • 47b50be4b5 Merge pull request #47 from matrix-org/kegan/resending Kegsay 2015-12-07 17:00:36 +00:00
  • 862ab0c115 Merge pull request #477 from vector-im/kegan/resending Kegsay 2015-12-07 17:00:30 +00:00
  • 2f905e13e1 Invoke onFinished so the context menu doesn't hang around Kegan Dougal 2015-12-07 16:04:46 +00:00
  • b64e5d49cc Add magic flag to say 'dump pending events to the end' Kegan Dougal 2015-12-07 15:33:58 +00:00
  • 39778330b5 Also allow not_sent messages to be cancelled entirely. Kegan Dougal 2015-12-07 13:55:10 +00:00