mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 17:31:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
5072 commits 219 branches 562 tags 474 MiB
Commit graph

1104 commits

Author SHA1 Message Date
David Baker
9cff4d59ca Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section 
Don't always show DM rooms in Direct Messages
 2016-09-09 17:35:02 +01:00
David Baker
78f53bd403 Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms 
Add DM rooms with that person to the MemberInfo panel
 2016-09-09 17:30:32 +01:00
David Baker
4c5db7cc9f Don't always show DM rooms in Direct Messages 
Favourites belong in favourites & parted ones belong in Historical, etc.
 2016-09-09 17:23:15 +01:00
Matthew Hodgson
fed3f48297 Merge pull request #452 from aviraldg/test-rte 
Add some tests for the rich text editor
 2016-09-09 17:16:04 +01:00
David Baker
6f2e0a4cdf Make rooms in MemberInfo update when necessary 
Factor out the chunk of code that looks through a read receipt event
to see if it contain a read receipt from a given user, now we use it
in 2 places.
 2016-09-09 16:59:59 +01:00
David Baker
590d6d3ee8 Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms 2016-09-09 16:22:48 +01:00
David Baker
aa0f15c46e List common rooms in MemberInfo 2016-09-09 16:15:01 +01:00
Matthew Hodgson
4de0e19ef3 Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators 
Wmwragg/one to one indicators
 2016-09-09 15:08:48 +01:00
wmwragg
a6b0a7d5dc Should supply the roomId 2016-09-09 15:01:40 +01:00
wmwragg
17b75a589f Added the little green men for direct message rooms 2016-09-09 14:36:51 +01:00
Aviral Dasgupta
fec1e4d4c1 Add some tests for the rich text editor 2016-09-09 18:07:42 +05:30
Richard van der Hoff
b724b0c6b6 Update MemberDeviceInfo display 
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
 2016-09-09 11:41:56 +01:00
Matthew Hodgson
904348e62a Merge branch 'develop' into matthew/notif-panel 2016-09-09 11:12:52 +01:00
Matthew Hodgson
dce2dd36ec Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat 
Wmwragg/one to one chat
 2016-09-09 10:46:11 +01:00
wmwragg
840bfe84c1 Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters 2016-09-09 06:57:30 +01:00
Matthew Hodgson
db61d8e8ad another null check 2016-09-09 02:28:14 +01:00
Matthew Hodgson
4aef352a5c update to use new API based on js-sdk PR input 2016-09-08 22:48:44 +01:00
David Baker
c9475e2ae5 Merge pull request #449 from matrix-org/dbkr/toggle_dm_room 
API for (un)marking rooms as DM rooms
 2016-09-08 14:11:22 +01:00
Matthew Hodgson
b0a4b017c3 Merge pull request #440 from aviraldg/feature-rte-formatbar 
Formatting toolbar for RTE message composer.
 2016-09-08 13:54:26 +01:00
Aviral Dasgupta
8da7b98ad0 RTE: Remove dead code, fix <del> styling 2016-09-08 11:21:39 +05:30
Matthew Hodgson
b4c1eca1c5 fix key warning 2016-09-07 22:54:37 +01:00
Matthew Hodgson
820cd579d8 fix stupid double-spacing issue 2016-09-07 22:54:37 +01:00
Aviral Dasgupta
c11232742b Fix focus and toggling issues in formatting bar 2016-09-08 02:46:56 +05:30
Aviral Dasgupta
8974442084 Hide empty autocomplete and remove word counter 2016-09-08 00:43:10 +05:30
Aviral Dasgupta
802ec1169f Fix Markdown conversion to not add extra \n 
Fixes vector-im/vector-web#2094
 2016-09-08 00:03:55 +05:30
Aviral Dasgupta
f0f20beae0 RTE format bar enhancements 2016-09-08 00:03:54 +05:30
Aviral Dasgupta
0c0c44b050 Formatting toggle, markdown indicator, quoting 
Fixes vector-im/vector-web#1825
 2016-09-08 00:02:55 +05:30
Aviral Dasgupta
71251293e4 RTE formatbar (wip) 
Fixes vector-im/vector-web#2024
 2016-09-08 00:02:16 +05:30
David Baker
ec4086c5fc API for (un)marking rooms as DM rooms 2016-09-07 17:46:45 +01:00
wmwragg
7dfb8857d8 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-07 17:22:10 +01:00
David Baker
df1cc8748f Change references to MatrixTools to Rooms 
or remove where they were unused
 2016-09-07 11:33:58 +01:00
David Baker
094080629d Actually commit changed path 2016-09-07 10:19:39 +01:00
David Baker
d5b23e9e0e Save guessed DM rooms to account data 
Also bugfix
 2016-09-06 17:43:39 +01:00
David Baker
8401323156 Hopefully read DM rooms from account data 2016-09-06 16:39:21 +01:00
David Baker
50ef695740 Fix: conference rooms were no longer hidden 2016-09-05 17:42:22 +01:00
wmwragg
9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:06:31 +01:00
Richard van der Hoff
31e09e6137 Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user 
Make MemberInfo to use client.getStoredDevicesForUser
 2016-09-05 10:38:24 +01:00
