Commit Graph

39515 Commits (49b34cd785bdeaf424b9bb830b56c3fd2b1a3e34)

Author SHA1 Message Date
Richard van der Hoff 8a57881618 Add more logging to TimelinePanel-test
In an attempt to figure out why this is timing out sometimes, add even more
debugging.
2016-08-03 15:24:56 +01:00
Matthew Hodgson f95a11a9bf Merge pull request #369 from matrix-org/wmwragg/mention-state-menu
Wmwragg/mention state menu
2016-08-03 15:22:39 +01:00
David Baker ff2dd74429 Merge pull request #383 from matrix-org/matthew/fix-video-upload
fix upload for video or image files where sniffing fails
2016-08-03 15:04:53 +01:00
wmwragg c1cfbd6b59 Corrected comment typo 2016-08-03 14:47:53 +01:00
Richard van der Hoff f4d41b7847 DevicesPanel: use device_id as a placeholder
A device may have no display_name set, in which case we probably want to use
the device_id as a placeholder.
2016-08-03 14:19:54 +01:00
Richard van der Hoff 55f4d23625 MemberDeviceInfo: Use the device name, where available
we now have device name for e2e devices: use it!
2016-08-03 14:18:09 +01:00
wmwragg 8e19532e5a Hover state for badges, now only on the badges themselves 2016-08-03 14:09:10 +01:00
Aviral Dasgupta 8e66e6dfdd fix: Switch to opacity: 0 for composer emoji.
This seems to be the best option for displaying emoji in the composer. While it means selected emoji don't actually have the selection colour applied, it's the most functional of all the options. Facebook uses the same approach.
2016-08-03 18:27:49 +05:30
David Baker efdcc6da98 Merge pull request #384 from aviraldg/fix-composer-up-down
fix: allow up/down normally for no completions
2016-08-03 13:55:13 +01:00
Aviral Dasgupta a2d64f5119 fix: allow up/down normally for no completions
Autocomplete current eats up up/down key events by unconditionally returning
true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible.
2016-08-03 18:04:52 +05:30
David Baker 1ff2ce60ff Merge pull request #382 from aviraldg/fix-autocomplete-confirm
fix: autocomplete to use tab instead of return
2016-08-03 13:28:11 +01:00
Matthew Hodgson 569b6057c3 fix upload for video or image files where sniffing the content.info fails 2016-08-03 13:27:06 +01:00
Aviral Dasgupta 1f9a396fa5 fix: autocomplete to use tab instead of return 2016-08-03 17:51:40 +05:30
Matthew Hodgson 104ccc751f Merge pull request #375 from aviraldg/fix-574
strip (IRC) displayname suffix from autocomplete
2016-08-03 13:00:30 +01:00
Aviral Dasgupta 2cddf18461 strip (IRC) displayname suffix from autocomplete
Fixes vector-im/vector-web#574
2016-08-03 17:26:05 +05:30
David Baker ffa97a4095 Log out when account is deactivated 2016-08-03 11:47:29 +01:00
David Baker f8201ac2ea Merge branch 'dbkr/use_logout_api' into dbkr/deactivate_account 2016-08-03 11:39:22 +01:00
David Baker f47ac87775 Don't show deactivate button for guests 2016-08-03 11:34:31 +01:00
David Baker 2f0fd6da05 Actually commit the deactivate account dialog 2016-08-03 11:34:13 +01:00
David Baker da03af6c1c Fix tests 2016-08-03 10:51:58 +01:00
David Baker d9a7d50a03 Add an interface for MatrixClientCreds
and make MatrixClientPeg functions use it consistently
2016-08-03 10:46:42 +01:00
David Baker cf7e7d65c8 Don't start the client twice
if we have a guest_access_token
2016-08-03 10:15:50 +01:00
David Baker 1f17b78371 log if we can't log out 2016-08-03 10:01:23 +01:00
David Baker e3a5776eae We should clear /login off the URL after login 2016-08-03 09:57:12 +01:00
David Baker 4825ab8fe7 No need to set options in WillStartClient
We can set them any time up to that point
2016-08-03 09:53:02 +01:00
David Baker 0c2bd10594 Comment functions 2016-08-02 19:05:05 +01:00
David Baker 0c61c52480 Just use Lifecycle.setLoggedIn 2016-08-02 19:02:07 +01:00
David Baker d74a8e405d Remove unused function 2016-08-02 19:00:01 +01:00
David Baker 65865f879f We already know we're a guest here 2016-08-02 18:59:09 +01:00
David Baker 40834d188e Don't let pendingEventOrdering be changed 2016-08-02 18:58:18 +01:00
David Baker 77a5384bf8 Comment startMatrixClient 2016-08-02 18:56:12 +01:00
David Baker c2c548ef5a Comment logout 2016-08-02 18:55:13 +01:00
David Baker b9a5f7902b Doc setLoggedIn & remove redundant opts 2016-08-02 18:52:56 +01:00
David Baker 58bbb35096 s/login/setLoggedIn/ 2016-08-02 18:48:27 +01:00
David Baker 3818a89ca3 Comment guestCreds 2016-08-02 18:46:43 +01:00
David Baker 54c10a5d89 Get name of section right 2016-08-02 18:42:02 +01:00
David Baker aafec49abf WIP for deactivaing account UI
https://github.com/vector-im/vector-web/issues/1775
2016-08-02 18:40:12 +01:00
David Baker f431e62e6b Merge pull request #379 from matrix-org/dbkr/direct_chat_include_invited
Include rooms with 1 person invited
2016-08-02 16:11:00 +01:00
David Baker a0b973ffad Syntax fail 2016-08-02 16:07:07 +01:00
David Baker 10f6ecfe5f Include rooms with 1 person invited
If we can't find one with both people joined.
2016-08-02 15:59:28 +01:00
David Baker 3000fae5d8 Oops, uncommit 61e0258 2016-08-02 15:58:21 +01:00
David Baker 61e0258b6f Include rooms with 1 person invited
If we can't find one with both people joined.
2016-08-02 15:55:18 +01:00
Matthew Hodgson 3fc4e92a78 Merge pull request #378 from matrix-org/dbkr/fix_new-direct_chat
Fix 'start new direct chat'
2016-08-02 15:05:11 +01:00
David Baker 05f0d4d166 Fix 'start new direct chat' 2016-08-02 14:55:29 +01:00
wmwragg 2c2f689361 New design for long names 2016-08-02 14:46:47 +01:00
David Baker db9750a7e3 Call the logout API when we log out
Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient.
2016-08-02 14:04:20 +01:00
David Baker f393811171 Merge pull request #376 from matrix-org/rav/messagecomposer_warnings
Fix warnings from MessageComposer
2016-08-02 11:32:00 +01:00
Richard van der Hoff e63a32dc10 Fix warnings from MessageComposer
Fix a couple of warnings from React about required properties not being set.
2016-08-02 11:00:00 +01:00
Matthew Hodgson 1b38398156 Merge pull request #371 from matrix-org/wmwragg/button-updates
New voice and video call buttons
2016-08-01 20:36:56 +01:00
David Baker 89d2a56584 Merge pull request #373 from matrix-org/rav/more_react_warnings
Silence some more react warnings
2016-08-01 17:23:08 +01:00