Commit graph

3419 commits

Author SHA1 Message Date
wmwragg
c8c2f733e2 Re-calculate sticky header positions when sublist header is clicked 2016-08-26 09:56:07 +01:00
wmwragg
7fcdd0f77a Initial pass at sticky headers for the LHS panel section labels 2016-08-25 19:46:01 +01:00
Richard van der Hoff
c8b2d5106f Merge pull request #430 from matrix-org/rav/fix_search_regression
Fix NPE when we don't know the sender of an event
2016-08-25 19:31:16 +01:00
Richard van der Hoff
96567dad0d Fix NPE when we don't know the sender of an event
Fixes a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/426.

Particularly when we are showing search results, we may not recognise the
sender of an event; attempting to create a MemberAvatar for it will lead to
null-reference errors.

Also a bit of untangling of the logic of needsSenderProfile. Since
https://github.com/matrix-org/matrix-react-sdk/pull/422,
EventTileType.needsSenderProfile was only being called on MessageEvents, and
therefore only returned true. It's a shame to see all this logic going into
EventTile rather than the individual EventTileTypes, but since it's there,
let's not leave the unused logic lying around in the EventTileType
implementations.
2016-08-25 16:55:09 +01:00
Matthew Hodgson
36d8fa9786 fix avatar clicking in memberinfo 2016-08-25 16:20:38 +01:00
Matthew Hodgson
2f0599aae1 Merge pull request #419 from aviraldg/feature-autocomplete-improvements
Update autocomplete design and scroll it correctly
2016-08-24 14:47:22 +01:00
Matthew Hodgson
08c0d7e298 Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation
Added event/info message avatars back in
2016-08-23 17:14:11 +01:00
wmwragg
ae8234ffe3 Added event/info message avatars back in 2016-08-23 15:58:27 +01:00
Kegsay
c10208a203 Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api
Add postMessage API required for integration provisioning
2016-08-23 15:00:44 +01:00
wmwragg
6a4d02ffc5 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 12:49:21 +01:00
wmwragg
c362d4ff01 Added updating of count when room tile notification state changed 2016-08-23 12:40:28 +01:00
Kegan Dougal
9162a0ff01 Add postMessage API required for integration provisioning
Supports querying member state and creating invites only.
2016-08-23 12:00:11 +01:00
wmwragg
6d1f9003e2 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 10:52:50 +01:00
Aviral Dasgupta
884abbd7e9 Cleanup autocomplete 2016-08-23 00:36:31 +05:30
wmwragg
edb7301b37 Moving the drirect messages above rooms 2016-08-22 14:10:51 +01:00
wmwragg
48a2567b82 Merge branch 'develop' into wmwragg/chat-message-presentation 2016-08-19 17:19:30 +01:00
wmwragg
993333490d Removal of the mini avatars for action (info) messages 2016-08-19 16:38:05 +01:00
wmwragg
afd1ab1582 Comment to describe what info messages are 2016-08-18 22:19:23 +01:00
wmwragg
a55c4a2a52 Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message 2016-08-18 21:53:37 +01:00
Richard van der Hoff
e29be619c9 Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work
Make the notification slider work
2016-08-18 15:23:45 +01:00
David Baker
fc2c62e896 We can use the new consts here 2016-08-18 15:19:24 +01:00
David Baker
af48b8920e Various PR feedback 2016-08-18 14:00:14 +01:00
David Baker
9e45279894 Use enumalike thing 2016-08-18 13:44:58 +01:00
David Baker
73e486cc58 Hide red highlight badge in mute mode 2016-08-18 11:58:27 +01:00
David Baker
dd088794c2 Remove the mute toggle from room settings
As it now incorrectly represents the mute as a binary toggle rather than a quad-state
2016-08-17 18:50:34 +01:00
David Baker
87f94bde62 Fix up notification setting listener in roomtile
The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere.