Kegsay
6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links 
Implement starter link support
 2016-09-05 09:10:39 +01:00
Richard van der Hoff
fc40bdcbfc Make MemberInfo to use client.getStoredDevicesForUser 
It's more powerful than listDeviceKeys, and isn't deprecated.
 2016-09-05 00:08:16 +01:00
Richard van der Hoff
a316c652b7 Convert MemberDeviceInfo to ES6 class 2016-09-04 21:49:06 +01:00
wmwragg
f9ab2fa957 When zoomed in, the sticky headers should correctly position themselves 2016-09-04 08:01:04 +01:00
wmwragg
721baf8d42 Tolltip tweak to not require the passing in of the parent 2016-09-04 07:42:09 +01:00
Richard van der Hoff
bc8e7724e8 Make the 'encrypt this room' knob be megolm 2016-09-03 18:42:54 +01:00
wmwragg
03e74f48f8 Positioned Tooltip better 2016-09-03 13:44:44 +01:00
Matthew Hodgson
fdfd6ecfd9 let users join confs as voice or video 2016-09-03 13:27:46 +01:00
wmwragg
405dcf76eb Further tweaks to the tooltip to better handle its position, and simplify it's use 2016-09-03 12:44:55 +01:00
wmwragg
bffefd9261 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component 2016-09-02 18:41:44 +01:00
Kegan Dougal
45ada1887d Implement starter link support 
This involves modal dialogs because browsers are *terrible*.
 2016-09-02 16:36:43 +01:00
Kegan Dougal
6ec7e5df28 Move scalar auth stuff to ScalarAuthClient from RoomSettings 2016-09-02 16:03:24 +01:00
wmwragg
4c05edb71b Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari 2016-09-02 15:47:40 +01:00
Matthew Hodgson
f9d8829ba2 let you join confs either as voice or video 2016-09-02 15:38:28 +01:00
Matthew Hodgson
5543c126e6 fix tests 2016-08-30 15:22:52 +01:00
wmwragg
c30ff57c62 Better comments 2016-08-30 12:29:25 +01:00
wmwragg
8061a2f279 Fixed historical scetion not scrolling up when clicked if not hidden and stuck 2016-08-30 11:55:51 +01:00
wmwragg
769e7d3b2e Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-30 11:19:54 +01:00
wmwragg
83c4fd4b2f Code clean up, and better comments 2016-08-30 10:45:17 +01:00
wmwragg
2b1ed707c4 Better comments, and correct bottom header sticky calc to allow clicking 2016-08-28 19:18:41 +01:00
wmwragg
123d9b56c8 calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars 2016-08-28 16:25:20 +01:00
wmwragg
8f7d3394e6 Always setup stickies, even if we aren't going to use them so that the following map can fire 2016-08-28 12:02:20 +01:00
wmwragg
7631539584 Fixed incorrect init calculation of originalPosition attribute 2016-08-28 11:39:47 +01:00
Matthew Hodgson
50d09f73f5 add leave/forget button to RoomSettings 2016-08-28 00:00:22 +01:00
wmwragg
73dd05b01d Corrected incorrect offset from top of window for the scrollArea 2016-08-26 18:31:02 +01:00
wmwragg
8ccb1d482a Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck 2016-08-26 15:52:57 +01:00
wmwragg
5f9c794f0c Tweaking autoscroll to only adjust if header stuck at top and not at bottom 2016-08-26 15:36:16 +01:00
wmwragg
b9e95865af Click on stuck header scrolls to that header, collapses expands for none stuck header 2016-08-26 15:09:13 +01:00
wmwragg
71e829fd32 Getting click to not collapse expand when header is stuck 2016-08-26 14:36:39 +01:00
wmwragg
774e24a3b4 Added some logic to turn off sticky headers when the scroll area isn't large enough to support them 2016-08-26 11:01:04 +01:00
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
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
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
Aviral Dasgupta
4c1dcb924b reskindex and use sdk.getComponent for EmojiText 2016-08-11 07:55:12 +05:30
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
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
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
Matthew Hodgson
90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +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
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
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
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
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
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
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
wmwragg
6e7e091117 Refactor so that chevron and menu can be positioned independantly 2016-07-27 16:09:07 +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
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
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
Matthew Hodgson
ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +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
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
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
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
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
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
Aviral Dasgupta
fe76eb9f73 minor improvements 
- use <p> for unstyled blocks
- fix return key bug
- editor placeholder
 2016-05-28 12:02:35 +05:30
Aviral Dasgupta
001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
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
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
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
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
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
Matthew Hodgson
f3793b556e fix super-annoying key warning from react 2016-04-13 02:02:55 +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
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
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
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
a3dcd24e4a fix event-recycling bug and mend history viz changes 2016-03-25 01:12:16 +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
b81d901919 fix spinner when cancelling start chat from memberinfo 2016-03-23 18:17:49 +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
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
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
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
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
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
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
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
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
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
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
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
73781f5619 doc inviterName 2016-03-10 17:43:20 +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
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