Commit Graph

12860 Commits

Author SHA1 Message Date
David Baker 020e4e14df Factor out single-invite 2016-08-10 18:32:42 +01:00
David Baker 4a6a9bd95b Remove redundant setState
Duplicated in `finally`
2016-08-10 18:28:20 +01:00
David Baker 54b3638a85 Better support for inviting multiple people
Pasting a list of addresses into the box will now pop up a dialog to confirm and show you the success / failure state of each address. It will also not die if it gets rate limited.

Fixes https://github.com/vector-im/vector-web/issues/1713
2016-08-10 17:11:49 +01:00
wmwragg 6d1eebe6f2 Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly 2016-08-10 17:01:06 +01:00
wmwragg e2d3631e7c Menu colour now changeable, and leave room item hooked up 2016-08-10 16:34:49 +01:00
wmwragg 667264420c hover state elements for the room tag menu, allong with CSS class updates 2016-08-10 14:46:05 +01:00
Richard van der Hoff 8fe470bce1 Cancel calls to rate-limited funcs on unmount
The tests were throwing up warnings about state being accessed, and null
MatrixClients being called, after component unmount.
2016-08-10 13:39:47 +01:00
David Baker b7b0991ae9 Don't show integrations header if setting not on
If the labs setting for integrations was disableds, we still showed
the header for the integrations section but with nothing underneath
it.
2016-08-10 11:51:51 +01:00
David Baker 13a4bfa8fe Merge pull request #396 from matrix-org/rav/fix_react_warning
Hack around a react warning
2016-08-10 10:09:18 +01:00
Richard van der Hoff a1d3db76e5 Hack around a react warning
when login completes, we replace the whole state, which means we unset
collapse_lhs, which then leads to complaints from the RoomList.

I think the 'default view' for MatrixChat ought to be factored out to another
component, which could manage collapse_lhs properly; but for now, hack around
it.
2016-08-09 23:57:36 +01:00
Aviral Dasgupta 09e8a45cde Add EmojiText component for emoji replacement. 2016-08-10 00:31:51 +05:30
Aviral Dasgupta dbbea63227 Various fixes and improvements to emojification.
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Add emoji shortcodes as titles
2016-08-09 22:09:28 +05:30
wmwragg 75e1277961 Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now 2016-08-08 16:55:27 +01:00
wmwragg 5b812fead9 Initial RoomTagContextMenu wired in 2016-08-05 15:48:28 +01:00
David Baker 98e89d4293 Merge pull request #392 from matrix-org/dbkr/scalar
Dbkr/scalar
2016-08-05 15:43:57 +01:00
wmwragg 80e4a99477 Merge branch 'develop' into wmwragg/room-tag-menu 2016-08-05 15:27:14 +01:00
wmwragg 4a46aba0c2 Added new onClick function for the avatar, but not wired in yet, waitin go pull up from develop once previous commits have been merged 2016-08-05 15:24:53 +01:00
Matthew Hodgson 10aa201d33 Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix
Wmwragg/mute mention state fix
2016-08-05 14:44:27 +01:00
Richard van der Hoff ff02c21252 Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze
Fix long freeze when opening 'historical' section
2016-08-05 12:47:01 +01:00
Richard van der Hoff e8dbf978c3 Merge pull request #388 from matrix-org/dbkr/refactor_field_errors
Refactor UI error effects
2016-08-05 12:34:56 +01:00
Matthew Hodgson d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson cf70f1731e hide integration management behind labs checkbox 2016-08-04 23:26:27 +01:00
David Baker 9d958ab508 Fix long freeze when opening 'historical' section
By rate limiting the list update in InviteMemberList as it seems the sync this triggers causes a load of member events.

Fixes https://github.com/vector-im/vector-web/issues/1845
2016-08-04 17:54:00 +01:00
wmwragg 5305cb6785 Copy change to better describe the function 2016-08-04 16:55:52 +01:00
wmwragg 990da61a61 Fixed regression of click propogation 2016-08-04 16:25:09 +01:00
wmwragg d204b043e5 Changed state from mute to mentions only 2016-08-04 16:17:21 +01:00
Richard van der Hoff 0351ab0a3d Merge pull request #381 from matrix-org/dbkr/deactivate_account
Implement account deactivation
2016-08-04 15:38:29 +01:00
Matthew Hodgson 90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
David Baker f7fda68e26 Use p tags instead of brs 2016-08-04 10:53:07 +01:00
David Baker c017e8dcf4 Initialise _passwordField & delete stale comment 2016-08-04 10:51:31 +01:00
David Baker 2d936a2850 Don't leave isRoomPublished as undefined
As this causes react to consider the component uncontrolled and then
warn when we change it to controlled
2016-08-03 18:23:38 +01:00
David Baker 498ad7fa4c Merge branch 'develop' into dbkr/deactivate_account 2016-08-03 17:52:18 +01:00
David Baker 1b39f02141 Merge pull request #335 from aviraldg/feature-composer-emoji
feat: code cleanup & emoji replacement in composer
2016-08-03 16:18:56 +01:00
David Baker 3780d82f6f Merge pull request #386 from matrix-org/rav/default_to_device_id
DevicesPanel: use device_id as a placeholder
2016-08-03 16:12:46 +01:00
David Baker f469bbbb64 Refactor UI error effects
And add error effects to the login page to be consistent with the registration page
2016-08-03 15:59:17 +01:00
Richard van der Hoff 42f6703112 Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys
MemberDeviceInfo: Use the device name, where available
2016-08-03 15:26:37 +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
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
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
Aviral Dasgupta 1f9a396fa5 fix: autocomplete to use tab instead of return 2016-08-03 17:51:40 +05:30
David Baker ffa97a4095 Log out when account is deactivated 2016-08-03 11:47:29 +01:00
David Baker 2f0fd6da05 Actually commit the deactivate account dialog 2016-08-03 11:34:13 +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