Also add util functions used here for getting the notif state and in vector for both getting and setting it.
2016-08-17 18:26:37 +01:00
Richard van der Hoff
69e8cb6f44 Merge branch 'rav/no_deviceload_if_disabled' into develop 2016-08-17 14:41:18 +01:00
Richard van der Hoff
0356f04b9c MemberInfo: initialise _enableDevices in componentWillMount
... to avoid referencing it in render() before it is set
2016-08-17 14:40:10 +01:00
Aviral Dasgupta
e173900808 Update autocomplete design and scroll it correctly 2016-08-17 17:27:19 +05:30
Richard van der Hoff
30168a1b9c Don't download E2E devices if feature disabled
If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
2016-08-17 09:57:06 +01:00
wmwragg
52f5061cc5 Made the menu button a clickable image rather than an input element 2016-08-16 17:34:33 +01:00
wmwragg
58d9789645 Increase main avatar size 2016-08-16 16:03:34 +01:00
wmwragg
c359358101 Initial context menu positioning and style change 2016-08-16 11:59:26 +01:00
wmwragg
6fd61f5816 Initial reposition of the timestamp 2016-08-16 10:26:27 +01:00
Matthew Hodgson
2a3b0e85ea add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ 2016-08-15 21:37:26 +01:00
David Baker
cb905dbaef Merge pull request #409 from matrix-org/rav/device_panel_stuff
Add device_id to devices display
2016-08-12 10:43:44 +01:00
David Baker
fc0c5a5c58 Tidy up fix to multi-invite 2016-08-12 10:02:55 +01:00
Matthew Hodgson
d1eec57118 fix inviting some more 2016-08-11 17:11:51 -05:00
Matthew Hodgson
3bedad69cd unbreak inviting :( 2016-08-11 17:08:17 -05:00
wmwragg
7713f0d587 refactoring out the direct message section 2016-08-11 17:32:39 +01:00
wmwragg
cc1cec8431 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:48:31 +01:00
wmwragg
a07833e7fc Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:47:19 +01:00
David Baker
109184aab7 Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style
Only show Autocomplete if autocomplete is enabled
2016-08-11 16:47:07 +01:00
wmwragg
4aea2caefc Initial pass at creating a direct message section 2016-08-11 16:45:19 +01:00
David Baker
7cb663d39d Only show Autocomplete if autocomplete is enabled
It was just never used, but it has 1px top border which makes the top border on chat look too big
2016-08-11 16:28:32 +01:00
Richard van der Hoff
55a28564b9 Add device_id to devices display
(it turns out to be quite useful)
2016-08-11 16:24:09 +01:00
Matthew Hodgson
3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu
Wmwragg/room tag menu
2016-08-11 08:59:32 -05:00
David Baker
4780f9000d Merge pull request #403 from matrix-org/dbkr/multi_invite
Better support for inviting multiple people
2016-08-11 12:34:16 +01:00
David Baker
f42d619e7d Missing comma 2016-08-11 12:30:37 +01:00
David Baker
5b71b28dcf Fix member info 2016-08-11 11:34:14 +01:00
David Baker
46899a0086 Merge pull request #395 from aviraldg/fix-emoji
Various fixes and improvements to emojification.
2016-08-11 10:23:00 +01:00
David Baker
806477dcce s/then/done/ 2016-08-11 10:08:14 +01:00
David Baker
a58a6275e5 Just use _canceled
Instead of both that and _unmounted
2016-08-11 10:06:22 +01:00
Aviral Dasgupta
4c1dcb924b reskindex and use sdk.getComponent for EmojiText 2016-08-11 07:55:12 +05:30
David Baker
cab95f43ff Show cancel button whilst inviting is in progress
And make it actually cancel the process.
2016-08-10 18:58:36 +01:00
David Baker
d6f7358f81 Make completionStates an object
So that we can sensibly track the number completed by taking the length of it.
2016-08-10 18:50:56 +01:00
David Baker
fa498eb8c6 Comment typo 2016-08-10 18:37:21 +01:00
David Baker
6b3b2e30fe Don't reset completionStates
We now set them in the constructor
2016-08-10 18:36:33 +01:00
David Baker
b9f0b72ae1 Missing proptypes 2016-08-10 18:35:59 +01:00
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
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
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
Richard van der Hoff
124a816751 Silence some more react warnings
Remove some spurious props which were causing react warnings
2016-08-01 17:10:46 +01:00
Richard van der Hoff
94a44bfec3 Fix warnings emanating from Velociraptor elements
We are no longer allowed to stick random properties on child properties, and
the Velociraptor animations were causing some React warnings.

Move the startStyles and enterTransitionOpts properties up to the Velociraptor
node, and avoid setting arbitrary props on the created children. This is less
flexible, as it assumes that all children will have the same start style;
however, we weren't using the flexibility, and we can always replace the array
with a map or a function or something if we need it in the future.
2016-08-01 16:56:25 +01:00
wmwragg
84583b25e6 New voice and video call buttons 2016-08-01 16:45:27 +01:00
Matthew Hodgson
5b100eeff3 Merge pull request #353 from matrix-org/wmwragg/button-updates
Wmwragg/button updates
2016-08-01 15:42:46 +01:00
Richard van der Hoff
c071bc54f9 Implement device management UI
View/rename/delete.
2016-08-01 13:42:29 +01:00
Richard van der Hoff
9333793a7c Fix code style 2016-08-01 10:49:51 +01:00
wmwragg
d16aa276e2 Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states 2016-07-30 12:52:39 +01:00
wmwragg
398e56c9f9 Fixed bug where the long hover tooltip for a room name show an object rather than the name 2016-07-30 12:28:10 +01:00
wmwragg
cf22a5fecc Merge up from develop 2016-07-30 12:10:43 +01:00
wmwragg
1487c600ee Revert so that the 2016-07-29 17:53:18 +01:00
wmwragg
229664a624 first pass on css re-write 2016-07-29 17:49:42 +01:00
Richard van der Hoff
3194c5c61d Factor EditableTextContainer out of ChangeDisplayName
Take the non-displayname-specific bits out of ChangeDisplayName into a new
EditableTextContainer, so that we can reuse the logic elsewhere.
2016-07-29 17:40:13 +01:00
wmwragg
38f504bdcb Hide tooltip when badge clicked and collapsed 2016-07-29 11:10:16 +01:00
wmwragg
5889beacf3 Mute state now handled correctly 2016-07-28 17:24:58 +01:00
wmwragg
867b14d2ca Reposition context menu now that the styling is final 2016-07-27 18:14:46 +01:00
wmwragg
46a643ac38 Now the text spaceing is correct need to align cheveron 2016-07-27 18:10:45 +01:00
wmwragg
8246d9148c Initial context menu with all it's elements 2016-07-27 17:43:48 +01:00
Richard van der Hoff
88be2827fd Merge pull request #367 from matrix-org/rav/remove_bad_props
Stop the Avatar classes setting properties on <span>s
2016-07-27 16:22:31 +01:00
wmwragg
6e7e091117 Refactor so that chevron and menu can be positioned independantly 2016-07-27 16:09:07 +01:00
Richard van der Hoff
39ae8c6e46 formatting
PR feedback
2016-07-27 15:41:24 +01:00
wmwragg
0660b9feff Fixes to properly point to the moved components 2016-07-27 14:49:10 +01:00
wmwragg
3df746ef14 Revert merge up from develop 2016-07-27 14:16:17 +01:00
wmwragg
6d141d1a7b Only allow none guests to access the context menu 2016-07-27 11:58:40 +01:00
Richard van der Hoff
1a600b0674 Stop the Avatar classes setting properties on <span>s
React apparently now checks the properties which are set on DOM elements, and
grumbles noisily about unexpected ones. Update BaseAvatar and RoomAvatar so
that they don't set unrelated properties on the DOM elements.
2016-07-27 11:38:04 +01:00
Richard van der Hoff
c8df9148b3 Remove relayoutOnUpdate prop on gemini-scrollbar
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:35:48 +01:00
wmwragg
4b26ac58af Re-modularised the context menus 2016-07-27 10:41:24 +01:00
wmwragg
dca4702b7b Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage 2016-07-27 09:51:50 +01:00
wmwragg
477a17b49f Removed debug statement 2016-07-26 10:39:34 +01:00
wmwragg
9c9c5ec458 Menu context dohickey now sticks when menu shown 2016-07-25 17:18:45 +01:00
wmwragg
a218b4e8a3 Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
# resolved Conflicts:
#	src/components/views/rooms/RoomTile.js
2016-07-25 17:04:37 +01:00
wmwragg
8b8486a8d0 Move from +99 to 99+ for more than 99 messages 2016-07-25 14:39:15 +01:00
wmwragg
a69107f4f1 Trying to get the context menu dohicky to stick when menu open 2016-07-25 10:58:43 +01:00
Aviral Dasgupta
b7555f49ea Merge branch 'develop' into feature-composer-emoji 2016-07-23 19:15:06 +05:30
wmwragg
c89904bc25 Initial unstyled mentions state notifier context menu 2016-07-22 17:30:31 +01:00
David Baker
b07e50d418 Fix 'start chat' button on MemberInfo
this/self fail & related scoping

Fixes https://github.com/vector-im/vector-web/issues/1844
2016-07-22 17:30:25 +01:00
wmwragg
9b318e8f61 Getting the corrct height for the placing the context menu 2016-07-22 16:12:20 +01:00
wmwragg
e4dd6c8dbe Browser tooltip being used instead of the HTML styled one. 2016-07-22 15:15:24 +01:00
wmwragg
6984a55b11 The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown 2016-07-22 14:58:09 +01:00
wmwragg
ca75d93434 Tweaked the offset for the tooltip so that it is next to the element it is tipping 2016-07-22 11:31:26 +01:00
wmwragg
5d4b03c1f4 Put back clicking on the name to acces the room 2016-07-22 11:28:11 +01:00
wmwragg
3dd83922f1 Tooltip positioning tweaked 2016-07-22 11:12:11 +01:00
wmwragg
922bb0f402 +99 badge when notifications are greater the 99 2016-07-21 18:50:07 +01:00
wmwragg
762873350a Badge dohickey shown on name hover and badge hover 2016-07-21 18:20:12 +01:00
wmwragg
4013ea75d0 Testing out the context menu 2016-07-21 17:44:31 +01:00
wmwragg
775fc97102 Slight refactor to better match current code 2016-07-21 14:33:54 +01:00
Matthew Hodgson
9babf3f92f Merge pull request #357 from matrix-org/wmwragg/mention-state-indicator-round-2
Wmwragg/mention state indicator round 2
2016-07-20 18:01:59 +01:00
wmwragg
ffa43ebb96 badge content when hovered is now kerned via the CSS 2016-07-20 17:12:41 +01:00
David Baker
fb964be072 Merge pull request #356 from matrix-org/matthew/disable-url-previews
Support for disabling/enabling URL previews per-user, per-room and per-user-per-room
2016-07-20 16:43:08 +01:00
wmwragg
33edb1dea9 Made the badge always exist, but if no unread mesasges available then has a different class 2016-07-20 12:47:32 +01:00
Matthew Hodgson
1365f18829 many stupid thinkos and bugfixes; make it work 2016-07-20 12:03:13 +01:00
David Baker
d6df3682f2 Fix enourmous video bug 2016-07-20 11:58:49 +01:00
David Baker
514bc2cd51 Merge pull request #341 from matrix-org/dbkr/tab_complete_most_recently_spoke
Order tab complete by most recently spoke
2016-07-19 18:02:09 +01:00
Matthew Hodgson
c1fd2f888f Merge pull request #352 from matrix-org/wmwragg/mention-state-indicator
Now showing three dots when hovering over the badge
2016-07-19 11:12:42 +01:00
wmwragg
9e4511b8eb Now showing three dots when hovering over the badge 2016-07-18 16:10:07 +01:00
David Baker
ffaf7f44f3 typos 2016-07-18 15:36:19 +01:00
David Baker
743f79a9a7 Fix unpublishing room in room settings
Fixes https://github.com/vector-im/vector-web/issues/1743
2016-07-18 15:22:08 +01:00
David Baker
2b7ade9ef5 Merge pull request #347 from matrix-org/matthew/fix-race-on-new-room-invitelist
Fix race when creating rooms where invite list can be blank
2016-07-18 10:37:05 +01:00
David Baker
37402c0071 Merge pull request #348 from matrix-org/matthew/improve-start-chat-wording
improve wording of MemberInfo's start chat button.
2016-07-18 10:34:37 +01:00
Matthew Hodgson
ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +01:00
Matthew Hodgson
8d749be51f fix potential bug where canonical alias setting is broken (modulo autoheisting) 2016-07-17 20:36:53 +01:00
Matthew Hodgson
554a6ff035 improve wording of MemberInfo's start chat button. Fixes https://github.com/vector-im/vector-web/issues/689 and clarifies https://github.com/matrix-org/matrix-react-sdk/issues/328 2016-07-17 19:41:53 +01:00
Matthew Hodgson
999c52b650 fix comment 2016-07-17 19:00:22 +01:00
Matthew Hodgson
0553d806d7 stop re-invites 2016-07-17 18:40:54 +01:00
Matthew Hodgson
2bc9dd4307 hopefully fix vector-im/vector-web#1813 2016-07-17 18:32:48 +01:00
Matthew Hodgson
bfe50c209c fix typo in comment 2016-07-16 22:49:42 +01:00
Matthew Hodgson
a61168d943 Revert "Amends react template and removes opening image in lightbox" 2016-07-15 16:54:56 +01:00
David Baker
d5bed78a54 Rejig tab complete to make it faster
Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView.
2016-07-15 16:10:27 +01:00
Matthew Hodgson
ca5987bf6c Merge pull request #345 from matrix-org/wmwragg/modal-restyle
Wmwragg/modal restyle
2016-07-15 14:05:22 +01:00
Matthew Hodgson
78b7d04710 Merge pull request #343 from ribot/feature-inline-link-preview
Amends react template and removes opening image in lightbox
2016-07-15 13:55:07 +01:00
wmwragg
febd2110c5 Updated all dialogs to define their primary button, I've selected the one that had been specified for focus, but the primary button isn't dependent on focus, it's a UX feature 2016-07-15 11:23:58 +01:00
Richard van der Hoff
8144b894f7 Merge pull request #344 from matrix-org/dbkr/remove_initial_memberlist_load_hack
Remove the member list loading hack
2016-07-14 18:50:52 +01:00
David Baker
3abdb83d16 Remove now-unused limit param to roomMembers() 2016-07-14 18:40:43 +01:00
David Baker
743cb4b777 Remove the member list loading hack
Now the memberlist os a truncated list it at-best makes no difference and may be marginally slowing us down.
2016-07-14 18:37:57 +01:00
David Baker
9fd0ea1e32 More variable case 2016-07-14 18:18:44 +01:00
David Baker
2fd690ea2b Oops, removed the pure offline class 2016-07-14 18:13:54 +01:00
David Baker
7c1b4f4fc9 Obey my own code style 2016-07-14 18:13:15 +01:00
David Baker
a49a545161 CSS classes to colour offline users differently
So we can use the same 66% opacity as idle tiles for offline-with-last-active-time to reduce the visual jarring
2016-07-14 17:41:07 +01:00
Stefan Pearson
cad057ef34 amends react template and removes opening image in lightbox 2016-07-14 17:12:17 +01:00
wmwragg
fd5d28768a Simplification of the css 2016-07-14 12:05:00 +01:00
wmwragg
f6302fc990 Updated the search button, and simplified the leave css 2016-07-14 11:43:33 +01:00
David Baker
2d6d734571 Listen for the new lastPreseceTs event
This will catch all presence events as previously we were only listening for the actual presence string changing
2016-07-14 10:05:40 +01:00
wmwragg
7f00053f84 Footer upload icon updated to new vesrion 2016-07-13 17:46:56 +01:00
wmwragg
936a38a9f4 Updated and moved the room header settings icon 2016-07-13 16:02:18 +01:00
David Baker
6b03f72474 Fix filtering user list by ID
Fixes https://github.com/vector-im/vector-web/issues/1739
2016-07-13 11:56:01 +01:00
Aviral Dasgupta
b334522168 feat: code cleanup & emoji replacement in composer 2016-07-08 12:54:28 +05:30
David Baker
345ed04ba9 Less enetering 2016-07-07 13:03:27 +01:00
David Baker
5c879d786e Doc the default params / guestUsername props 2016-07-07 11:23:08 +01:00
David Baker
e2c473b366 Error on registration if email taken
Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername.
2016-07-06 15:22:06 +01:00
David Baker
63ad57a8d4 Merge pull request #332 from aviraldg/feature-emojione
feat: render unicode emoji as emojione images
2016-07-05 10:18:33 +01:00
Aviral Dasgupta
6a133bc034 feat: and emojify name in MemberInfo 2016-07-05 10:24:18 +05:30
Aviral Dasgupta
020f1f4320 feat: emojify ALL THE THINGS! 2016-07-05 10:16:17 +05:30
Aviral Dasgupta
22a2593bf2 fix: unbreak old MessageComposerInput/TabComplete 2016-07-05 01:32:40 +05:30
Aviral Dasgupta
73b726e5fb feat: import only flatMap from lodash 2016-07-04 21:56:09 +05:30
Aviral Dasgupta
30b7efd585 fix: code cleanup, fix getCurrentCommand 2016-07-04 21:44:35 +05:30
Aviral Dasgupta
cccc58b47f feat: implement autocomplete replacement 2016-07-03 22:15:13 +05:30
Aviral Dasgupta
8961c87cf9 feat: Autocomplete selection wraparound 2016-07-03 01:11:34 +05:30
Aviral Dasgupta
cd928fe6f5 Merge remote-tracking branch 'upstream/develop' into feature-autocomplete 2016-07-03 00:00:02 +05:30
Richard van der Hoff
a671e07da7 Merge pull request #326 from matrix-org/dbkr/fix_user_links
Fix user links
2016-06-30 17:43:08 +01:00
Richard van der Hoff
ce39822957 Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist
Fix ordering of Memberlist
2016-06-29 10:21:15 +01:00
theworldbright
7609b9eba8 Simplify logic for timestamp ordering of memberlist 2016-06-29 17:45:24 +09:00
theworldbright
b3d871aa6a Add back comment 2016-06-29 17:33:41 +09:00
theworldbright
69cb0a8f1c Switch ordering of Idle users 2016-06-29 17:08:17 +09:00
theworldbright
72a1d5a0de Remove unused comments 2016-06-29 16:58:08 +09:00
theworldbright
174caceabf Use lastActiveAgo to reorder member list 2016-06-29 16:57:59 +09:00
David Baker
ba47c5a198 Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links 2016-06-28 17:15:17 +01:00
David Baker
e8337b2119 More PR feedback 2016-06-28 17:11:47 +01:00
David Baker
548c392236 PR feedback 2016-06-28 14:59:45 +01:00
David Baker
c016eb78c8 Fix user links
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
2016-06-28 14:28:05 +01:00
David Baker
98c03869a7 Display an error message if room not found
Fixes https://github.com/vector-im/vector-web/issues/1012
2016-06-24 15:34:07 +01:00
Richard van der Hoff
a1dd427420 Implement device blocking
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146. It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.

Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
2016-06-23 17:30:04 +01:00
Richard van der Hoff
cdaf317f1d Merge pull request #321 from matrix-org/rav/encrypt_room_setting
RoomSettings: add encryption setting
2016-06-23 13:40:30 +01:00
Richard van der Hoff
3a21958faf RoomSettings: add encryption setting
Add a knob to RoomSettings which will send the appropriate event to enable
encryption in the room.
2016-06-23 12:21:31 +01:00
Richard van der Hoff
7a7d7c0e02 Fix a pair of warnings from RoomSettings
- initialise the 'publish' checkbox correctly so react doesn't grumble about it
  turning from uncontrolled into controlled

- PowerSelector's 'controlled' property isn't really required, so mark it as
  such.
2016-06-23 11:15:55 +01:00
Richard van der Hoff
a04f03669c RoomSettings: refactor permissions calculations
The logic for calculating who had permission for what was impenetrable (and
wrong, in parts), so rewrite it to be a bit clearer.
2016-06-23 10:36:16 +01:00
Aviral Dasgupta
a74db3a815 Get basic keyboard selection working 2016-06-21 18:33:39 +05:30
Aviral Dasgupta
fb6eec0f7d Hide/show autocomplete based on selection state 2016-06-21 15:46:20 +05:30
Aviral Dasgupta
442291c0a4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete 2016-06-21 04:09:22 +05:30
Aviral Dasgupta
4af983ed90 Style changes and improvements in autocomplete 2016-06-20 13:52:55 +05:30
Matthew Hodgson
94aec10512 Merge branch 'develop' into dbkr/scalar 2016-06-19 22:40:48 +01:00
Richard van der Hoff
ad00abe9c0 Support for making devices unverified
Because its useful for testing

Requires support from js-sdk, and (ideally) css from vector-web
2016-06-17 16:24:23 +01:00
Aviral Dasgupta
b9d7743e5a Emoji provider, DDG working, style improvements 2016-06-17 04:58:09 +05:30
Aviral Dasgupta
769b3f0c2a Merge branch 'develop' into feature-autocomplete 2016-06-17 00:37:39 +05:30
Aviral Dasgupta
8b1332cd29 Use different keys for new MessageComposerInput 2016-06-16 14:46:09 +05:30
Aviral Dasgupta
3f1b57b35b Fix cursor bug, persist editor mode & rte default 2016-06-15 00:13:34 +05:30
David Baker
5199cd04a2 Merge pull request #292 from aviraldg/feature-rte
Rich Text Editor
2016-06-14 15:27:39 +01:00
Aviral Dasgupta
ba69e4365d more RTE fixes 2016-06-14 19:28:51 +05:30
Aviral Dasgupta
8cb086ef31 use constants for keycodes in RTE 2016-06-14 19:14:09 +05:30
Richard van der Hoff
e973d18085 Hide e2e features if not enabled
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
Aviral Dasgupta
34be17cc7e use rte labs setting 2016-06-14 00:10:43 +05:30
Aviral Dasgupta
4bc8ec3e6d room, user, ddg autocomplete providers (wip) 2016-06-12 17:02:46 +05:30
Aviral Dasgupta
0df201c483 Merge branch 'develop' into feature-autocomplete 2016-06-12 14:10:23 +05:30
Pedro Ferreira
8f45f168d5 Fix highlighting behaviour on switch
Hopefully made the code a little bit clearer.
2016-06-12 01:08:31 +02:00
Pedro Ferreira
a5a3e4e915 Basic Markdown highlighting 2016-06-12 01:07:16 +02:00
Aviral Dasgupta
c0d7629980 get /commands working again 2016-06-12 00:11:27 +05:30
Aviral Dasgupta
b960d220d2 cleanup, better comments, markdown hotkeys 2016-06-11 22:24:09 +05:30
Aviral Dasgupta
e4217c3fb7 rte improvements, markdown mode 2016-06-11 15:52:08 +05:30
Aviral Dasgupta
bf8e56e04c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte 2016-06-10 04:43:44 +05:30
Aviral Dasgupta
4e0720db12 Fix MessageComposerInput.setLastTextEntry 2016-06-10 00:03:40 +05:30
Aviral Dasgupta
29cdd1fc41 user and room decorators, history & typing notifs 2016-06-09 23:53:09 +05:30
David Baker
049e3a968b Merge pull request #303 from matrix-org/rav/factor_out_createroom
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
Richard van der Hoff
de36aa63fb Factor out common parts of room creation
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
Richard van der Hoff
2352661513 MemberInfo: remove spinner if device query fails
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
2016-06-09 10:57:19 +01:00
Richard van der Hoff
85770feb31 device verification: use a js-sdk event
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
Richard van der Hoff
7ce49c752f Wire up events to update UI on device verification
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
Richard van der Hoff
1616431d27 EventTile: add classes to indicate verifiedness
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
2016-06-08 17:02:42 +01:00
Richard van der Hoff
f3e66e6fd2 Add device info to member info
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00
David Baker
aca0e060a4 Also change velocity-vector commit & requires
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
2016-06-07 20:47:37 +01:00
David Baker
d5a522fdfe Second attempt at fixing the Velocity memory leak
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
2016-06-07 18:22:01 +01:00
David Baker
15dccd9871 Handle errors with scalar-oauthing
Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error).
2016-06-06 17:55:45 +01:00
David Baker
fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-06-06 17:19:38 +01:00
Matthew Hodgson
f8b3128645 invite input box wording for amandine 2016-06-02 23:33:55 +01:00
Matthew Hodgson
1b3c8481f6 fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged 2016-06-02 21:07:47 +01:00
Matthew Hodgson
532e93d7cb fix up trailing whitespace and put the buttons in the right order 2016-06-02 21:07:04 +01:00
Matthew Hodgson
487f3c72dd fix new 3pid invite UI 2016-06-02 16:59:44 +01:00
Matthew Hodgson
3b34311e05 implement new UX for 3pid invites 2016-06-01 23:42:34 +01:00
Matthew Hodgson
0747ca3923 ignore @ prefixes when sorting memberlist 2016-06-01 14:00:20 +01:00
Aviral Dasgupta
b979a16199 initial version of autocomplete 2016-06-01 16:54:21 +05:30
Matthew Hodgson
272afe39dc do not list rooms by default 2016-06-01 02:03:53 +01:00
Matthew Hodgson
c3fc76cdaa warn guests to register nicely to upload files 2016-05-31 23:59:36 +01:00
Matthew Hodgson
2662ca36f9 fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?! 2016-05-31 23:50:47 +01:00
Matthew Hodgson
b74d690035 Merge pull request #290 from matrix-org/matthew/multipreview
multiple URL preview support
2016-05-31 19:42:21 +01:00
Matthew Hodgson
b3638f9169 PR review 2016-05-31 19:42:00 +01:00
Aviral Dasgupta
96526c22c5 Merge branch 'develop' into feature-rte 2016-05-29 20:50:33 +05:30
Aviral Dasgupta
fe76eb9f73 minor improvements
- use <p> for unstyled blocks
- fix return key bug
- editor placeholder
2016-05-28 12:02:35 +05:30
Matthew Hodgson
d5e6e961fd fix url previews firing incorrectly on Matrix.org 2016-05-27 10:09:17 +01:00
Aviral Dasgupta
001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
Matthew Hodgson
39a3d6fdd4 multiple URL preview support 2016-05-24 00:54:20 +01:00
Matthew Hodgson
5835948a3d ignore @ prefixes when sorting memberlist 2016-05-19 23:00:28 +01:00
Matthew Hodgson
c38c57df1e put integrations manager into a modal 2016-05-19 14:12:08 +01:00
Matthew Hodgson
be5f29d03b Merge branch 'develop' into dbkr/scalar 2016-05-17 20:37:16 +01:00
Matthew Hodgson
fd09d5c570 switch badge count to per-conversation, and add per-room badges 2016-05-17 11:14:12 +01:00
David Baker
75979786fc Call it scalar_token for consistency 2016-05-06 15:06:23 +01:00
David Baker
bb9316edfa Pass the room id to scalar 2016-05-06 14:42:00 +01:00
David Baker
6da4b9d671 Add suport for showing the scalar UI 2016-05-06 14:19:56 +01:00
Matthew Hodgson
3cf12f8626 fix typo 2016-04-28 15:43:42 +01:00
Richard van der Hoff
ca0c697b6e Avoid rerendering during Room unmount
might speed up room changing by a few milliseconds
2016-04-22 17:06:53 +01:00
Matthew Hodgson
d72d9260d4 Merge pull request #284 from matrix-org/matthew/hide_preview_heuristics
add heuristics to hide URL previews...
2016-04-21 18:54:34 +01:00
Matthew Hodgson
4d399a3640 Refactor out isLinkPreviewable 2016-04-21 18:00:39 +01:00
Matthew Hodgson
ee11838537 fix comment paren 2016-04-21 17:19:24 +01:00
Matthew Hodgson
c5a76dec1c add heuristics to hide URL previews other than for URLs where the user has explicitly identified the target as a link: i.e. by including a URI scheme prefix, or by including URI path components, or by doing an explicit markdown hyperlink. ignore previews of URLs within pre or code blocks 2016-04-21 17:14:27 +01:00
Richard van der Hoff
fa34dee091 Rewrite Read-receipt animation
... hopefully fixing https://github.com/vector-im/vector-web/issues/1437 in the
process.

The idea here is that, when we remove a read-receipt from the DOM, we stash its
position in a map. Then, when the read-receipt appears again attached to
another event, we know where to start the transition.
2016-04-20 23:06:53 +01:00
Richard van der Hoff
d953ac4e6b Don't relayout scrollpanels every time something changes
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:25:19 +01:00
Richard van der Hoff
dcd81da856 Fix test failures introduced by last PR 2016-04-19 21:10:23 +01:00
Richard van der Hoff
568e7aef8b Avoid rerendering EventTiles when not necessary
Each individual eventtile isn't particularly expensive, but when you have 500
of them, they start adding up. Shuffle some of the stuff into MessagePanel, so
that we can shouldComponentUpdate EventTiles properly.
2016-04-19 19:41:43 +01:00
Richard van der Hoff
683faf571f Fix syntax error which prevented build
Remove a spurious } which was introduced in PR #275
2016-04-19 13:32:14 +01:00
Matthew Hodgson
8517b6558b Merge pull request #275 from matrix-org/matthew/memberlist-sort
Fix many thinkos in sorting the MemberList
2016-04-18 19:15:20 +01:00
Richard van der Hoff
7b405d0d9c Don't setState after unmounting a component
Fix a warning which happens if a LinkPreviewWidget is unmounted before the
preview request completes.

Also add missing .done to promise chain
2016-04-18 14:52:41 +01:00
Matthew Hodgson
a95c45eb96 final(?) PR fixes 2016-04-18 14:48:55 +01:00
Matthew Hodgson
60f92fd15b PR feedback 2016-04-18 14:07:20 +01:00
Matthew Hodgson
b2d0950a46 oops, remove debug logging 2016-04-18 01:45:46 +01:00
Matthew Hodgson
b949e78683 Improve ordering of memberlist by absolutizing lastActive correctly
Change ordering of memberlist to not try to compare lastActive of 'currentlyActive' users, as lastActive may will be a complete lie as it only gets updated when currentlyActive transitions to false (i think?)
Remove order by online/idle/offline in favour of "currently active, ordered by power and then alphabetic name, followed by last active, followed by offline"
Add commented-out code to track last-spoken-within-a-room ordering.
Fix kludges due to SYJS-28 (depends on JS PR landing)
2016-04-18 01:35:40 +01:00
Richard van der Hoff
716eb1eb1b Drop workaround for object.onLoad
https://github.com/facebook/react/pull/5781 has been fixed in React 15.0, so
drop our workaroud for it.
2016-04-17 21:46:27 +01:00
Richard van der Hoff
336d91dadb Merge pull request #272 from matrix-org/rav/fix_roomname
Make sure that we update the room name
2016-04-17 18:12:18 +01:00
Matthew Hodgson
f4573bae49 remove premie optimisation of tintablesvg shouldComponentUpdate 2016-04-17 00:28:20 +01:00
Matthew Hodgson
8db14bde60 switch Tinter from using dispatch to a synchronous update when changing the colourscheme, to avoid CSS getting out of sync with SVG colours 2016-04-16 01:00:10 +01:00
Matthew Hodgson
4fb31662e1 fix tooltip offset 2016-04-15 22:24:12 +01:00
Matthew Hodgson
19770563f4 add cancelButton to simpleHeader 2016-04-15 22:16:19 +01:00
Matthew Hodgson
009781dac7 prep for RightPanel full collapse 2016-04-15 18:45:40 +01:00
Matthew Hodgson
a06b420942 wire up searchbox filtering 2016-04-15 17:55:00 +01:00
Matthew Hodgson
7c8d7e5361 move memberlist bottom into rightpanel 2016-04-15 15:53:14 +01:00
Richard van der Hoff
8680afe46f Make sure that we update the room name
It turns out that RoomState.events is fired before Room.name is updated; make
sure that we pick up the latter and do the update.
2016-04-15 10:01:39 +01:00
Matthew Hodgson
26f135c7b0 fix 'undefined' class bug on TintableSvg 2016-04-14 21:44:05 +01:00
Matthew Hodgson
2d71d4422e make selected room more skinnable 2016-04-14 21:11:10 +01:00
Matthew Hodgson
81d5e16225 fix @aviraldg thinko on needing a key on arrays :) 2016-04-14 19:11:09 +01:00
Matthew Hodgson
21fd5078f9 fix NPE on getEventTileOps 2016-04-14 17:39:45 +01:00
Richard van der Hoff
3fd9b29422 Merge pull request #271 from matrix-org/rav/avoid_codepoint_at
Hack around absence of String.codePointAt on PhantomJS
2016-04-13 16:37:00 +01:00
Richard van der Hoff
5706a879d0 Hack around absence of String.codePointAt on PhantomJS
I've been trying to get some tests working under PhantomJS, which appears not
to support String.codePointAt (which is, to be fair, an ES6 addition). For our
limited usecase, it's easier to implement the functionality from first
principles than to try to polyfill support.
2016-04-13 10:35:07 +01:00
Matthew Hodgson
f3793b556e fix super-annoying key warning from react 2016-04-13 02:02:55 +01:00
Matthew Hodgson
92f58b6927 don't try to do preview URLs of matrix IDs (yet :D) 2016-04-13 01:54:06 +01:00
Matthew Hodgson
4b1ff51a42 show a spinner on MemberInfo when updating a member. and label 'disinvite' correctly 2016-04-13 01:46:10 +01:00
Matthew Hodgson
bfec6d4ed9 merge aviral's audio player 2016-04-13 00:00:24 +01:00
Matthew Hodgson
6a6739e0f3 fix context menu on tiles without widgets 2016-04-12 18:32:55 +01:00
Matthew Hodgson
a01e6d46b9 Merge pull request #268 from matrix-org/matthew/fadable
make the UI fadable to help with decluttering
2016-04-12 18:05:10 +01:00
Matthew Hodgson
3a2d5c4ba5 spinner on saving room settings 2016-04-12 18:01:49 +01:00
Matthew Hodgson
11f3d5f993 make the UI fadable to help with decluttering 2016-04-12 17:18:32 +01:00
Matthew Hodgson
1d5f234f2c add 'mark all read' button 2016-04-12 14:29:36 +01:00
Matthew Hodgson
089963b4c7 timestamps are permalinks 2016-04-12 13:33:59 +01:00
Matthew Hodgson
f9785f68af filter out conference bots from membership list 2016-04-12 01:54:51 +01:00
Matthew Hodgson
bf1e0da598 fix ability to save room settings if you don't have ops 2016-04-12 01:27:12 +01:00
Matthew Hodgson
9845e5ef0e move all the localstorage crap to TextualBody 2016-04-11 23:53:36 +01:00
Matthew Hodgson
6c372d37f7 add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback 2016-04-08 21:42:29 +01:00
Matthew Hodgson
4abc5d0d36 add comment 2016-04-08 20:21:12 +01:00
Matthew Hodgson
1d8b08040e incorporate PR feedback 2016-04-07 18:58:50 +01:00
Matthew Hodgson
7884c13d0d Merge branch 'develop' into matthew/preview_urls 2016-04-07 17:25:48 +01:00
Richard van der Hoff
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
Matthew Hodgson
1de4e0d2dd label previews with the target URL if all else fails 2016-04-04 01:06:54 +01:00
Matthew Hodgson
96b0f42db2 support lightboxes for image previews 2016-04-04 00:18:18 +01:00
Matthew Hodgson
0eb7b627fc ugly impl to track whether to hide the widget or not 2016-04-03 23:30:48 +01:00
Matthew Hodgson
e61c99f7f3 support cancelling previews 2016-04-03 02:50:36 +01:00
Matthew Hodgson
f9c914c40e specify timestamps for historical previews 2016-04-03 01:21:56 +01:00
Matthew Hodgson
f195d2eb24 Merge branch 'develop' into matthew/preview_urls 2016-04-03 01:10:33 +01:00
Matthew Hodgson
2d289b321d Merge branch 'develop' into matthew/preview_urls 2016-04-03 01:09:50 +01:00
Matthew Hodgson
2d3a237101 Merge pull request #258 from aviraldg/fix-219
File upload improvements
2016-04-02 23:07:50 +01:00
Aviral Dasgupta
0574a28e36 Add confirmation dialog for file upload
fixes vector-im/vector-web#92
2016-04-03 02:22:05 +05:30
Aviral Dasgupta
0eeaac88b4 Allow multiple files to be uploaded at once
fixes vector-im/vector-web#219
2016-04-03 01:26:50 +05:30
Aviral Dasgupta
31e09ebe63 Show full-size avatar on MemberInfo avatar click
fixes vector-im/vector-web#65
2016-04-03 00:54:23 +05:30
Matthew Hodgson
bffb482133 add FIXME 2016-04-02 02:46:19 +01:00
Matthew Hodgson
4388334e30 fix up scroll behaviour when loading widgets 2016-04-02 00:36:19 +01:00
Matthew Hodgson
62d04c38ef fix typo and add linkify descriptions 2016-04-01 02:23:29 +01:00
Matthew Hodgson
4d959fc33b improve layout and make thumbnails work 2016-04-01 02:16:11 +01:00
Matthew Hodgson
e6842eab94 WIP url previewing 2016-03-31 18:38:01 +01:00
Matthew Hodgson
f6f86958f5 tweak room settings wording 2016-03-31 14:20:50 +01:00
Matthew Hodgson
4380308393 my node choked on this trailing , 2016-03-30 01:31:29 +01:00
Richard van der Hoff
49e75b7430 Merge pull request #252 from matrix-org/rav/RoomHeader
Refactor RoomHeader, and fix topic updates
2016-03-29 23:25:54 +01:00
Richard van der Hoff
1f2ba87ff5 Pass SimpleRoomHeader title in as a named property
... rather than a child
2016-03-29 23:21:17 +01:00
Richard van der Hoff
0d261c37c2 Update room header when room state changes
Force an update so that we see the latest state.

Fixes https://github.com/vector-im/vector-web/issues/1299
2016-03-29 16:31:13 +01:00
Richard van der Hoff
6422f7ecc8 Factor out separate RoomNameEditor and RoomTopicEditor components 2016-03-29 15:21:16 +01:00
Richard van der Hoff
abedb05268 Merge pull request #250 from matrix-org/rav/disable_composer_if_no_permission
Disable the message composer if we don't have permission to post
2016-03-29 15:15:58 +01:00
Richard van der Hoff
70133ae661 Factor out SimpleRoomHeader
Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader.
2016-03-29 12:51:46 +01:00
Matthew Hodgson
e068a92cde Merge pull request #248 from matrix-org/matthew/fix-image-load-popping
Fix scroll offset popping around during image load by putting explicit height back on images
2016-03-29 00:48:31 +01:00
Matthew Hodgson
0a2678b917 Add warning if fixupHeight fails, and remove overzealous logging 2016-03-29 00:46:51 +01:00
Matthew Hodgson
a3dcd24e4a fix event-recycling bug and mend history viz changes 2016-03-25 01:12:16 +00:00
Richard van der Hoff
c227b2279b Minor fixes to image sizing
* use string refs instead of callback funcs
* Add a null-guard in case we don't have an image
2016-03-24 16:58:27 +00:00
Richard van der Hoff
cbf5b0eca3 Disable the message composer if we don't have permission to post
Rehashes dave's earlier PR which did the same thing
2016-03-24 13:57:21 +00:00
Richard van der Hoff
6ff41c40b6 Split a textinput component out of MessageComposer
Split the text entry section out of MessageComposer: it has a lot of stuff
which won't be needed if we disable input
2016-03-24 11:25:41 +00:00
Matthew Hodgson
5bd0303dda make it work, seemingly 2016-03-24 01:12:51 +00:00
Matthew Hodgson
151a9994ba WIP fix for image load popping 2016-03-24 00:13:32 +00:00
Matthew Hodgson
b81d901919 fix spinner when cancelling start chat from memberinfo 2016-03-23 18:17:49 +00:00
David Baker
e20c599273 Swap register & cancel buttons for matthew 2016-03-23 11:48:47 +00:00
Matthew Hodgson
c4eabe2eb4 hopefully fix https://github.com/vector-im/vector-web/issues/1242 2016-03-23 11:41:10 +00:00
David Baker
abe4df5f1c Merge pull request #243 from matrix-org/dbkr/error_messages
Add better user-facing error messages
2016-03-22 17:41:00 +00:00
David Baker
4e9c37c069 Remove unused prop 2016-03-22 17:23:46 +00:00
David Baker
7f6eabe657 Fix doc for NeedToRegisterDialog and the place I copied it from 2016-03-22 17:20:22 +00:00
Matthew Hodgson
e23f496dfe fix PowerSelector to support both controlled & uncontrolled variants 2016-03-22 17:17:46 +00:00
David Baker
88aa975271 Sensible error message if we can't invite because we're not allowed 2016-03-22 16:33:39 +00:00
David Baker
098f3e6561 Merge remote-tracking branch 'origin/develop' into dbkr/error_messages 2016-03-22 13:54:31 +00:00
Matthew Hodgson
c60a305284 oops, unbreak tags in roomsettings 2016-03-22 13:47:38 +00:00
David Baker
463212fb2a Update error message 2016-03-22 13:19:29 +00:00
David Baker
6dce555865 Sensible error for setting room colours if you're a guest 2016-03-22 13:09:19 +00:00
David Baker
e311a963c1 Merge remote-tracking branch 'origin/develop' into dbkr/error_messages 2016-03-22 12:59:14 +00:00
David Baker
30b76d372c Error messages for guests creating rooms 2016-03-22 12:58:12 +00:00
Matthew Hodgson
385e1ca1fb only let people add aliases if they canSeetAliases 2016-03-22 12:54:08 +00:00
Matthew Hodgson
80416fe583 prettify tag ui 2016-03-22 12:51:11 +00:00
David Baker
45dd192309 Merge remote-tracking branch 'origin/develop' into dbkr/error_messages 2016-03-22 12:48:13 +00:00
Matthew Hodgson
5a2a2c5bdc fix up and factor out mayChangeRoomAccess and fix review feedback 2016-03-22 12:26:38 +00:00
Matthew Hodgson
df905cfcb7 incorporate PR review, and explicitly spell out if the room has ended up with guest_access=forbidden but join_rules=invite 2016-03-22 12:10:58 +00:00
David Baker
5f1fabd982 Error message #1: guests can't invite people. Also add a dialog box for telling people they need to register. 2016-03-22 10:57:05 +00:00
Matthew Hodgson
8cfb0e9ef4 rework roomsettings for new visibility UI 2016-03-22 00:57:40 +00:00
Matthew Hodgson
4e97fe982d improve previewbar look & feel 2016-03-21 22:05:59 +00:00
David Baker
3bd93c90b1 Splitting this over two lines confuses the word spacing 2016-03-21 18:15:01 +00:00
Matthew Hodgson
0a346350e8 warn if you don't specify an email 2016-03-21 01:15:11 +00:00
Matthew Hodgson
5bdcb64464 fix NPE 2016-03-21 00:51:45 +00:00
Matthew Hodgson
59f599af5c prompt before giving equal ops 2016-03-21 00:49:18 +00:00
Matthew Hodgson
31ed7b9dd7 fix state caching bugs in RoomHeader 2016-03-21 00:39:33 +00:00
Matthew Hodgson
eadd2a522f fix room reuse semantics when starting chats 2016-03-20 13:04:03 +00:00
Matthew Hodgson
18fc8fc6c4 s/m.room.join_rule/m.room.join_rules/ 2016-03-20 12:47:38 +00:00
Matthew Hodgson
bbd57f2bdf when starting chat from memberinfo, allow guest access. in future synapse should make guest_access a default for the private_chat preset. 2016-03-20 12:39:49 +00:00
Matthew Hodgson
68a391e24b implement history visibilty warnings 2016-03-19 22:33:06 +00:00
Matthew Hodgson
a44ebddae0 show default displayname in ChangeDisplayName prompt 2016-03-19 02:45:06 +00:00
Matthew Hodgson
383779f718 oops, actually fix https://github.com/vector-im/vector-web/issues/308 properly... 2016-03-18 20:08:47 +00:00
Matthew Hodgson
cb9da69382 doh 2016-03-18 20:01:19 +00:00
Matthew Hodgson
0250192477 handle tagging for kicked rooms correctly 2016-03-18 19:59:58 +00:00
Matthew Hodgson
bfbb7a661e special case to include kicked rooms as per https://github.com/vector-im/vector-web/issues/308 2016-03-18 19:45:04 +00:00
Matthew Hodgson
86807b631d don't reset RoomHeader every time the props change due to RoomView re-rendering during edits 2016-03-18 19:16:55 +00:00
Matthew Hodgson
12db0d9130 fix NPE on events with no sender object 2016-03-18 16:33:22 +00:00
David Baker
076bd720a3 Spell address correctly 2016-03-18 16:07:32 +00:00
David Baker
3e915cf0e2 Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email 2016-03-18 15:34:15 +00:00
David Baker
97c765f457 Look up bound mxid for the invited email address on the ID server and warn if it doesn't match our account. 2016-03-18 15:30:27 +00:00
Matthew Hodgson
03bdcf265a fix proptypes on dialogs 2016-03-18 11:20:00 +00:00
Matthew Hodgson
e63990a66e ensure we call onFinished successfully if the user actually hits submit 2016-03-18 11:12:37 +00:00
Matthew Hodgson
e55a375d6f improve RoomPreviewBar as per https://github.com/vector-im/vector-web/issues/761 2016-03-17 19:19:05 +00:00
Matthew Hodgson
be5173a8db fix https://github.com/vector-im/vector-web/issues/871 2016-03-17 18:49:40 +00:00
Matthew Hodgson
396d23b267 kill annoying warning 2016-03-17 18:49:40 +00:00
David Baker
f1844a99e7 WIP on fixing https://github.com/vector-im/vector-web/issues/924
Pass the invited email through to RoomPreviewBar, display it in a temporary way currently.

Remove a condition from RoomView render that appears to be functionally identical to the previous.
2016-03-17 18:38:25 +00:00
Matthew Hodgson
57ffc2d2e2 add autoFocus to MessageComposer's textarea, which generally makes the world a better place. We could probably kill all the focus_composer dispatches too, but haven't got time to check that right now 2016-03-17 17:29:48 +00:00
Matthew Hodgson
fd4e709705 don't need null guard 2016-03-17 16:56:16 +00:00
Matthew Hodgson
76d4e8a788 check length of textarea, not its trueiness 2016-03-17 16:54:54 +00:00
Matthew Hodgson
1b4c5224fd missed some s/this.refs.// 2016-03-17 16:52:12 +00:00
Matthew Hodgson
a64ad04a0e handle focus nicely when inserting displaynames and let them be inserted in the middle of in-progress messages 2016-03-17 16:29:37 +00:00
Matthew Hodgson
c7ffb59374 click on nicks to insert them into the MessageComposer 2016-03-17 15:35:23 +00:00
Matthew Hodgson
c51dac2f29 Merge pull request #226 from matrix-org/matthew/fix-last-active
fix last_active_ago timestamps, tab completion ordering, and implement currently_active semantics
2016-03-17 14:36:52 +00:00
Matthew Hodgson
a68e4ed1a7 Merge pull request #222 from matrix-org/matthew/fix-memberlist-refresh
make MemberTiles actually update in realtime
2016-03-17 11:59:24 +00:00
Matthew Hodgson
b617571481 tidy up https://github.com/matrix-org/matrix-react-sdk/pull/225 2016-03-17 11:56:46 +00:00
Matthew Hodgson
e03d8626be Merge pull request #225 from aviraldg/fix-1174
Bring up MemberInfo on avatar click in EventTile
2016-03-17 11:48:32 +00:00
Matthew Hodgson
84278a4ed4 fix copy-paste bug caught by PR review 2016-03-17 11:37:26 +00:00
Matthew Hodgson
3326a50c4b hopefully stop weird flickering bugs when pressing delete or zero-height textareas... 2016-03-17 02:17:17 +00:00
Matthew Hodgson
11a146ed42 oops 2016-03-17 00:07:30 +00:00
Matthew Hodgson
6acfc8f508 comment currentlyActive 2016-03-17 00:06:53 +00:00
Matthew Hodgson
500b88dc36 implement currently_active 2016-03-16 22:44:54 +00:00
Matthew Hodgson
ce833c9bba deobfuscate last_active_ago ordering 2016-03-16 22:26:20 +00:00
Matthew Hodgson
2265d1a82a fix display of null last_active_ago timestamps 2016-03-16 22:25:57 +00:00
Aviral Dasgupta
bd7f56007a Bring up MemberInfo on avatar click in EventTile
Fixes vector-im/vector-web#1174
2016-03-17 02:45:38 +05:30
Matthew Hodgson
87e1bc2f07 fix zero-length /me 2016-03-16 19:52:43 +00:00
Matthew Hodgson
4571c64413 fix zero-length /me 2016-03-16 19:52:24 +00:00
Matthew Hodgson
8f967d6e23 make MemberTiles actually update in realtime\n\nFixes https://github.com/vector-im/vector-web/issues/730 and all its dups 2016-03-16 19:32:48 +00:00
Matthew Hodgson
bb918f198b don't let uses change HS/IS URL in the middle of registration - fixes https://github.com/vector-im/vector-web/issues/1176 2016-03-16 19:14:28 +00:00
Matthew Hodgson
81674684bb Merge pull request #217 from matrix-org/matthew/disable-room-settings
grey out roomsettings that you can't edit
2016-03-16 14:42:13 +00:00
Matthew Hodgson
1aa84f2d15 switch to roomState.mayClientSendStateEvent 2016-03-16 13:10:45 +00:00
Matthew Hodgson
4db79edb73 oops, use right signature for roomState.maySendStateEvent 2016-03-16 12:17:07 +00:00
Matthew Hodgson
014ea9a328 switch to using MatrixClientPeg.get().maySendStateEvent() everywhere 2016-03-16 12:09:26 +00:00
Matthew Hodgson
b58a1707cb Merge pull request #219 from matrix-org/matthew/fix-guest-upgrade
let registering guests either upgrade or create a new account by spec…
2016-03-16 11:58:44 +00:00
David Baker
43fd13b9d7 Merge pull request #187 from matrix-org/dbkr/may_send_state_event
Remove (broken, as it turns out) permission logic from react sdk
2016-03-16 10:40:07 +00:00
Matthew Hodgson
0e1186c4f9 display m.room.history_visibility updates in the timeline 2016-03-15 23:47:40 +00:00
Matthew Hodgson
f66dd69710 oops, revert - do this on the right branch... 2016-03-15 18:40:03 +00:00
Matthew Hodgson
b23cad5613 let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161 2016-03-15 18:36:13 +00:00
Matthew Hodgson
f70eec62d1 let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161 2016-03-15 18:35:09 +00:00
Matthew Hodgson
672a5cb89c Merge pull request #200 from matrix-org/matthew/loginfixes
Bring back lost functionality on login/register/password-reset screens
2016-03-15 15:21:32 +00:00
Matthew Hodgson
59866a2006 final PR feedback 2016-03-15 15:20:51 +00:00
Matthew Hodgson
438558da55 PR feedback 2016-03-15 13:48:46 +00:00
Matthew Hodgson
8a905dec58 grey out roomsettings that you can't edit 2016-03-15 02:46:17 +00:00
Matthew Hodgson
7c598d90b1 give proper error message on failing to start chat 2016-03-15 02:19:27 +00:00
Matthew Hodgson
1abd7f45ce fix setting custom power levels 2016-03-15 01:34:49 +00:00
Matthew Hodgson
005ebbd037 stop avatar mxids being copy-pastable (unless they contain an initial). should significantly improve https://github.com/vector-im/vector-web/issues/893 2016-03-15 00:21:05 +00:00
David Baker
e0c416ee01 Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash
Don't crash on redacted (or otherwise invalid) 3pid invites
2016-03-11 14:39:43 +00:00
David Baker
1131b82414 Don't crash on redacted (or otherwise invalid) 3pid invites 2016-03-11 14:18:30 +00:00
David Baker
1516f17af4 Merge pull request #210 from matrix-org/dbkr/invite_display_when_peekable
Show the invite preview bar when we have a 3pid invite
2016-03-11 10:21:04 +00:00
David Baker
73781f5619 doc inviterName 2016-03-10 17:43:20 +00:00
Richard van der Hoff
5e7eb3ee92 Stop video tags autoplaying.
Properly, this time

Fixes https://github.com/vector-im/vector-web/issues/995
2016-03-10 17:38:52 +00:00
David Baker
f997a6fff2 Merge pull request #206 from matrix-org/dbkr/invites_silently_fail
Make 3pid invite failures show errors
2016-03-10 10:07:47 +00:00
David Baker
a74e7b45d0 Return the promise so the failure actually propagates through the promise chain. Makes the invite error handling code work.
Fixes https://github.com/vector-im/vector-web/issues/691
2016-03-09 18:48:38 +00:00
Richard van der Hoff
6c928f12b2 ForceUpdate the scrollpanel when the aux panel changes size
Catch some more cases when we ought to be updating the gemini scroll stuff.
2016-03-09 15:56:54 +00:00
Matthew Hodgson
a82d3710d1 provide sensibile defaults for PasswordLogin 2016-03-06 18:42:09 -05:00
Matthew Hodgson
0bb58dd60c brings back the functionality in login/register/screens that got lost in @kegsay's refactor. specifically:
1) custom HS/IS urls are now persisted in HTML5 local storage.  As a result, all the login components now distinguish between default HS/IS URLs and custom specified ones again. (
2) custom HS/IS urls are synchronised between the instances of ServerConfig found in the Login, Registration and Forgot Password screens.
3) username are persisted over changing homeserver (but not password, to stop accidentally leaking passwords to the wrong server)
4) correctly interpret a blank URL field as meaning the placeholder text
5) when toggling custom URLs on and off, remember what the custom values were, and use the default URLs if custom mode is not engaged

also, guest access now upholds custom HS/IS URLs found in local storage rather than being limited to the server config ()

also adds assorted comments and improved console debug and a few minor cosmetic changes to the login components.

this commit sponsored by VS27...
2016-03-06 14:33:36 -05:00
Matthew Hodgson
b66ca74ede fix comments 2016-03-05 02:35:17 +00:00
Matthew Hodgson
fcf17adf14 hopefully fix bug186 by ensuring room members never have null users 2016-03-04 16:57:20 +00:00
David Baker
5b505cd32d Remove (broken, as it turns out) permission logic from react sdk and use https://github.com/matrix-org/matrix-js-sdk/pull/94 instead. 2016-03-03 17:58:41 +00:00
Matthew Hodgson
05a3dab528 fix roomavatars on FF 2016-03-03 16:16:40 +00:00
Matthew Hodgson
27fea6bc95 make the newly invited warning prettier 2016-03-03 15:02:11 +00:00
Matthew Hodgson
cfd6546fe9 default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files 2016-03-03 12:11:22 +00:00
David Baker
45857fa12c Remove unused voice & video on-clicks from RoomHeader. 2016-03-02 14:54:38 +00:00
David Baker
0051c91126 Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata
Pass room metadata from 3pid invite emails all the way through to the…
2016-03-02 14:31:58 +00:00
David Baker
2dbed2aa02 Clarify when room / oobData can/can't be set 2016-03-02 11:59:17 +00:00
David Baker
d61f383748 Oops, actually assign variable 2016-03-02 11:57:05 +00:00
David Baker
10b1b6443d Fix rooms we don't have any info about 2016-03-02 10:59:54 +00:00
David Baker
9085a2a866 Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it. 2016-03-01 18:23:57 +00:00
Richard van der Hoff
30abf81ed4 Fix CallView in left panel
Make CallView cope with not being passed a room. Fixes
https://github.com/vector-im/vector-web/issues/1049, introduced in
7a20fda7, which made vector crash when you switched to another room with an
active call.
2016-02-29 13:43:22 +00:00
Richard van der Hoff
543f444174 Merge commit 'd9e58d9' into develop
Undo an over-zealous force-push :(
2016-02-26 16:31:02 +00:00
Richard van der Hoff
2bd6529ca0 Merge remote-tracking branch 'origin/develop' into develop 2016-02-25 18:38:14 +00:00
Will Hunt
081a975d2a Added ES6 function 'fromCodePoint' to retrive first initial for default avatars that begin with a large unicode character. 2016-02-25 16:23:38 +00:00
David Baker
e915d7e215 Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup.
Fixes https://github.com/vector-im/vector-web/issues/544
2016-02-25 11:06:47 +00:00
Richard van der Hoff
10b55036f9 Merge branch 'rav/roomview_works' into develop
Implementation of new read-marker semantics (PR #160).
2016-02-24 17:26:46 +00:00
Richard van der Hoff
7a20fda7e7 Factor out a separate auxpanel, and cleanup the maxHeight management
Basically two changes here:

1. Factor out auxpanel from RoomView
2. Rather than setting maxHeight attributes by poking directly into the DOM,
pass them down as properties.
2016-02-23 15:54:15 +00:00
Richard van der Hoff
99d2392b6f Update the scroll offset when images load
In order to deal with image-loading reshaping the DOM, wire up
ScrollPanel.checkScroll to the image load events.

Fixes https://github.com/vector-im/vector-web/issues/984
2016-02-22 17:43:33 +00:00
Matthew Hodgson
a44ef5bd48 fix incomingCallBox vertical offset if MatrixToolbar is present 2016-02-19 02:21:17 +00:00
Matthew Hodgson
957ef9cdc8 fix self-highlight 2016-02-19 01:56:03 +00:00
Matthew Hodgson
d2a731e255 only resize the video element if not fullscreen 2016-02-19 01:18:53 +00:00
Matthew Hodgson
7f310ce307 fix nasty overscroll bug on video element caused by inline v. block 2016-02-19 01:18:37 +00:00
Matthew Hodgson
dc94df4b06 accomodate 800px wide thumbs and support horizontal scaling 2016-02-18 19:09:58 +00:00
Richard van der Hoff
e9726865fc Merge pull request #162 from matrix-org/rav/keep_redactions
Handle redacted events
2016-02-17 21:42:39 +00:00
Richard van der Hoff
e3feae32e1 Fix search clickthrough for HTML events
Switch to using a normal <a href="..."> link for search result
clickthrough. Apart from generally giving a better experience, this means that
it also works on html messages. The problem there was that we were attaching
onClick handlers to <span>s which we were then flattening into HTML with
ReactDOMServer (which meant the onClick handlers were never attached to React's
list of listeners).

To make this work without jumping through React hoops, the highlighter now
returns either a list of strings or a list of nodes, depending on whether we
are dealing with an HTML event or a text one. We therefore have a separate
HtmlHighlighter and TextHighlighter.
2016-02-17 21:06:27 +00:00
Richard van der Hoff
eb91faf554 Handle redacted events
matrix-js-sdk now retains redacted events. Filter them out of the timeline.

Also put empty placeholders in the dom so that if we try to scroll to a
redacted event, we don't end up blowing up.
2016-02-16 16:08:52 +00:00
Matthew Hodgson
ca56b7ec2d match partial names in memberlist 2016-02-15 20:43:43 +00:00
Matthew Hodgson
61018f4f38 whitespace 2016-02-15 20:42:44 +00:00
Matthew Hodgson
576de32ce4 show vaguely accurate default avatar 2016-02-15 22:01:22 +02:00
Matthew Hodgson
dfbc88d421 fix keyboard shortcuts on logout prompt 2016-02-15 22:01:05 +02:00
Matthew Hodgson
e17d77778f sanitize setting displayname prompt 2016-02-15 19:37:03 +02:00
Matthew Hodgson
0c7573629a spell out that you can invite email addresses 2016-02-15 11:13:37 +02:00
Matthew Hodgson
0a37f1c478 improve the fix for https://github.com/vector-im/vector-web/issues/917 2016-02-15 09:52:57 +02:00
Matthew Hodgson
9d3b0f6075 fix https://github.com/vector-im/vector-web/issues/913 2016-02-15 00:37:59 +02:00
Matthew Hodgson
5e5fdb9b96 fix vector-im/vector-web#921 2016-02-14 13:38:12 +02:00
David Baker
038f613079 Don;t try to fetch push rules if we're a guest: it throws. 2016-02-10 11:16:36 +00:00
David Baker
bd73c4e0cc Merge pull request #151 from matrix-org/dbkr/spinner_while_joining
Joining a room can take a while. Show a spinner…
2016-02-09 17:45:09 +00:00
David Baker
af0597e0c8 Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city. 2016-02-09 16:55:03 +00:00
David Baker
b4a7124686 Add a null check here since room can be null and this was throwing 2016-02-09 16:48:12 +00:00
Kegan Dougal
2027ed9f49 Fix bug where clicking on the email tile didn't work 2016-02-08 15:21:23 +00:00
Kegan Dougal
70ed0be389 Merge branch 'develop' into kegan/invite-autocompleting-race 2016-02-08 15:06:13 +00:00
Kegan Dougal
3fa23798ea Split out invite memberlist logic into its own component 2016-02-08 15:05:35 +00:00
Kegan Dougal
7ccce1dc91 Reset truncation when the text box is cleared 2016-02-05 16:58:37 +00:00
Kegan Dougal
5dafe1f4a6 Fix canonical alias bug showing the first alias if one was not set.
<select> rests on the first value if the defaultValue is null. This first value
should've been 'not set'.
2016-02-05 16:22:24 +00:00
Kegsay
ac67cd556a Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list
Fix vector-im/vector-web#851 by truncating the search results
2016-02-05 15:56:23 +00:00
Kegsay
4ce41f7f6c Merge pull request #141 from matrix-org/kegan/room-settings-refactor
Refactor room settings
2016-02-05 15:50:39 +00:00
Kegan Dougal
b99c6b9a97 camelCasePlease 2016-02-05 15:48:04 +00:00
Kegan Dougal
a0c5b30fd6 Fix vector-im/vector-web#851 by truncating the search results 2016-02-05 15:24:51 +00:00
Kegan Dougal
03f19eba55 Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits. 2016-02-05 14:38:28 +00:00
Kegan Dougal
0cbf9dba87 Glue more things back together 2016-02-05 11:59:19 +00:00
Kegan Dougal
78354d0bc7 Yank out color settings from RoomSettings to ColorSettings 2016-02-05 11:27:11 +00:00
David Baker
9525808cd0 Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers
Unregister some event handlers we'd registered but never unregister.
2016-02-05 10:48:22 +00:00
David Baker
63776509a6 Make the function call-rate limiting a generic thing and use it in more places. 2016-02-04 18:06:24 +00:00
Kegan Dougal
74e16ac83e Merge branch 'develop' into kegan/room-settings-refactor 2016-02-04 16:20:24 +00:00
Kegan Dougal
73df5a2828 Modify how checked state is passed around
Prefer onChange -> setState to ref grabbing so we can expose public setters
and not be tied down to certain element implementations.
2016-02-04 16:18:59 +00:00
David Baker
c0d93a78bc Unregister some event handlers we'd registered but never unregister. 2016-02-04 15:55:24 +00:00
David Baker
d1467d2319 Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join
Prompt for display name before joining your first room
2016-02-04 15:32:52 +00:00
Kegan Dougal
4013dae770 Start refactoring RoomSettings
- Don't manipulate settings in RoomView. Make it RoomSettings' job.
- Return Promise[] from AliasSettings.save() rather than an allSettled promise
  so callers can have more granularity over what to do with it (.all vs .allSettled)
- General refactoring of RoomSettings. Most things are broken now and are not
  submitted. Add util methods to grab values out of events.
2016-02-04 15:26:12 +00:00
David Baker
167da10b8b address PR comments 2016-02-04 15:07:30 +00:00
Kegsay
6c9d48bd3a Merge pull request #128 from matrix-org/kegan/alias-settings
Split out alias settings into its own component: AliasSettings
2016-02-04 13:14:19 +00:00
David Baker
47fef0896f Prompt for display name before joining your first room (if you haven't set one).
Fixes https://github.com/vector-im/vector-web/issues/758
2016-02-04 11:49:10 +00:00
Richard van der Hoff
e01d61dfeb Merge branch 'rav/timeline_window' into rav/link_to_event
Conflicts:
	src/components/structures/MatrixChat.js
	src/components/structures/ScrollPanel.js
2016-02-03 14:12:28 +00:00
Richard van der Hoff
c82b364ca8 Address review comments
Mostly renaming things and adding comments.
2016-02-03 08:03:10 +00:00
Kegan Dougal
ce789ba962 Split out alias settings into its own component: AliasSettings 2016-02-02 12:46:14 +00:00
Richard van der Hoff
d9e13780b8 Implement direct-to-event linking.
This adds support for links to particular event ids: add /<eventId> to the URL
for a room.

This commit also ensures that we scroll to the 'read marker' when switching to
a room which has no previous scroll state, as well as preventing that marker
from going past the middle of the screen.

This also reinstates the preservation of scroll state when switching rooms,
which was disabled previously.
2016-02-01 16:31:12 +00:00
Kegan Dougal
e6c93530e2 Strip trailing slashes on HS/IS URLs on register/login 2016-02-01 14:19:20 +00:00
Kegan Dougal
bdc1028a7e Support bulk invitations via text separators
Valid separators are , ; <space>
2016-01-28 11:56:20 +00:00
David Baker
f745e941ec Fix exception thrown if any custom tags are set 2016-01-28 09:41:46 +00:00
Matthew Hodgson
6eea1f7f83 try for a simpler invite placeholder look & feel 2016-01-24 19:02:18 +00:00
Matthew Hodgson
872b9be17a increase truncatelist size to match INITIAL_LOAD_NUM_MEMBERS 2016-01-24 18:24:26 +00:00
Kegsay
9a6f33861f Merge pull request #112 from matrix-org/kegan/email-invite-tile
Add a tile to the invitee list which represents an email tile
2016-01-22 17:35:17 +00:00
Kegan Dougal
437280020c Turn off autocomplete for search list 2016-01-22 17:32:43 +00:00
Kegan Dougal
e78c1fba87 Hide 'Email: ' is the first char is @ 2016-01-22 17:28:23 +00:00
Matthew Hodgson
b19a318b2d put a black badge on unread notifications, and a red one for unread highlights 2016-01-22 17:22:49 +00:00
Kegan Dougal
c3f786cc5e Add a tile to the invitee list which represents an email tile 2016-01-22 17:20:52 +00:00
Kegsay
2e154c7478 Merge pull request #110 from matrix-org/kegan/3pid-invite-refresh-mlist
Refresh the membership list on 3PID invites
2016-01-22 16:13:42 +00:00
Kegan Dougal
99da0ef656 Fix vector-im/vector-web#694 - Empty invitee list
The invitee list is lazy-loaded 50ms after the first render. We were relying
on setState from the member lazy-load to also kick the invitee list. However,
setState is synchronous and we were loading the invitee list afterwards, which
meant that the SearchableEntityList wouldn't have any invitees until the next
render().
2016-01-22 16:11:09 +00:00
Kegan Dougal
38d5c7d5c5 Filter out undefined/null children which won't render 2016-01-22 15:57:42 +00:00
Kegan Dougal
675e0f176f Add onShowMoreRooms prop for kicking gemini 2016-01-22 15:46:38 +00:00
Matthew Hodgson
0bdd674f7f fix invalid powerlevel setting 2016-01-22 15:29:57 +00:00
Kegan Dougal
366a24bbe4 Refresh the membership list on 3PID invites 2016-01-22 15:11:36 +00:00
Kegan Dougal
7ef1ba0b44 Unbreak RoomHeader 2016-01-22 11:48:26 +00:00
Kegan Dougal
f213901e29 Return early when calculating one-to-one room avatars
Object.keys() is O(n) and is wasted because we only care if the keys are 1 or 2.
Use `for .. in` instead and return early if there are >2 keys.

Profiling indicates this cuts wasted time from ~74ms to ~32ms for me (who has
a large number of rooms with large numbers of people in them).
2016-01-22 11:11:56 +00:00
manuroe
a627ee7ef6 Fixed ternary operation 2016-01-22 08:54:40 +01:00
Matthew Hodgson
8ccc3f04c3 correct layout for truncated lists 2016-01-21 17:39:12 +00:00
Kegsay
b45e5e6eb5 Merge pull request #108 from matrix-org/kegan/member-list-perf
Add "and X more" overflow tile to joined member list
2016-01-21 16:15:12 +00:00
Kegan Dougal
dfab32394d Set truncation to 10 for now. 2016-01-21 16:03:32 +00:00
Kegan Dougal
d72ab641d0 Expand the list when the overflow element is clicked
Negative truncateAt values means "do not truncate".
2016-01-21 15:57:59 +00:00
Matthew Hodgson
c5099a837b doh - anyone can set their own tags... 2016-01-21 15:08:14 +00:00
Kegan Dougal
eed83f982e Add a suitable overflow tile for the member list 2016-01-21 11:41:28 +00:00
Kegan Dougal
9f362e488c Add a TruncatedList component, which truncates children passed to it. 2016-01-21 11:30:37 +00:00
David Baker
13e70e6956 Merge remote-tracking branch 'origin/develop' into unread_sync 2016-01-21 10:36:29 +00:00
David Baker
99a491bb0e Merge pull request #68 from matrix-org/notif_sync
Set room highlight from unread_notification_count
2016-01-21 10:31:42 +00:00
Matthew Hodgson
eab0ca8716 fix bottom margin on FF 2016-01-21 00:39:10 +00:00
Matthew Hodgson
4d549304b6 Fix autoshow 2016-01-21 00:26:44 +00:00
Matthew Hodgson
9ce4148925 go splitscreen at the first sign of an invite search 2016-01-21 00:25:47 +00:00
Matthew Hodgson
deca90d0a7 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:10 +00:00
Matthew Hodgson
6f6db75ea1 improve banned users layout 2016-01-20 22:47:42 +00:00
Matthew Hodgson
c0aa15aa09 now with gemini 2016-01-20 22:11:58 +00:00
Matthew Hodgson
3aaf934c97 implement the correct design for memberlist, modulo gemini 2016-01-20 22:04:49 +00:00
Matthew Hodgson
964e7c3739 fix user_levels some more 2016-01-20 17:15:01 +00:00
Matthew Hodgson
705730d450 fix user_levels 2016-01-20 17:12:55 +00:00
Matthew Hodgson
c64f08dcc3 fix missing aliases 2016-01-20 16:53:46 +00:00
Matthew Hodgson
76279e2940 fix roomsettings a bit 2016-01-20 16:39:26 +00:00
Matthew Hodgson
14c2d945d6 oops, use right class 2016-01-20 15:58:17 +00:00
Matthew Hodgson
dbcbd2aad8 fix badge layout 2016-01-20 15:52:34 +00:00
Matthew Hodgson
4d2608017b fix CSS for ChangeAvatar placeholder 2016-01-20 15:39:56 +00:00
Kegan Dougal
edb67b778d Merge branch 'develop' into matthew/roompreview 2016-01-20 14:42:04 +00:00
Kegan Dougal
fee7ee5dcc Load the user list eventually if we have no Room object 2016-01-20 14:41:48 +00:00
Kegan Dougal
a0aaae49dd Merge branch 'develop' into matthew/roompreview 2016-01-20 14:27:25 +00:00
Kegsay
c3c7c90de0 Merge pull request #103 from matrix-org/kegan/invite-search
Add global search with ability to invite from said list
2016-01-20 14:26:17 +00:00
Matthew Hodgson
60a084bdbd Merge branch 'develop' into matthew/roompreview 2016-01-20 14:22:09 +00:00
Kegan Dougal
391c653d24 Lazy-load the user list to improve perf
Still slow when typing due to adding 1000 tiles to the DOM, but it is at least
a lot better than before (which would stutter on ANY change to the member list)
2016-01-20 14:14:04 +00:00
Kegan Dougal
91c224aaf4 Review comments: Remove stuff which shouldn't have been there 2016-01-20 13:41:03 +00:00
Kegan Dougal
bdfd09d893 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-19 17:10:54 +00:00
Kegan Dougal
e4e3393232 Temporarily comment out address book until perf can be looked at given other PRs now depend on this PR 2016-01-19 17:09:36 +00:00
David Baker
4ed130ceac Implement adding email addresses to your profile. 2016-01-19 16:36:54 +00:00
Kegan Dougal
3e4c5d7fa3 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-19 16:08:14 +00:00
Kegan Dougal
d2708cf4d4 Filter the membership list in addition to the search area for the input text 2016-01-19 14:51:26 +00:00
Matthew Hodgson
2274cb3f7f fix invite prompt 2016-01-18 20:18:46 +00:00
Matthew Hodgson
eb7144ef85 improve layout 2016-01-18 19:56:56 +00:00
Matthew Hodgson
0a79b0f9e2 fix NPE from kegan's memberlist branch 2016-01-18 19:56:47 +00:00
Matthew Hodgson
7b91d3c5f8 wording changes from Amandine to settings 2016-01-18 19:56:38 +00:00
Matthew Hodgson
765174a600 merge conflict 2016-01-18 19:56:35 +00:00
Matthew Hodgson
491ba94230 WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted. 2016-01-18 17:39:23 +00:00
Kegan Dougal
a8643ff039 Move power level stuff to EntityTile for now 2016-01-18 17:37:17 +00:00
Kegan Dougal
0465323ca6 Merge branch 'develop' into kegan/invite-search 2016-01-18 17:31:26 +00:00
Kegan Dougal
f1042bd1c4 UI tweaks 2016-01-18 17:21:28 +00:00
Kegan Dougal
36616a97a1 Add ability to click-to-invite 2016-01-18 17:12:35 +00:00
manuroe
33edeccb43 Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/component-index.js
#	src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
Kegan Dougal
165adde0c8 Use EntityTile for 3PID entities rather than munging MemberTile 2016-01-18 16:55:51 +00:00
Kegan Dougal
c758c0f84f Add invite button JSX 2016-01-18 16:47:31 +00:00
Kegan Dougal
71009d81b6 Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile. 2016-01-18 15:19:49 +00:00
David Baker
cc3d27bd4b Merge pull request #98 from matrix-org/message_composer_arrows_keys
Fix history scrolling with multiline input
2016-01-18 14:25:57 +00:00
David Baker
880ae0f3fa Fix typo 2016-01-18 14:25:23 +00:00
Matthew Hodgson
51648b9bf0 merge develop 2016-01-18 14:02:19 +00:00
Matthew Hodgson
17fdfa0c8f incorporate kegan PR feedback 2016-01-18 14:00:47 +00:00
Matthew Hodgson
aa412bed0f reindent promises as per dave's PR feedback 2016-01-18 13:38:40 +00:00
Matthew Hodgson
d0eedb4faa merge develop 2016-01-18 13:34:09 +00:00
Kegan Dougal
fd99b260f4 Merge branch 'develop' into kegan/invite-search 2016-01-18 12:07:36 +00:00
Kegan Dougal
2a64d0feb3 Merge branch 'develop' into matthew/roomsettings2 2016-01-18 10:49:45 +00:00
Kegsay
6e42d00727 Merge pull request #95 from matrix-org/kegan/base-avatar
Factor out common Avatar code
2016-01-18 10:18:04 +00:00
Matthew Hodgson
8f83621c4c hide Mod button for muted users 2016-01-18 01:40:19 +00:00
Matthew Hodgson
6e3245a3b0 make linkify userid jump to memberinfo 2016-01-18 01:26:15 +00:00
Matthew Hodgson
8e1ab8e6b4 vaguely skin MemberInfo correctly 2016-01-18 01:18:02 +00:00
Matthew Hodgson
430c90f4a4 oops ,forgot PowerSelector 2016-01-18 00:42:20 +00:00
Matthew Hodgson
a768b7fe4b bring back power badges 2016-01-18 00:16:31 +00:00
Matthew Hodgson
0553551d92 oops ,forgot PowerSelector 2016-01-17 23:58:38 +00:00
Matthew Hodgson
f3aeda7af9 merge develop 2016-01-17 23:31:21 +00:00
Matthew Hodgson
1467aacfa4 support saving tag changes (untested) 2016-01-17 12:27:21 +00:00
Matthew Hodgson
06e1674f23 UI for tag management 2016-01-17 05:13:16 +00:00
Matthew Hodgson
5b5bd9aef1 remove create_room for now. lots of stupid bugfixes across the board. 2016-01-17 03:59:31 +00:00
Matthew Hodgson
82a159d651 make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board 2016-01-17 02:48:55 +00:00
David Baker
52de322789 Change history scolling so it doesn't interfere with moving between lines, even when those lines are wrapped rather than hard line breaks. 2016-01-15 18:31:07 +00:00
Kegan Dougal
d6c7631dcc Show User avatar URLs 2016-01-15 17:31:32 +00:00
Kegan Dougal
4d47d9875b Merge branch 'kegan/base-avatar' into kegan/invite-search 2016-01-15 17:19:34 +00:00
Kegan Dougal
855bef17fa Fold BaseAvatar state mainly into state.urls to avoid too many code paths. 2016-01-15 17:05:05 +00:00
David Baker
a849955c51 Merge pull request #93 from matrix-org/registration_field_validate
Do (more) client side validation of registration parameters.
2016-01-15 16:38:46 +00:00
Matthew Hodgson
90184235bb improve RoomSettings layout 2016-01-15 16:33:50 +00:00
Matthew Hodgson
f476150591 fix changeavatar to avoid duplicate click on label 2016-01-15 16:33:34 +00:00
David Baker
ecfdd3593c Validate everything on form submit. Don't use pwd1 where we didn't define it & fix some error codes. 2016-01-15 16:17:27 +00:00
Kegan Dougal
d8d79722ac Make RoomAvatar use BaseAvatar 2016-01-15 16:13:25 +00:00
Matthew Hodgson
0caf5e0cdc manage permissions on whether people can actually edit name, topic, avatar etc or not 2016-01-15 15:51:40 +00:00
Matthew Hodgson
57e62bf0ba remove change avatar from here as it's now in the header 2016-01-15 15:50:38 +00:00
Matthew Hodgson
aefecfc645 tweak roomheader layout when editing 2016-01-15 15:23:41 +00:00
David Baker
2638ee974e Add warning on inviting a user if sharing history with new users.
Fixes https://github.com/vector-im/vector-web/issues/60
2016-01-15 15:18:55 +00:00
Matthew Hodgson
4a2c2d9656 fix broken merge and revert some of 243b2e45 and document evil magic numbers 2016-01-15 14:22:17 +00:00
David Baker
02e41450b4 Do (more) client side validation of registration parameters. 2016-01-15 13:31:41 +00:00
Matthew Hodgson
f2dc1e835b placeholder for displayname 2016-01-15 13:11:37 +00:00
Matthew Hodgson
84b46dae4e make ChangeAvatar customisable size... 2016-01-15 12:35:18 +00:00
Matthew Hodgson
8e9e33fa2a fix NPE and make enter work again 2016-01-15 12:34:53 +00:00
Kegan Dougal
cfb81a4aec Factor out avatar stuff to BaseAvatar. Make MemberAvatar use it instead. 2016-01-15 12:02:28 +00:00
Kegan Dougal
aea833ec87 Display User objects in search results 2016-01-15 10:31:31 +00:00
Kegan Dougal
266aee2c6b Factor out data model -> Entity logic to Entities.js 2016-01-15 09:58:48 +00:00
manuroe
f868f7813b Room settings: Added notifications mute checkbox 2016-01-14 19:06:48 +01:00
Kegan Dougal
83a458938e Unbreak things 2016-01-14 17:41:04 +00:00
Kegan Dougal
69d8e50eeb Merge branch 'develop' into kegan/invite-search 2016-01-14 17:34:52 +00:00
Kegan Dougal
d5deb283bf Add a SearchableEntityList and use it for invite box
It all even works, though only for RoomMembers currently.
2016-01-14 17:27:06 +00:00
Matthew Hodgson
e4671205d8 right imagery 2016-01-14 17:24:57 +00:00
Matthew Hodgson
2899082cba deselect editabletext when tabbing away 2016-01-14 17:24:52 +00:00
Matthew Hodgson
d767e72469 hide hoverover for 3pids 2016-01-14 17:02:56 +00:00
Matthew Hodgson
4430e16707 apply CSS to slashcommand autocompletes 2016-01-14 16:29:49 +00:00
Matthew Hodgson
ffaea371ac Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2 2016-01-14 16:02:29 +00:00
Kegan Dougal
b67131f0c8 Add a Command class; add Entry.getFillText()
getFillText() serves to decouple the text displayed in the auto-complete list
via getText() and the text actually filled into the box via getFillText(). This
allows us to display command + args on the list but only fill the command part.

A Command class has been added to provide some structure when extracting the
command name and args. Manually tested and it works.
2016-01-14 14:39:58 +00:00
Matthew Hodgson
7a1e6bbe7e fix merge conflicts 2016-01-13 18:00:04 +00:00
Matthew Hodgson
05c7891874 fix NPE 2016-01-13 17:54:33 +00:00
Kegan Dougal
8c9352c484 Make MemberAvatar and MemberTile work without RoomMember objects 2016-01-13 16:55:28 +00:00
Kegan Dougal
c0e5d1d13b Factor out presence text. Do prep work for displaying 3pid invites on memberlist.
Factored out presence to PresenceLabel.
2016-01-13 15:55:28 +00:00
manuroe
7985413893 Created TextInputDialog
In css, created a generic mx_Dialog_title class for all dialogs
2016-01-13 16:32:41 +01:00
Matthew Hodgson
1b7d80a8cd s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit' 2016-01-13 14:04:00 +00:00
Matthew Hodgson
5f763f8ebb merge develop 2016-01-13 14:03:54 +00:00
Kegan Dougal
69cac307d9 Merge branch 'develop' into kegan/guest-peek-then-join 2016-01-13 13:22:58 +00:00
Matthew Hodgson
c9c496f0e5 WIP all new roomsettings 2016-01-13 13:15:13 +00:00
Matthew Hodgson
f715662d18 merge in develop, fixing conflicts 2016-01-13 13:06:27 +00:00
Matthew Hodgson
3934b42ac8 s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier 2016-01-13 13:01:00 +00:00
Kegan Dougal
ec4e0d7687 Implement password reset
This adds a link to the login screen with "Forgot your password?". Clicking it
takes you to a form with fields for an email address and a new password. This
makes the same API calls as the Angular SDK.

Manually tested resetting + not clicking link + invalid email and it all seems
to work.
2016-01-12 17:20:16 +00:00
Kegan Dougal
eb955eb371 Add a RoomPreviewBar which asks if you'd like to join a peeked room 2016-01-12 14:11:15 +00:00
Richard van der Hoff
cd52549713 s/function/func/ in PropTypes declarations 2016-01-12 13:11:53 +00:00
Matthew Hodgson
bd226609d0 fix onclick for all of room name 2016-01-11 18:44:36 +00:00
Richard van der Hoff
243b2e4587 Make the scrollpanel update itself correctly on video resize.
When we first get video, the video component will resize itself. This will
cause the page to be reflowed, but that doesn't trigger an update on the gemini
scrollbar. We therefore need to force an update on the messagepanel. Implement
this by providing an onResize property on the CallView component.

We need to do the same when we change the maxHeight on the video panel.

The same applies to resizing of the MessageComposer. That was previously
handled with a fugly roomView.forceUpdate() from MessageComposer - make it use
the same mechanism.

Finally: the messageComposer is at least 70 pixels, and up to 100 pixels high -
not 36. Fix the auxPanelMaxHeight calculation - and use a static constant
rather than hardcoding the number to avoid this happening again.
2016-01-11 15:28:59 +00:00
Matthew Hodgson
ddd8838b24 linkify topics 2016-01-11 12:46:12 +00:00
Matthew Hodgson
6351258b0e use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname 2016-01-10 20:01:30 +00:00
Matthew Hodgson
0cb6094992 show implicit names as placeholders if available 2016-01-10 18:46:08 +00:00
Matthew Hodgson
d39a9a0f18 bring back select-all-on-click 2016-01-10 13:14:12 +00:00
Matthew Hodgson
684255044a switch EditableText to be built on contentEditable rather than switching divs and inputs, so that it can be used for managing multiline content like topics and room names, and use it in RoomHeader/RoomSettings 2016-01-10 12:56:45 +00:00
Matthew Hodgson
4f14ead741 idiot - fix bind warnings 2016-01-10 04:22:09 +00:00
Matthew Hodgson
ef00a1624d fix up RoomSettings somewhat and implement room colors 2016-01-08 03:22:38 +00:00
Kegan Dougal
a3df50f4c3 Implement guest account upgrading 2016-01-07 17:23:32 +00:00
Kegan Dougal
c64f36c81b Merge branch 'develop' into kegan/guest-access 2016-01-07 13:21:06 +00:00
David Baker
ba51c68844 Merge remote-tracking branch 'origin/notif_sync' into unread_sync 2016-01-07 11:44:50 +00:00
Matthew Hodgson
8170288acb Merge pull request #77 from matrix-org/matthew/dynamic-svg
Make SVGs and CSS dynamically recolourable
2016-01-07 11:42:30 +00:00
David Baker
99abd58f1a Merge remote-tracking branch 'origin/develop' into notif_sync 2016-01-07 10:41:16 +00:00
David Baker
287da54fbc Address PR comments 2016-01-07 10:38:44 +00:00
Matthew Hodgson
fd32362aa6 oops, initialise fixups per-object, not per-prototype 2016-01-07 10:18:18 +00:00
Matthew Hodgson
0772f50fab update copyright for 2016 2016-01-07 04:06:52 +00:00
Matthew Hodgson
296b626ed9 oops, we actually need to cache the fixups in TintableSvg 2016-01-07 03:59:09 +00:00
Matthew Hodgson
0f52c0a514 make TintableSvgs responsible for updating their own tints, and stop storing SVG DOM fragments in Tinter to avoid leaking them 2016-01-07 03:39:00 +00:00
David Baker
04c7792b51 Use our read receipt to calculate whether rooms are unread. 2016-01-06 18:07:24 +00:00
Richard van der Hoff
4e4f8fad23 Merge pull request #79 from matrix-org/rav/dispatcher_leak
VideoView: Fix a dispatcher leak
2016-01-06 17:52:13 +00:00
Richard van der Hoff
4624e7a485 Address review comments
s/onClick/onSelect/
2016-01-06 16:46:29 +00:00
Richard van der Hoff
0d0a379cd8 VideoView: Fix a dispatcher leak
Make sure we unregister from the dispatcher when the videoview goes
away.
2016-01-06 15:17:58 +00:00
Kegan Dougal
afbb451d4a Merge branch 'develop' into kegan/guest-access 2016-01-06 13:59:33 +00:00
Matthew Hodgson
f499c60b12 sundry PR feedback 2016-01-06 02:29:08 +00:00
Matthew Hodgson
509ea7c4f3 factor out tintable SVGs into their own component, and use plain DOM onload rather than react synthetic events 2016-01-06 02:11:07 +00:00
Matthew Hodgson
9e8daba8d7 Merge branch 'develop' into matthew/dynamic-svg 2016-01-06 01:11:34 +00:00
Richard van der Hoff
75302b1f97 Factor out a separate SearchResultTile 2016-01-05 17:56:59 +00:00
Kegan Dougal
d729dee31d Make the settings page load for guests. Add checkboxes for guest r/w 2016-01-05 17:34:25 +00:00
Richard van der Hoff
a2b7c9ba96 RoomHeader: Make 'undefined' check more explicit 2016-01-05 15:57:58 +00:00
Richard van der Hoff
583d35e39f Merge branch 'develop' into rav/new_search_api
Conflicts:
	src/components/structures/RoomView.js
2016-01-05 15:38:30 +00:00
Matthew Hodgson
a9f7bf63ff spell out we're doing 3PID invites 2016-01-05 14:24:36 +00:00
Kegsay
a6e735dbde Merge pull request #76 from matrix-org/kegan/bugfix-read-receipt
Null guard getMember

Fixes https://github.com/vector-im/vector-web/issues/566
2016-01-05 11:26:04 +00:00
Matthew Hodgson
aa1012b127 oops 2016-01-05 03:59:04 +00:00
Matthew Hodgson
9cf49eb62d oops, forgot this 2016-01-05 03:54:44 +00:00
Matthew Hodgson
001dc8612b support fixing up dynamically loaded SVGs 2016-01-05 03:34:52 +00:00
Matthew Hodgson
555abdae30 wire up Tinter.js 2016-01-05 00:46:52 +00:00
Richard van der Hoff
e177263d9f Address review comments
Minor fixes post-review
2016-01-04 16:54:27 +00:00
Richard van der Hoff
722c7033bc Merge pull request #73 from matrix-org/rav/on_highlight_click
Expose onHighlightClick on the event tiles
2016-01-04 15:23:45 +00:00
Kegan Dougal
75ad96c8ba Null guard getMember 2016-01-04 10:11:42 +00:00
Matthew Hodgson
3009da0b39 move title attributes to the div 2016-01-03 22:34:56 +00:00
Matthew Hodgson
4f915d622e switch SVGs from imgs to objects 2016-01-03 22:30:52 +00:00
Matthew Hodgson
441a9540ca sync CSS classnames with current react component names 2016-01-03 00:11:11 +00:00
Matthew Hodgson
bd498b47b3 fix 'this' scoping bug that could never have worked... 2015-12-28 02:36:18 +00:00
Richard van der Hoff
b0adb1945f Expose onHighlightClick on the event tiles 2015-12-24 13:51:14 +00:00
Richard van der Hoff
cc72f7ec24 Use new searchRoomEvents and backPaginateRoomEventsSearch methods
MatrixClient now exposes higher-level search APIs, so use them.
2015-12-24 13:33:58 +00:00
Kegan Dougal
5d490841bc Review comments 2015-12-24 10:50:47 +00:00
Kegan Dougal
5286ec170f Wrangle CSS to get avatar in right place 2015-12-24 09:20:16 +00:00
Kegan Dougal
a279dce027 Get avatar display and uploads working 2015-12-23 16:52:59 +00:00
Kegan Dougal
19bd39b066 More random tweaks
- Make onBlur reset the EditText to show that it hasn't submitted it.
- Add the user ID of the logged in user to Advanced.
- Remove remnants of the Save/Cancel buttons.
2015-12-23 16:02:18 +00:00
Kegan Dougal
72b8cf1be2 Refactor ChangePassword to get it working. Add 'Account' section because trying to make ChangePassword divs part of the same table as the display name is nigh impossible. Feels okay though 2015-12-23 15:38:28 +00:00
Kegan Dougal
6295cf2ec9 Merge branch 'develop' into matthew/settings 2015-12-23 14:19:42 +00:00
Kegan Dougal
e657b40a7e Use ChangeDisplayName for implict display name saving on enter 2015-12-23 14:14:25 +00:00
Kegan Dougal
460f68caef Move RoomMember[] -> MemberEntry[] conversion somewhere sensible
This is required for automatically entering tab-complete mode because
onKeyDown is NOT called in that case, so we need to make sure to have a
membership list hanging around.
2015-12-22 15:38:23 +00:00
Kegan Dougal
a20cabb06f Merge branch 'develop' into kegan/tab-complete 2015-12-22 15:16:39 +00:00
David Baker
05d9e1261c Merge remote-tracking branch 'origin/develop' into notif_sync 2015-12-22 14:47:11 +00:00
Kegan Dougal
e541ddb060 Auto-complete clicked suggestions 2015-12-22 11:14:36 +00:00
Kegan Dougal
0dbb8d5294 Use MemberAvatar to generate image JSX. Split out entries from tab-complete logic 2015-12-22 10:00:30 +00:00
Matthew Hodgson
ea2405ab3a escape double-slash commands 2015-12-22 00:57:57 +00:00
Matthew Hodgson
618978d955 add appropriate CSS for the TabCompleteBar 2015-12-22 00:47:04 +00:00
Kegan Dougal
ba63b5dfff Add image URLs to TabComplete.Entry objects 2015-12-21 17:28:04 +00:00
Kegan Dougal
41d4c1d14e Add TabComplete.Entry so we can render images AND text(!) - Add peek() option, all broken. 2015-12-21 14:34:25 +00:00
Kegan Dougal
400b5196bb Add TabCompleteBar. Hook up display to whether we are currently tab completing. 2015-12-21 14:11:34 +00:00
Matthew Hodgson
b9ba4475b8 Merge branch 'develop' into matthew/settings 2015-12-21 13:09:33 +00:00
Kegan Dougal
26dc3cc553 Push up instantiation of TabComplete to RoomView
RoomView is the parent component which creates MessageComposer AND the status
bar. By making RoomView instantiate TabComplete we can scope instances
correctly rather than relying on singleton behaviour through dispatches. This
also makes communication between status bar and the MessageComposer infinitely
easier since they are now sharing the same TabComplete object.
2015-12-21 10:59:10 +00:00
Kegan Dougal
c6d02b2c26 Move tab-complete logic out from MessageComposer
Moved to a `TabComplete` class. Make it more generic (list of strings rather
than RoomMembers) and sort the member list by last_active_ago. Everything still
seems to work.
2015-12-21 10:38:37 +00:00
Richard van der Hoff
ff6d9454fd Merge pull request #63 from matrix-org/rav/paginate_search
Pagination for search results
2015-12-21 09:16:42 +00:00
David Baker
5f6fe74ca8 Highlight status is now taken from the server's unread notif count 2015-12-18 17:51:17 +00:00
Matthew Hodgson
fa99c1fc59 make it clear result count is approx 2015-12-18 17:18:08 +00:00
Kegan Dougal
f0ff62166b Remove bottommost prop - can't DND on the bottom list anymore 2015-12-18 17:13:26 +00:00
Kegan Dougal
a2872deb53 Merge branch 'develop' into kegan/archived-rooms 2015-12-18 16:59:25 +00:00
Matthew Hodgson
831aaec457 Merge pull request #57 from matrix-org/matthew/inbound-calls
Position the inbound call box correctly
2015-12-18 15:59:18 +00:00
Kegan Dougal
c3bd81b83a Make rooms the user is banned in be treated as a joined room for position in room list
This is so users can still find the room they've been expelled from, rather than
have it drop to the Historical section.
2015-12-18 15:56:27 +00:00
Kegan Dougal
711fdd25af Improve perf of refreshing room list. Show spinner when loading left rooms.
When the JS SDK encounters a new room it will emit a flurry of events for things
like state and room members. Refreshing the room list on each event is bad for
performance. This is okay initially because the room list is only shown after
the first sync, but when getting archived rooms it locks up for 15-30s as it
thrashes. Add a 1s cap to refreshRoomList() which means that it will refresh
*AT MOST* once every second. If it has been >1s since the last refresh it will
immediately refresh. If it has been <1s it will wait the difference.
2015-12-18 15:13:59 +00:00
Kegan Dougal
22635f251d Call through to syncLeftRooms when the archived header is clicked 2015-12-18 11:55:43 +00:00
Richard van der Hoff
4b271a332e Refactor the search stuff in RoomView
* factor out the call to MatrixClient.search to a separate _getSearchBatch (so
  that we can reuse it for paginated results in a bit)
* Don't group cross-room searches by room - just display them in timeline
  order.
2015-12-18 11:11:41 +00:00
Matthew Hodgson
e2ae2dd199 merge stuff from vector 2015-12-18 00:37:56 +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
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
Matthew Hodgson
5c999fe1ab stop the incoming call box from scrolling off the screen 2015-12-17 14:56:09 +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
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
Kegan Dougal
09e0d10d32 Do not show conf user join/parts 2015-12-16 11:54:29 +00:00
Kegan Dougal
28908c2edb Auto-focus username box 2015-12-15 15:27:56 +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
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
bf70376d16 hoverover for full name of room 2015-12-12 17:29:53 +00:00
Richard van der Hoff
0beafeddb9 Use the 'muted' icon when the mic is muted during a call 2015-12-11 15:01:16 +00:00
Matthew Hodgson
af3c43ca76 show result counts 2015-12-11 02:58:59 +00:00
Matthew Hodgson
77464c669f switch to fake tag names for fake tags, and highlight new invites 2015-12-11 00:40:28 +00:00
Matthew Hodgson
072130466c hopefully fix vector-im/vector-web#475 2015-12-08 19:49:16 +00:00
Kegan Dougal
8edfd60b64 Actually use room.name on invites. Fixes #321 2015-12-08 10:21:40 +00:00
Matthew Hodgson
08d7c0232a svgize images 2015-12-06 22:07:49 +00:00
David Baker
681138678e Fix bolding 2015-12-04 19:14:14 +00:00
Kegsay
ae615b5c5e Merge pull request #46 from matrix-org/kegan/ops-level-update
Recalculate levels when the member prop is updated.
2015-12-04 16:27:56 +00:00
David Baker
142ac67799 Add a logic class to determine whether an event affects a room's unread count / status & use it 2015-12-04 16:20:05 +00:00
Kegan Dougal
257dc62a73 Recalculate levels when the member prop is updated. 2015-12-04 16:15:55 +00:00
David Baker
29b3b237d5 Refresh room list on timeline event even if it doesn't change highlight status since we still want to update the ordering. Fixes #413. 2015-12-04 14:24:02 +00:00
Kegan Dougal
bb289a4145 Add CustomServerDialog class 2015-12-01 16:49:15 +00:00
Kegan Dougal
673b01267a Use LoginHeader everywhere 2015-12-01 16:29:58 +00:00
Kegan Dougal
05a6121934 Add default LoginHeader 2015-12-01 16:27:48 +00:00
Kegan Dougal
52f3d7f18b Add generic LoginFooter. Remove vector reference 2015-12-01 16:12:13 +00:00
Kegan Dougal
636be0c003 Update getComponent paths 2015-12-01 15:45:11 +00:00
Kegan Dougal
726c893663 Merge branch 'develop' into kegan/vector-components 2015-12-01 15:39:15 +00:00
Matthew Hodgson
4fe2cc54d6 Merge pull request #42 from matrix-org/kegan/controller-merging4
Phase 4 controller merging
2015-12-01 15:15:39 +00:00
Kegan Dougal
784c1b63dc Move remaining vector molecules to components 2015-12-01 11:19:25 +00:00
Kegan Dougal
1e694da460 Move MatrixChat and login components to react SDK.
Removed Modulator as it is no longer necessary in this form. ConferenceHandler
is injected in src/vector/index.js
2015-11-30 18:11:04 +00:00
Matthew Hodgson
c67005c306 switch avatar initial layout to work with Open Sans 2015-11-30 17:15:02 +00:00
Kegan Dougal
f9e38e5326 Move and merge RoomList 2015-11-30 16:55:00 +00:00
Kegan Dougal
03485c2fca Merge branch 'develop' into kegan/controller-merging4 2015-11-30 15:39:14 +00:00
Kegan Dougal
e008b5578d Move and merge LogoutPrompt 2015-11-30 15:23:16 +00:00
Matthew Hodgson
a8fd1b5d7a rename message components as per RL discussion this morning 2015-11-30 15:19:43 +00:00
Kegan Dougal
80a235adf9 Move and merge MemberList 2015-11-30 15:13:28 +00:00
Kegan Dougal
945a65f4b5 Move Notifier to src/ since it isn't a component. 2015-11-30 15:04:24 +00:00
Matthew Hodgson
960cc2d6b4 simplify avatar logic slightly 2015-11-30 14:39:42 +00:00
Kegan Dougal
8a98fcd427 Merge branch 'develop' into kegan/controller-merging4 2015-11-30 14:14:41 +00:00
Kegan Dougal
2002af6c7d Assign a default onFinished call to prevent TypeErrors being thrown. 2015-11-30 14:14:30 +00:00
Kegan Dougal
fcb6db684b Move and merge QuestionDialog and ErrorDialog 2015-11-30 14:11:04 +00:00
Matthew Hodgson
28b85bb226 remove unnecessary zalgo hacks 2015-11-30 01:12:41 +00:00
Matthew Hodgson
96aa42471d fix messagecomposer layout when switching between rooms on FF 2015-11-30 01:12:32 +00:00
Matthew Hodgson
ca6cdfafd3 clean up spurious whitespace 2015-11-29 13:00:37 +00:00
Matthew Hodgson
c96fa7f15d fix autoplay on chrome and remove loop for m.video 2015-11-29 12:34:01 +00:00
Matthew Hodgson
d6b188751a s/autoplay/autoPlay/ 2015-11-29 03:25:55 +00:00
Matthew Hodgson
0b483c4707 rename searchTerms to highlights, and support highlighting multiple search terms 2015-11-29 03:22:01 +00:00
Matthew Hodgson
3cc1b1ad82 fix unwanted vertical scrollbar issue and typo 2015-11-29 03:21:21 +00:00
Matthew Hodgson
f028b343b0 HTML and Markdown emotes. 2015-11-28 22:34:45 +00:00
Matthew Hodgson
52376091cb resize the composer when you change rooms 2015-11-28 22:20:14 +00:00
Matthew Hodgson
9befe243b5 combine M{Text,Notice,Emote}Message into a generic TextualMessage component 2015-11-28 21:12:02 +00:00
Kegan Dougal
5ba1ef5203 Move velocity stuff / contextual menu from Vector to React. 2015-11-27 15:37:40 +00:00
Kegan Dougal
1825b0317e Add components which were previously in vector 2015-11-27 15:02:32 +00:00
Kegan Dougal
4a2fe426bf Move and merge RoomTile and MemberTile. Extract DND stuff.
DND stuff lives in Vector. RoomTile on its own is UNTESTED and will probably
break since we don't conditionally check for onDragXXX function props.
2015-11-27 11:50:33 +00:00
Kegan Dougal
bf46ce19e0 Merge and move RoomHeader/RoomSettings 2015-11-27 10:42:03 +00:00
Kegan Dougal
11efb1ede4 Move and merge MemberInfo 2015-11-26 17:49:39 +00:00
Kegan Dougal
6e9e314f24 Move and merge UserSelector 2015-11-26 17:37:40 +00:00
Kegan Dougal
206c45e703 Move and merge MessageComposer 2015-11-26 17:31:10 +00:00
Kegan Dougal
75afc3a7de Move and merge ProgressBar 2015-11-26 17:21:08 +00:00
Kegan Dougal
fc7707971e Move and merge Change Avatar|DisplayName|Password components 2015-11-26 17:10:36 +00:00
Kegan Dougal
6c9f3303c6 Convert voip molecules to components
Don't pull in VectorConferenceHandler; instead accept a prop which meets a
conference handler interface.
2015-11-26 16:38:56 +00:00
Kegan Dougal
172735a837 Move create_room atoms to components 2015-11-26 15:44:42 +00:00
Kegan Dougal
e55ecfeacb Add VideoFeed component 2015-11-26 15:20:57 +00:00
Kegan Dougal
4fda0ce0c9 Fix typo 2015-11-26 15:17:34 +00:00
Kegan Dougal
17d789eb97 Merge EditableText component 2015-11-26 15:16:50 +00:00
Kegan Dougal
8bde761a8a Add EnableNotificationButton component 2015-11-26 15:11:08 +00:00
Kegan Dougal
1dc4e14606 Import things at the right levels 2015-11-26 13:49:39 +00:00
Kegan Dougal
7846d49403 Add missing deps; Move stuff in 'views' to have functional descriptors 2015-11-26 13:45:04 +00:00
Kegan Dougal
776369299d Move login components to views 2015-11-26 13:27:52 +00:00
Kegan Dougal
b69fff5b01 Define component directories. Merge MemberAvatar and RoomAvatar to new-style components.
Spoken to @ara4n about names/conventions. Settled on the following layout:

  src/components
      |_____________views
      |               |____ tiles
      |               |       |___ MTextTile.js
      |               |       |___ MNoticeTile.js
      |               |       |___ ...
      |               |
      |               |____ avatars
      |               |       |____ RoomAvatar.js
      |               |       |____ MemberAvatar.js
      |               |       |____ ...
      |               |
      |               |____ ...
      |
      |_____________structures
                      |____ RoomView.js
                      |____ UserSettings.js
                      |____ CreateRoom.js
                      |____ ...

Views are the "pure UI" components which can be reused. Structures are the
wire components which give important contextual information to the views e.g.
a view may be MemberList, but it's where it is in the structure that defines
that it is a *Room* MemberList.
2015-11-26 12:02:31 +00:00