Commit Graph

2826 Commits (e1a40a8ef0ed973b185fd3c65e0e2b0e7ca67cc9)

Author SHA1 Message Date
David Baker 2dd0165bfc Correct regex for hash at the start 2016-09-26 14:24:35 +01:00
David Baker bbfc05b0c0 Fix name of text emote sending & fix tests 2016-09-26 10:20:56 +01:00
Matthew Hodgson 40ba1ff5aa disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343 2016-09-24 00:43:46 +01:00
David Baker bf037ed6c7 Add comment 2016-09-23 19:09:32 +01:00
David Baker db3f0d298a Make RTE mode use the new Markdown wrapper class
Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode
2016-09-23 18:50:25 +01:00
David Baker fa193e775a Implement join button appearing
Also switch input to controlled so we re-render when it changes so we can show/hide the join button
2016-09-23 16:34:47 +01:00
David Baker eb5b175213 Layout to support less hardcoded CSS 2016-09-23 15:58:11 +01:00
David Baker b1e4c911eb WIP omnipresent join button 2016-09-23 15:25:38 +01:00
David Baker 6281d76ade Merge remote-tracking branch 'origin/develop' into dbkr/directory_search_box 2016-09-23 14:43:13 +01:00
Richard van der Hoff 18cbd452b0 Merge pull request #495 from matrix-org/dbkr/irc_links
Fix links to IRC rooms
2016-09-23 14:31:30 +01:00
David Baker d0a15975c8 Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive
Make markdown less aggressive
2016-09-23 14:31:20 +01:00
David Baker 90c9d51c7d Typos 2016-09-23 14:15:48 +01:00
David Baker 2120963c7a More linkifier fixes
* Accept underscores in usernames
 * Accept usernames & room aliases on localhost
 * Accept #localhost:foo.com and @localhost:foo.com
2016-09-23 14:02:14 +01:00
David Baker fae9b048dd Merge remote-tracking branch 'origin/develop' into dbkr/irc_links 2016-09-23 13:50:03 +01:00
David Baker eeac0619f4 reskindex 2016-09-23 13:49:35 +01:00
David Baker 61b48a5b1a Add component for the directory search box 2016-09-23 13:48:24 +01:00
Richard van der Hoff dd2da20031 Add the deviceId back to memberdeviceinfo
It was removed by @ara4n in 5fa5489, but it's still useful!
2016-09-22 19:28:50 +01:00
Richard van der Hoff 2f7b4f74fd Move the device verification buttons to their own class
Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog
for utterly no reason and breaking everything
2016-09-22 19:24:09 +01:00
David Baker 6ba20ec012 Better logic for wrapping in p tags or not 2016-09-22 18:57:46 +01:00
David Baker de0c92dadf Remove unused code 2016-09-22 18:37:14 +01:00
David Baker ca240b0b85 Don't wrap everything in p tags
Preserves the old behaviour of not wrapping everything in p tags,
but also returns valid markup if the resulting markdown contains
multiple paragraphs (previously it stripped the <p> from the start
and the </p> from the end, leaving closing and opening paragraph tags
in the middle of the returned markup).

Also turn on the 'xhtml' option so marked uses self-closing tags
for br's, hr's and so forth.
2016-09-22 18:17:02 +01:00
David Baker 0eddea1937 Disable link detection, as per comment 2016-09-22 17:51:34 +01:00
David Baker 6c7259eec8 Better detection of when input contains markdown 2016-09-22 17:18:12 +01:00
David Baker 898fbcee30 Merge pull request #489 from aviraldg/fix-2128
Force-hide autocomplete after sending message.
2016-09-22 10:49:23 +01:00
David Baker c228fac6d9 Merge pull request #488 from aviraldg/fix-2180
force old selection state after creating entities
2016-09-22 10:49:10 +01:00
David Baker 77c4cd337e Merge branch 'develop' into dbkr/irc_links 2016-09-22 09:50:18 +01:00
David Baker 5fff3bdf24 Document brokenness 2016-09-21 16:25:18 +01:00
David Baker 8ae210cbe2 Revert #333
Revert https://github.com/matrix-org/matrix-react-sdk/pull/333/files since sanitizer blindly allows urls with no scheme, meaning  // links can be used to fetch images over whatever scheme you serve vector over (ie. normally http/https).
2016-09-21 16:19:41 +01:00
David Baker 59117f1905 Fix linkifying rooms with underscores, try 2
Fixes https://github.com/vector-im/vector-web/issues/500
2016-09-21 14:11:43 +01:00
David Baker b83d1db24a Missed some Vectors 2016-09-21 14:03:35 +01:00
David Baker 5fa67d9617 Merge pull request #490 from matrix-org/rav/encrypted_event_dialog
EncryptedEventDialog updates
2016-09-21 10:52:22 +01:00
Richard van der Hoff 2842506b27 EncryptedEventDialog updates
* Separate info on the event from info on the device, and add a couple of new
   fields.

 * Use MatrixClient.getEventSenderDeviceInfo (requires
   https://github.com/matrix-org/matrix-js-sdk/pull/214)

 * Don't force a download of the device keys every time we open the dialog

 * Fix a react warning if the device query takes a while
2016-09-21 10:36:23 +01:00
David Baker 5b216df28e Not joined members any more 2016-09-21 09:57:17 +01:00
Aviral Dasgupta f171985e4c Fix click-to-complete in RTE
Closes vector-im/vector-web#2179
2016-09-21 07:40:48 +05:30
Aviral Dasgupta 44217422d0 Force-hide autocomplete after sending message.
Fixes vector-im/vector-web#2128
2016-09-21 07:28:07 +05:30
Aviral Dasgupta ea1419ff78 force old selection state after creating entities
Fixes vector-im/vector-web#2180
2016-09-21 07:20:50 +05:30
David Baker d1a5e54a69 Check if a room looks like a DM rooms on joining
and mark it as one if so.

Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.
2016-09-20 17:59:46 +01:00
David Baker b66c449bd7 Comment typo
and out comment in more sensible place
2016-09-20 16:08:11 +01:00
Matthew Hodgson a2904ad33f fix 'new chat' layout bug 2016-09-20 10:06:57 -04:00
David Baker 746aad9a18 Oops, missed one 2016-09-19 14:47:08 +01:00
David Baker c40a7a696e Merge pull request #485 from matrix-org/dbkr/riot
Rebrand
2016-09-19 13:36:55 +01:00
David Baker 31753fc3f3 Rebrand 2016-09-19 13:26:59 +01:00
Matthew Hodgson b348cf1244 actually apply scalar CSS :( 2016-09-19 07:01:46 -04:00
Kegan Dougal 993bb5c89d Pass close_scalar postMessage action through to the dispatcher 2016-09-19 10:38:42 +01:00
Matthew Hodgson 7691559e01 more disclaimer 2016-09-17 22:07:43 +01:00
Matthew Hodgson 53bb6b96ce don't warn when disabling crypto 2016-09-17 21:56:10 +01:00
Matthew Hodgson 5fa5489bbd disambiguate devices by ID in memberinfo 2016-09-17 20:12:56 +01:00
Matthew Hodgson 6e57faecb0 trim whitespace when adding to list 2016-09-17 16:14:02 +01:00
Matthew Hodgson da85df9d1a let comma trigger autocomplete. hook up backspace. search displaynames that include space 2016-09-17 15:21:08 +01:00
Matthew Hodgson 88273e8065 move admin tools to the top 2016-09-17 15:07:41 +01:00
Matthew Hodgson cf1b1442eb no labs for guests 2016-09-17 14:29:40 +01:00
Matthew Hodgson 0046ae50b5 switch to 3-digit formatting for counts 2016-09-17 02:39:19 +01:00
Matthew Hodgson c51e6907f0 fix spinner on createroom 2016-09-17 02:19:32 +01:00
Matthew Hodgson 026a2e6c7c fix guest login when in a RoomView 2016-09-17 02:19:27 +01:00
Matthew Hodgson 671eacaac7 fix self/this crash, and don't let guests invite 2016-09-17 02:05:27 +01:00
Matthew Hodgson 736b6dac7a default labs correctly :/ 2016-09-17 00:54:56 +01:00
Matthew Hodgson 96fd460cc8 fix import 2016-09-16 23:29:35 +01:00
Matthew Hodgson cfba600961 Merge pull request #482 from aviraldg/fix-2165
Replace <p>s with <br/>s consistently
2016-09-16 22:46:41 +01:00
Matthew Hodgson 00d2fd471d Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom
Add 'startAtBottom' flag
2016-09-16 22:38:21 +01:00
Matthew Hodgson c322a191af turn on E2E and Scalar by default 2016-09-16 18:36:03 +01:00
Matthew Hodgson 08543a66c4 fix race between setting canonical alias and creating aliases 2016-09-16 18:01:14 +01:00
David Baker d0fd6e985f Document paranoia on the startAtBottom param 2016-09-16 17:48:08 +01:00
Matthew Hodgson 67565f88fa Merge pull request #474 from matrix-org/markjh/olm_version
Add the olm version to the settings page.
2016-09-16 17:30:35 +01:00
David Baker 806ef11fde Add 'startAtBottom' flag
Controls whether a scrollPanel starts off at the bottom.

This may not be necessary and could either be derived from stickyBottom, but
this means I can be sure that the behaviour of ScrollPanel is completely
unchanged for all other uses to avoid breaking any other uses of
ScrollPanel.
2016-09-16 17:18:58 +01:00
Aviral Dasgupta 6befb09509 Replace <p>s with <br/>s consistently
Also, allow newlines in /commands.
Fixes vector-im/vector-web#2114, vector-im/vector-web#2165.
2016-09-16 21:40:00 +05:30
David Baker 1341ffca59 Merge pull request #479 from matrix-org/dbkr/directory_network_selector
Pass through config for Room Directory
2016-09-16 17:08:44 +01:00
Matthew Hodgson a28aab42c4 fix NPE in guest access 2016-09-16 16:45:43 +01:00
Matthew Hodgson 891578d800 Merge pull request #481 from aviraldg/fix-autocomplete-unicode
Fix unicode completions in autocomplete.
2016-09-16 16:44:47 +01:00
Matthew Hodgson e1bd97d509 don't try to set DM data for guests 2016-09-16 16:15:34 +01:00
Matthew Hodgson 88d92d1b61 Merge pull request #477 from matrix-org/luke/pm-plumbing-state
Add ability to set plumbing state in a room
2016-09-16 14:57:15 +01:00
Matthew Hodgson b852756332 DM title 2016-09-16 14:35:43 +01:00
Aviral Dasgupta 2913e4605f Fix unicode completions in autocomplete.
Fixes vector-im/vector-web#2208
2016-09-16 15:38:29 +05:30
Matthew Hodgson 2b9258d377 use new rawDisplayName in AddressTile 2016-09-16 03:19:33 +01:00
Matthew Hodgson 1c1c31eafc fix tinter for LeftPanel 2016-09-16 02:53:41 +01:00
Matthew Hodgson 2c7c382d56 stop continuations leaking on filepanel 2016-09-16 02:40:09 +01:00
Matthew Hodgson ff00474aa5 show RightPanel when people click on users 2016-09-16 02:37:06 +01:00
Matthew Hodgson 8519756c8c add dialog keyboard shortcuts. 2016-09-16 02:26:17 +01:00
Matthew Hodgson eeb01563f8 add dialog keyboard shortcuts. download keys on demand 2016-09-16 02:26:09 +01:00
Matthew Hodgson 77595320a7 close the RoomSettings when you close Scalar 2016-09-15 22:56:12 +01:00
Matthew Hodgson 3fcea1bfc7 only apply verified css to genuinely verified tiles 2016-09-15 22:56:12 +01:00
Matthew Hodgson c21309fdf6 remove stale state 2016-09-15 22:56:12 +01:00
Aviral Dasgupta 39d213429d Disable username and room decorators 2016-09-16 02:47:27 +05:30
Matthew Hodgson b98c2ae25e update crypto state of the room in realtime when turned on 2016-09-15 19:25:53 +01:00
David Baker 44fa851275 Pass through config for Room Directory 2016-09-15 17:18:53 +01:00
Matthew Hodgson 1899d61893 textual event for m.room.encryption 2016-09-15 17:01:02 +01:00
Matthew Hodgson db66d728c9 more e2e disclaimers 2016-09-15 16:38:37 +01:00
Matthew Hodgson 70011410cf Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning
Wmwragg/correct incoming call positioning
2016-09-15 15:59:06 +01:00
wmwragg d3f50dc2da Tweaking the positoning of the incomingCallBox 2016-09-15 15:33:08 +01:00
Luke Barnard 514d667db2 Add ability to set plumbing state in a room
This takes the form:

The bridge will not create an admin room if there is plumbing state in the room of the form:

```JS
m.room.plumbing: {
    content: {
        status: "enabled"
    },
    ...
}
```
2016-09-15 15:24:08 +01:00
Matthew Hodgson 2bd408983d Merge pull request #475 from matrix-org/wmwragg/remove-old-filter
Wmwragg/remove old filter
2016-09-15 15:01:19 +01:00
wmwragg 45f17eb973 Added incomingCallBox to header and removed from roomTile 2016-09-15 14:39:34 +01:00
wmwragg 54a65f8bd7 Corrected onKeyUp misstype and return can now be used instead of clicking the button 2016-09-15 12:17:32 +01:00
wmwragg 27456d0e20 Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog 2016-09-15 11:46:06 +01:00
wmwragg faa39eb482 Removed the nolonger used InviteMemberList 2016-09-15 11:39:59 +01:00
Mark Haines c54b9c911f Add the olm version to the settings page. 2016-09-15 11:31:54 +01:00
wmwragg 0d4eb4d22c Removed all the InviteMemberList from the MemberList, and added a srearch box 2016-09-15 11:31:49 +01:00
Matthew Hodgson f95a74951e label device IDs 2016-09-15 02:49:25 +01:00
Matthew Hodgson ce655c7f50 improve device info 2016-09-15 02:44:55 +01:00
Matthew Hodgson 8bda0bb095 basic verification UI 2016-09-15 01:55:51 +01:00
Matthew Hodgson d8770b2b41 oops 2016-09-15 00:49:10 +01:00
Matthew Hodgson 499783d697 hide room settings when you launch scalar if you haven't made changes 2016-09-15 00:43:38 +01:00
Matthew Hodgson 1a126fee54 Merge pull request #473 from matrix-org/wmwragg/multi-invite-bugfix
Wmwragg/multi invite bugfix
2016-09-14 22:06:28 +01:00
Matthew Hodgson acd999be45 better describe keys 2016-09-14 18:23:14 +01:00
wmwragg 6a91948469 Removed the Email (Invite by email) section 2016-09-14 18:01:07 +01:00
wmwragg a06896f96c Added the room name to the error message 2016-09-14 16:28:44 +01:00
wmwragg 435570a022 Better error reporting for failed multi invites 2016-09-14 16:19:09 +01:00
wmwragg 75c9f707e0 Don't show current user in queryList 2016-09-14 15:35:04 +01:00
wmwragg d3a709f98e Missed a _isDmChat call when refactoring 2016-09-14 15:19:57 +01:00
wmwragg c3566e0b49 _isDmChat needs to check the passed in addrs rather than the state.inviteList as they may now differ 2016-09-14 15:17:29 +01:00
wmwragg a7a81c8a32 A manual address doesn't have to be converted to an address tile before it can be used if it is the still in the input field when the start/invite button is pressed 2016-09-14 15:09:23 +01:00
wmwragg 2a8518b72b Tab can now be used for selection of address from list, as well as adding a manual mxid or email address 2016-09-14 14:53:13 +01:00
Matthew Hodgson 2752d6b444 improve e2e and scalar settings UI 2016-09-14 02:07:37 +01:00
Matthew Hodgson 0473b14564 fix e2e icon transitions 2016-09-14 01:25:43 +01:00
Matthew Hodgson fd707f6f62 s/Direct Messages/People/ 2016-09-13 19:47:41 +01:00
Matthew Hodgson ee672d06de Revert "Fix linkification and bump linkifyjs dep" 2016-09-13 19:36:46 +01:00
Matthew Hodgson 8508e006f0 Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite
Wmwragg/chat multi invite
2016-09-13 19:30:02 +01:00
Matthew Hodgson 17cf2fc745 Merge pull request #470 from matrix-org/matthew/right-panel-collapse
Matthew/right panel collapse
2016-09-13 19:09:18 +01:00
Matthew Hodgson 91b90aa1fd Merge pull request #460 from aviraldg/fix-linkify
Fix linkification and bump linkifyjs dep
2016-09-13 19:01:56 +01:00
Matthew Hodgson eb6a4f97ba make it work 2016-09-13 19:00:35 +01:00
wmwragg 7fa102998c Added valid but unknown mx user 2016-09-13 17:09:40 +01:00
David Baker 283e1ccf4c Merge pull request #468 from matrix-org/dbkr/create_room_modal
Add modal dialog on new room button
2016-09-13 17:05:24 +01:00
David Baker 5450e93df1 Verbiage 2016-09-13 16:56:53 +01:00
David Baker f82629aed0 Merge pull request #463 from matrix-org/dbkr/flag_incoming_dms
Flag incoming DMs as such
2016-09-13 16:42:24 +01:00
David Baker 3741768a3a Add modal dialog on new room button
https://github.com/vector-im/vector-web/issues/2178
2016-09-13 16:40:15 +01:00
wmwragg 890100a5bc Silly mistake fixed, spotted by Dave (cheers) 2016-09-13 16:28:35 +01:00
Matthew Hodgson 8bb9422907 Merge pull request #466 from aviraldg/feature-autocomplete-behaviour
Improve autocomplete behaviour
2016-09-13 16:17:23 +01:00
wmwragg 272dd82b9d Added multi invite functionality 2016-09-13 16:06:04 +01:00
David Baker 406771532d Correct path for MultiInviter 2016-09-13 14:56:54 +01:00
David Baker a53e009198 Missed a brace 2016-09-13 14:55:16 +01:00
David Baker e95a6228e0 Merge remote-tracking branch 'origin/wmwragg/chat-multi-invite' into dbkr/wmwragg/chat-multi-invite 2016-09-13 14:51:46 +01:00
David Baker 2fd9e2a98f Pull out multi-inviting from MultiInviteDialog
MultiInviteDialog would otherwise use this, but is about to go away, so it has been left.
2016-09-13 14:47:56 +01:00
wmwragg 2db8f4ae67 Added pass through of roomId 2016-09-13 14:30:37 +01:00
wmwragg ca1bb0f700 Added new Invite button in the RHS footer which calls the new 'view_invite' action 2016-09-13 14:28:03 +01:00
Aviral Dasgupta 79e5e6f6fe Fix force completion and hide rooms with no alias 2016-09-13 18:02:33 +05:30
Matthew Hodgson 32b1b6f58a WIP 2016-09-13 13:12:45 +01:00
Matthew Hodgson c8def540c4 Merge pull request #464 from remram44/remove-mdown-breaks
Remove markdown line breaks
2016-09-13 13:11:18 +01:00
Aviral Dasgupta 9a991a4dfd Autocomplete fixes and improvements 2016-09-13 17:30:29 +05:30
wmwragg 538b68a6b2 Updated with the new createRoom DM stuff 2016-09-13 12:47:31 +01:00
wmwragg 524eeaa315 Merge up from develop 2016-09-13 12:37:52 +01:00
Matthew Hodgson 3b52081092 wip for collapsable RHS 2016-09-13 12:18:22 +01:00
Aviral Dasgupta fbf2d5f96c Fix tests (wip) 2016-09-13 16:46:20 +05:30
wmwragg cba76d651a Moved the isValidAddress method to the Invite utilty object 2016-09-13 12:12:33 +01:00
wmwragg 0b267763e2 Small refactor to handle Direct Message chat as well as multi invite chat 2016-09-13 12:07:49 +01:00
Aviral Dasgupta b62622a814 Improve autocomplete behaviour
Fixes vector-im/vector-web#1761
2016-09-13 15:46:02 +05:30
David Baker d19686b96d Fix un-marking rooms as DM rooms 2016-09-13 11:06:07 +01:00
wmwragg ca2ba55288 Added error checking, and UI 2016-09-13 11:02:59 +01:00
wmwragg 99dfcb4ed2 It's no longer a onde to one chat dialog, as you can invite multiple people 2016-09-13 10:33:15 +01:00
wmwragg a7ea193189 A supplied roomId property, will make the dialog use that room for the invites, rather than creating a new one 2016-09-13 10:29:17 +01:00
Matthew Hodgson ce40fa1a8f add missing dialog 2016-09-12 23:43:00 +01:00
Matthew Hodgson 9b7ab46a72 dedicated dialog box for E2E messages 2016-09-12 23:42:24 +01:00
Remi Rampin 8cab40d987 Disable markdown line breaks
Stop combinations of - and _ turning into a line break.
2016-09-12 17:51:59 -04:00
Matthew Hodgson 5a548c3d12 add an onclick to the e2e icons 2016-09-12 18:50:52 +01:00
David Baker 2943db1072 Flag incoming DMs as such
* Add the 'is_direct' flag to rooms created for DMs
 * For invites, look for the DM flag when getting the DM user ID for a room
 * When accepting an invite, look for the flag and mark the room as a DM room if appropriate.
2016-09-12 18:32:44 +01:00
David Baker e49547eb3e Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms
Don't re-use parted rooms for DMs
2016-09-12 18:30:55 +01:00
David Baker f6478f111a Merge pull request #458 from matrix-org/dbkr/createdoom_dm
Update createRoom to support creating DM rooms
2016-09-12 18:29:43 +01:00
wmwragg 0f720dd6b8 Oops, toLowerCase call in wrong place 2016-09-12 17:41:32 +01:00
wmwragg 96299e864a Need cto push the actual userId not the toLowerCase version, as userId's are case sensitive 2016-09-12 17:38:32 +01:00
Matthew Hodgson 13eed6cd39 fix NPE in EventTile 2016-09-12 17:29:26 +01:00
wmwragg 5a0a72ee46 Added styling for unknown addresses 2016-09-12 17:25:14 +01:00
wmwragg 95d9df7534 Make an invalid mx user an unknown user AddressTile 2016-09-12 17:15:56 +01:00
wmwragg 44b8c29c84 Allow addresses to be added as text when space or comma are pressed 2016-09-12 17:06:43 +01:00
wmwragg 5b2cc555a3 Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId 2016-09-12 16:52:04 +01:00
Matthew Hodgson 9eae1c5bb7 final e2e icons 2016-09-12 16:51:19 +01:00
David Baker 937e195157 Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm 2016-09-12 16:44:44 +01:00
Matthew Hodgson 8e7b1820b9 unbreak video thumbs 2016-09-12 16:28:39 +01:00
David Baker 6ffa7c23cd Don't re-use parted rooms for DMs 2016-09-12 16:05:51 +01:00
wmwragg e28a3f10a0 Don't allow someone who is already on the invite list to appear in the AddressSelector 2016-09-12 15:48:32 +01:00
wmwragg 4836025a1d First pass at adding multiple addresses, can only add from AddressSelector at the moment 2016-09-12 15:21:17 +01:00
wmwragg 5acdb8233b The dismiss function now correctly deletes the dismissed element. Also the query render, will now render all invitees 2016-09-12 15:04:32 +01:00
wmwragg d538377b82 Added an inviteList state to hold all the users to invite, but currently pretend it only has one users (the first one) 2016-09-12 14:48:00 +01:00
wmwragg 7d58968ea6 Correctly positioning the selected element if list shrinks in size 2016-09-12 14:07:51 +01:00
wmwragg 28dcbb2a78 Refactored the queryList into seperate AddressSelector component 2016-09-12 13:00:44 +01:00
Matthew Hodgson 3a1159ce12 e2e look & feel 2016-09-12 01:37:51 +01:00
Matthew Hodgson e6b4b8c1cb bring back small avatars for info msgs otherwise the design breaks 2016-09-11 23:01:20 +01:00
Aviral Dasgupta 8db2a4d46f Fix linkification and bump linkifyjs dep 2016-09-12 03:30:00 +05:30
Matthew Hodgson 46205ad83c back out small avatars for emotes for now as they conflict with the E2E artwork.
they will be reintroduced once we have lozenges
2016-09-11 22:49:05 +01:00
Matthew Hodgson 83209197f4 Merge branch 'develop' into matthew/notif-panel 2016-09-11 02:38:16 +01:00
Matthew Hodgson 34bb37aaba layout for file & notif panel 2016-09-11 02:14:27 +01:00
Matthew Hodgson bae6409edb show badge menu on RoomTile hoverover 2016-09-11 00:30:43 +01:00
Matthew Hodgson be33c35876 use new onRoomTimelineReset API to let notif timeline reset itself 2016-09-10 10:46:30 +01:00
Matthew Hodgson 6f270fd621 remove debug 2016-09-10 01:39:19 +01:00
Matthew Hodgson 86da0e0d63 Merge pull request #459 from VShell/fix-cas
Fix CAS support by using a temporary Matrix client
2016-09-09 21:19:19 +01:00
Shell Turner 1380bf705a Fix CAS support by using a temporary Matrix client
Signed-off-by: Shell Turner <cam.turn@gmail.com>
2016-09-09 21:01:10 +01:00
David Baker 96fabe09d2 Update createRoom to support creating DM rooms
* Make ChatInviteDialog and MemberInfo createRoom use it
* Fix bug in setDMRoom
2016-09-09 19:25:00 +01:00
David Baker 8e518af96c Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms 2016-09-09 17:38:13 +01:00
David Baker f1ed750246 Don't crash if no DM rooms with someone
...when opening MemberInfo.

getDMRoomsForUserId should always return a valid list, since it's a list of what DM rooms you have with somebody.
2016-09-09 17:35:35 +01:00
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
Kegan Dougal 9c290c4b8d Return after sending an error 2016-09-09 16:14:41 +01:00
Kegan Dougal a306a5e694 Fix bug whereby refreshing Vector would not allow querying of membership state
This was caused by Vector only sending a room alias with the `view_room` action.
We now resolve this to a room ID if we don't have a room ID.
2016-09-09 16:06:19 +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
Luke Barnard 6ddc31fb66 Merge pull request #443 from matrix-org/luke/post-messages
Scalar Messaging: Expose join_rules and restrict to currently viewed room
2016-09-09 09:57:48 +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 f4d939da81 null checks on room in onRoomTimeline 2016-09-09 02:09:12 +01:00
Matthew Hodgson 4aef352a5c update to use new API based on js-sdk PR input 2016-09-08 22:48:44 +01:00
Luke Barnard f605b172a7 Better log 2016-09-08 17:38:51 +01:00
Matthew Hodgson 3c7864a7ad remove unused _gatherTimelinePanelRef 2016-09-08 14:52:08 +01:00
Matthew Hodgson f88ba9df11 fix comment & use room.getUnfilteredTimelineSet() 2016-09-08 14:38:34 +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
David Baker ee7c064690 I can't spell 'likely' 2016-09-08 13:56:45 +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
wmwragg d1974a75fd Only Direct Message rooms, that aren't parted or forgotten are used 2016-09-08 13:09:54 +01:00
wmwragg d0523cae70 If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one 2016-09-08 11:45:09 +01:00
Aviral Dasgupta 8da7b98ad0 RTE: Remove dead code, fix <del> styling 2016-09-08 11:21:39 +05:30
Matthew Hodgson c882d66b0d make NotificationPanel work 2016-09-08 03:02:31 +01:00
Matthew Hodgson 27b3f5f6b1 create a global notif timeline set for each client 2016-09-08 03:02:26 +01:00
Matthew Hodgson 7174648f94 don't show RRs if manageRRs is false 2016-09-08 03:01:38 +01:00
Matthew Hodgson 334564c814 unbreak tests 2016-09-07 22:54:38 +01:00
Matthew Hodgson 8f75bce29e add fixmes 2016-09-07 22:54:37 +01:00
Matthew Hodgson 990d84df77 make FilePanel refresh when we switch rooms 2016-09-07 22:54:37 +01:00
Matthew Hodgson e7074ef9af apply FilePanel css and fix filtering 2016-09-07 22:54:37 +01:00
Matthew Hodgson c2f2fb3816 use passive event listener for mousewheel 2016-09-07 22:54:37 +01:00
Matthew Hodgson e5dd2e0b46 make FilePanel work, superficially at least 2016-09-07 22:54:37 +01:00
Matthew Hodgson b4c1eca1c5 fix key warning 2016-09-07 22:54:37 +01:00
Matthew Hodgson 850578a973 FilePanel 2016-09-07 22:54:37 +01:00
Matthew Hodgson e22d0a53b6 WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets 2016-09-07 22:54:37 +01:00
Matthew Hodgson 820cd579d8 fix stupid double-spacing issue 2016-09-07 22:54:37 +01:00
Matthew Hodgson c3de035964 filepanel 2016-09-07 22:54:37 +01:00
Matthew Hodgson ae34f2ed5c placeholder NotificationPanel 2016-09-07 22:53:15 +01:00
Matthew Hodgson d9ffe30a0d WIP notif panel 2016-09-07 22:53:15 +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
Luke Barnard ce68a5bfc8 clean up 2016-09-07 17:08:02 +01:00
Luke Barnard 31d2a819f0 Get power levels before setting them 2016-09-07 17:06:57 +01:00
wmwragg ca3910f5a8 Mouse actions on the queryList added, as well as better queryListElement styling 2016-09-07 16:18:50 +01:00
David Baker 66b2944011 Convert Rooms.js to ES6 2016-09-07 11:45:32 +01:00
David Baker 8a4606cfbf Remove unused import 2016-09-07 11:34:55 +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 db42d629aa Rename MatrixTools to Rooms
Since all the functions therein are to do with rooms, so this name is probably more helpful
2016-09-07 11:30:09 +01:00
wmwragg dd186dd612 Fixed wrong type to justified prop 2016-09-07 10:59:06 +01:00
wmwragg 7e60012bd4 Added justification for the AddressTile, when requested 2016-09-07 10:55:44 +01:00
David Baker 094080629d Actually commit changed path 2016-09-07 10:19:39 +01:00
David Baker 8f6d413ebd Move DMRoomMap to a util subdir 2016-09-07 10:07:43 +01:00
Luke Barnard 4bfa57b34e Getting join rules does not need user ID 2016-09-07 09:58:48 +01:00
Luke Barnard 3977ea0074 Add ability to set power level 2016-09-07 09:57:07 +01:00
wmwragg 45256f5d58 Validation checks added 2016-09-06 17:46:00 +01:00
David Baker d5b23e9e0e Save guessed DM rooms to account data
Also bugfix
2016-09-06 17:43:39 +01:00
wmwragg 52f050b5f9 Better scrolling UX, and fixed bug which created a room when no address supplied 2016-09-06 17:20:37 +01:00
wmwragg c03f145f04 Basic keyboard scrolling of queryList 2016-09-06 17:00:28 +01:00
wmwragg 91b1c1f0fc Initial highlighting selected address - styling not final 2016-09-06 16:39:50 +01:00
David Baker 8401323156 Hopefully read DM rooms from account data 2016-09-06 16:39:21 +01:00
wmwragg d1398b137a Circumventing autofill by using a textarea rather than an input type=text 2016-09-06 16:15:48 +01:00
wmwragg 0f73c4326e Added scrolling to queryList 2016-09-06 15:46:58 +01:00
wmwragg 391fe0ab77 Basic address list created, and UX tweaks for interaction 2016-09-06 15:24:23 +01:00
wmwragg ddf1e4841a Selecting users with arrow keys added 2016-09-06 13:07:06 +01:00
wmwragg 1fe85f37fd Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching 2016-09-06 11:34:38 +01:00
Luke Barnard cb4df84d49 Missing curly bracket 2016-09-06 10:36:44 +01:00
Luke Barnard fa3387b326 Code review
- use an empty state key
- swap switch for if
- s/not in view/not visible/
2016-09-06 10:29:38 +01:00
David Baker 80dd927275 Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
Fix: conference rooms were no longer hidden
2016-09-05 18:39:15 +01:00
David Baker 04889a89ec Only count rooms we're in as DM rooms 2016-09-05 18:35:32 +01:00
David Baker 50ef695740 Fix: conference rooms were no longer hidden 2016-09-05 17:42:22 +01:00
wmwragg 5ed680e5ce Picking the top of the queryList not _userList, as the queryList is the query filtered _userList 2016-09-05 17:34:20 +01:00
wmwragg 3dd84e2b8a Initial AddressTile added 2016-09-05 17:28:08 +01:00
David Baker d782d5bbc7 Fix error dialog on conf call error 2016-09-05 17:03:10 +01:00
Luke Barnard 310e6602ca Fix ref to dispatcher 2016-09-05 15:24:05 +01:00
Luke Barnard efccdab0ad Better error message for room not viewed 2016-09-05 15:16:22 +01:00
Luke Barnard 1c29c95990 Only current room works with postMessage 2016-09-05 15:13:48 +01:00
Luke Barnard 54f21c9acc Expose join rules of a room 2016-09-05 14:58:16 +01:00
wmwragg d9c6448a0f Adding better deafults and ErrorDialog message 2016-09-05 14:29:21 +01:00
wmwragg 3d66dff0aa Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any 2016-09-05 14:16:21 +01:00
wmwragg 9c0f51fb82 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:06:31 +01:00
wmwragg ca443e01d8 Initial commit of the new ChatInviteDialog 2016-09-05 12:03:16 +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
wmwragg 67c623d410 Rename the action to make it clearer what it is doing 2016-09-05 10:29:03 +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
Kegan Dougal 56ac0004e5 Use href='#' hack to make link text look like a link 2016-09-05 09:10:15 +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
Matthew Hodgson dbd17ea953 improve e2e warning a bit 2016-09-02 17:37:16 +01:00
Matthew Hodgson b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson d5062f1ff7 gah, revert debug 2016-09-02 17:15:21 +01:00
Matthew Hodgson fd664e893f Merge branch 'master' into develop 2016-09-02 17:14:24 +01:00
Matthew Hodgson 6de2e8bda5 update changelog 2016-09-02 17:13:52 +01:00
Richard van der Hoff fd0ed4a406 Show something when we see a no-op join event
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
2016-09-02 16:59:42 +01:00
Matthew Hodgson 8e9c04e1aa Merge pull request #438 from matrix-org/rav/matrix_dev_hack
Show something when we see a no-op join event
2016-09-02 16:58:29 +01:00
Richard van der Hoff f5fe4b2433 Show something when we see a no-op join event
As a very quick hack to work around
https://github.com/vector-im/vector-web/issues/2020, don't supress no-op joins
2016-09-02 16:54:27 +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
Richard van der Hoff f3a1c58fa9 Handle broken OlmAccounts
olm 1.0.0 made broken OlmAccounts, which we may be unable to restore with olm
1.1.0. Add some words to that effect, and make sure we clear the localstorage.
2016-09-02 11:28:04 +01:00
Richard van der Hoff 584c7ed56d Merge branch 'rav/show_session_load_errors' into develop 2016-09-02 11:03:39 +01:00
Richard van der Hoff b4521bc44c review feedback 2016-09-01 22:45:09 +01:00
Matthew Hodgson 1586e5bd6f fix guest access; broken since Aug 18 2016-09-01 22:16:55 +01:00
Matthew Hodgson 1bc26cb6c5 fix guest access; broken since Aug 18 2016-09-01 16:58:37 +01:00
wmwragg e7d4ef74d0 Placeholder for one to one chat dialog and functionality 2016-09-01 16:45:24 +01:00
Matthew Hodgson 031daf7b3c Merge pull request #434 from matrix-org/matthew/uninterrupted-audio
use a top-level audio tag for playing all VoIP audio.
2016-09-01 16:12:37 +01:00
Matthew Hodgson f0d5f42921 whine loudly if remoteAudio element is missing 2016-09-01 13:58:26 +01:00
Richard van der Hoff ba341c11fb Show session restore errors on the login screen
If we are unable to load the matrix session on startup, don't just get stuck at
a spinner; instead, show the error on the login screen.
2016-09-01 11:08:40 +01:00
Matthew Hodgson 4829ac0c4d comment 2016-09-01 11:07:46 +01:00
Matthew Hodgson a23d8e313d show ongoing audio call in LeftPanel 2016-09-01 00:13:32 +01:00
Matthew Hodgson 6c4ad49b78 use a top-level audio tag for playing all VoIP audio.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621 2016-08-31 21:50:46 +01:00
Matthew Hodgson 35fff74477 oops, typo 2016-08-31 17:25:41 +01:00
Matthew Hodgson 516369fb07 use promises to mediate access to HTMLAudioElements 2016-08-31 16:38:37 +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
Matthew Hodgson 5e105e1be6 make /user URLs work 2016-08-28 14:04:11 +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
Aviral Dasgupta 7c6b1703f3 fix emojione sizing 2016-08-28 14:54:07 +05:30
Matthew Hodgson 18436e1257 pick up ! matrix.to URLs 2016-08-28 02:12:18 +01:00
Matthew Hodgson de82ac3bc0 don't change URL bar when clicking on linkified rooms or users.
be aware of /user paths.
2016-08-28 02:05:31 +01:00
Matthew Hodgson ad873c2b60 handle matrix.to links correctly. add partial support for #/user URLs 2016-08-28 01:55:42 +01:00
Matthew Hodgson 50d09f73f5 add leave/forget button to RoomSettings 2016-08-28 00:00:22 +01:00
Matthew Hodgson fb5f8294c8 switch to namespaced CSS 2016-08-28 00:00:10 +01:00
Matthew Hodgson 5b0d13c1fc switch to namespaced CSS 2016-08-27 23:59:55 +01:00
Matthew Hodgson 5df98d70f4 add debugging to MemberAvatar to try to kick jenkins... 2016-08-27 01:18:48 +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
Richard van der Hoff c1db6fb42d Merge pull request #429 from matrix-org/rav/timelinepanel_test
Update annoying TimelinePanel test
2016-08-25 15:40:03 +01:00
Matthew Hodgson ae910d82a8 Merge pull request #416 from aviraldg/feature-changelog
add fancy changelog dialog
2016-08-24 18:01:39 +01:00
Richard van der Hoff cdd2902b01 Update annoying TimelinePanel test
* Actually test what we were supposed to be testing (viz, that we can paginate
  back down after we hit the top of the room)

* Make the cap on the number of events we show in the timeline a configurable
  property, so that we can set it in the test

* Use a smaller cap in the test, so that we have to do less paginating to hit
  the cap, to make the test run quicker.

* add some more logging so that we can see how far it's got if it gets stuck.
2016-08-24 16:28:00 +01:00
Kegsay 97fc4249d4 Merge pull request #428 from matrix-org/kegan/state-key-with-underscores
Send bot options with leading underscore on the state key
2016-08-24 15:09:44 +01:00
Kegan Dougal c292312115 Send bot options with leading underscore on the state key
This is in order to get around the synapse rule which states that if the
state key is a user ID, then only that user can send the event. We want to
set the event for another user (the bot), hence we can't send just the plain
user ID.
2016-08-24 14:54:44 +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
Kegan Dougal 6235d88b55 Missing return 2016-08-24 14:10:21 +01:00
Kegan Dougal 73ba55abad s/then/done/ to throw uncaught exceptions if the error function throws 2016-08-24 13:47:35 +01:00
Kegan Dougal dbff5f671e Add ability to query and set bot options
- Also standardise on 'success' as the key name for successes.
- Also return the entire `content` on get state event requests.
2016-08-24 13:23:06 +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
Kegan Dougal ecc7850e13 Trailing ) 2016-08-23 14:50:52 +01:00
Kegan Dougal 1c649303e3 Consistency with sendResponse 2016-08-23 14:50:29 +01:00
Kegan Dougal e96a40004b Review comments 2016-08-23 14:41:47 +01:00
Kegan Dougal f6b008350d Spaces not tabs 2016-08-23 13:31:55 +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 ddda435e9e Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not 2016-08-18 22:15:53 +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
David Baker 5495cfaca9 Only try to delete room rule if it exists 2016-08-18 16:59:25 +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 d08f716681 Comment override rule stuff 2016-08-18 15:21:46 +01:00
David Baker fc2c62e896 We can use the new consts here 2016-08-18 15:19:24 +01:00
David Baker bab2f23db3 Oops, missed a constant 2016-08-18 15:18:02 +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
Luke Barnard 46d306a217 Change register response access_token to scalar_token 2016-08-17 17:16:19 +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 8e8e6fd5fe formatTime for use with new timestamp format 2016-08-16 15:01:01 +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
Aviral Dasgupta 8777780928 strip (IRC) suffix from tabcomplete entries
fixes vector-im/vector-web#574
2016-08-16 03:50:59 +05:30
Aviral Dasgupta ff39d52431 add fancy changelog dialog 2016-08-16 03:33:47 +05:30
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
Matthew Hodgson 534d996582 ignore local busy - workaround for https://github.com/vector-im/vector-web/issues/1964 2016-08-15 16:17:35 +01:00
David Baker 5a83adc2b6 Merge pull request #414 from matrix-org/rav/fix_device_display_name
defaultDeviceDisplayName should be a prop
2016-08-12 11:44:57 +01:00
Richard van der Hoff b9870f2c23 defaultDeviceDisplayName should be a prop
... not a bit of config.
2016-08-12 11:41:45 +01:00
David Baker 33e9abe421 Merge pull request #410 from matrix-org/rav/use_server_device_id
Use server-generated deviceId
2016-08-12 11:40:55 +01:00
Richard van der Hoff 5fc98ffc49 Avoid setting device_id to 'undefined'
Deal with the situation where synapse doesn't give us a device_id on login:
don't set the device_id to 'undefined' in localstorage.
2016-08-12 11:22:04 +01:00
Richard van der Hoff a29325cc46 Set initial_device_display_name on login and register
Let Vector pass in a default device name, and thread it through everywhere to
set it on login and register calls
2016-08-12 10:55:02 +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 5f61464195 Merge pull request #408 from matrix-org/rav/refactor_matrix_client
Don't use MatrixClientPeg for temporary clients
2016-08-12 10:42:58 +01:00
David Baker fc0c5a5c58 Tidy up fix to multi-invite 2016-08-12 10:02:55 +01:00
Richard van der Hoff df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +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 434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' 2016-08-11 17:34:05 +01: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
Richard van der Hoff e32c325863 Don't use MatrixClientPeg for temporary clients
Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local,
temporary MatrixClients for the unauthed steps; we therefore only use
MatrixClientPeg for logged-in clients.
2016-08-11 16:23:03 +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 4f76398b29 Merge pull request #407 from matrix-org/rav/refactor_guest_registration
Move guest registration into the login logic
2016-08-11 13:13:51 +01:00
Richard van der Hoff e06763d421 Move guest registration into the login logic 2016-08-11 13:05:16 +01: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
Richard van der Hoff bbfb9291f8 Refactor login token
move the logic for handling login tokens into Lifecycle.loadSession

This means it needs access to the (real) query parmeters, so it depends on
corresponding changes in vector-web.
2016-08-11 11:02:52 +01:00
David Baker 6802db05bd Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login
Use the current HS for guest login
2016-08-11 10:32:37 +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
Richard van der Hoff 1fbddcf6af Use the current HS for guest login
Make sure that we use the homeserver from localstorage for guest regsistration,
in preference to the default.

Also rename the parameters for loadSession
2016-08-11 01:39:33 +01:00
Richard van der Hoff 5b9d395234 Yet another fix to session saving
I've written tests this time, and everything.
2016-08-11 00:58:48 +01:00
Richard van der Hoff a85259c2b7 Fix session persistence
https://github.com/matrix-org/matrix-react-sdk/pull/404 messed this up
somewhat; hopefully this gets it right
2016-08-10 23:52:09 +01:00
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 92762eca74 Fix settings resetting on refresh
Don't clear localstorage when replacing the client: we clear it when logging out so this is just redundant, and since we now use replaceClient to unpickle a session from localstorage, this was blowing away all our setting on every refresh.

Also Move all of the localstorage code to Lifecycle (except device ID but this will probably be generated on the server soon anyway). We previously cleared localstorage on logout in Lifecycle so persist the session in Lifecycle.setLoggedIn() to be symmetrical.
2016-08-10 18:04:22 +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
David Baker f08519a496 Merge pull request #401 from matrix-org/rav/avoid_login_for_guest
Avoid flashing up login screen during guest registration
2016-08-10 15:38:34 +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 68f8db3834 Avoid flashing up login screen during guest registration
Fix a bug where we would flash up the login screen during guest registration if
you followed a room link.
2016-08-10 14:34:44 +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 6aa5e5a493 Merge pull request #399 from matrix-org/rav/refactor_session_rehydration
Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
2016-08-10 12:56:01 +01:00
Richard van der Hoff 3922f6a1b7 Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
This means that we don't create a spurious MatrixClient which is thrown away by
the SessionLoader (whilst still ensuring that the rehydrated matrixclient
follows the same code path as matrixclients created at other points in the
session load process).
2016-08-10 11:59:24 +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 e0f71977b4 Merge pull request #397 from matrix-org/rav/factor_out_sessionloader
Start to factor out session-loading magic
2016-08-10 11:40:58 +01:00
Richard van der Hoff 26c7c9e994 Make SessionLoader a function
There's no point in it being a React component.
2016-08-10 11:36:26 +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 24841cc5c4 Start to factor out session-loading magic
Take some of the magic out of MatrixChat.componentDidMount() into a new
component.

Also delete the MatrixChat test. It wasn't really doing much, is broken by the
change, and I am replacing it with (better) app-level tests in the vector
project.
2016-08-10 00:05:44 +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 1b414cad18 Add max-width to emoji completions. 2016-08-10 00:52:55 +05:30
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
David Baker 4b8ad3c102 Merge pull request #393 from matrix-org/dbkr/enable_labs
Add config to hide the labs section
2016-08-05 17:25:25 +01:00
David Baker 5e358b8cf6 Add comment 2016-08-05 17:18:45 +01:00
David Baker f8d02c1551 pr feedback 2016-08-05 16:36:35 +01:00
David Baker e8ee5c2f96 Add config to hide the labs section 2016-08-05 16:13:06 +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
David Baker 1f2b023885 Make sure error message never lies
Make sure we don't say 'login incorrect' unless the user is actually trying to log in
2016-08-04 17:37:07 +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 e144da75e3 Comment onLoggedOut & consistent comment style 2016-08-04 10:49:34 +01:00
Richard van der Hoff e1fea24fd6 Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled
Don't leave isRoomPublished as undefined
2016-08-04 10:42:34 +01:00
Matthew Hodgson 6632322029 spell out that conference calling is hit and miss 2016-08-03 19:56:13 +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 afa46a855b Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account 2016-08-03 17:52:35 +01:00
David Baker 498ad7fa4c Merge branch 'develop' into dbkr/deactivate_account 2016-08-03 17:52:18 +01:00
David Baker cbfb0ad998 Merge pull request #377 from matrix-org/dbkr/use_logout_api
Call the logout API when we log out
2016-08-03 17:51:42 +01:00
David Baker bb3a7725db Shift loginIncorrect into state
and consequently make setErrorTextFromError into setStateFromError
2016-08-03 17:49:29 +01:00
David Baker 476f69cbec Unused ref 2016-08-03 17:38:13 +01:00
David Baker b32a19a0f1 Comments 2016-08-03 17:23:09 +01:00
David Baker 0919e41469 Fix MatrixClientPeg.start()
Move import & use `this`
2016-08-03 16:45:23 +01:00
David Baker 009c768b72 Comma fail 2016-08-03 16:41:22 +01:00
David Baker 9bf45fb556 Add start wrapper in MatrixClientPeg
to handle the opts dictionary
2016-08-03 16:39:47 +01:00
David Baker b95a1c4a4b Just doc with the MatrixClientCreds object 2016-08-03 16:31:42 +01:00
David Baker a5384d32e2 Copy opts to set pendingEventOrdering 2016-08-03 16:28:37 +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
David Baker ff2dd74429 Merge pull request #383 from matrix-org/matthew/fix-video-upload
fix upload for video or image files where sniffing fails
2016-08-03 15:04:53 +01:00
wmwragg c1cfbd6b59 Corrected comment typo 2016-08-03 14:47:53 +01:00
Richard van der Hoff f4d41b7847 DevicesPanel: use device_id as a placeholder
A device may have no display_name set, in which case we probably want to use
the device_id as a placeholder.
2016-08-03 14:19:54 +01:00
Richard van der Hoff 55f4d23625 MemberDeviceInfo: Use the device name, where available
we now have device name for e2e devices: use it!
2016-08-03 14:18:09 +01:00
wmwragg 8e19532e5a Hover state for badges, now only on the badges themselves 2016-08-03 14:09:10 +01:00
Aviral Dasgupta 8e66e6dfdd fix: Switch to opacity: 0 for composer emoji.
This seems to be the best option for displaying emoji in the composer. While it means selected emoji don't actually have the selection colour applied, it's the most functional of all the options. Facebook uses the same approach.
2016-08-03 18:27:49 +05:30
David Baker efdcc6da98 Merge pull request #384 from aviraldg/fix-composer-up-down
fix: allow up/down normally for no completions
2016-08-03 13:55:13 +01:00
Aviral Dasgupta a2d64f5119 fix: allow up/down normally for no completions
Autocomplete current eats up up/down key events by unconditionally returning
true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible.
2016-08-03 18:04:52 +05:30
David Baker 1ff2ce60ff Merge pull request #382 from aviraldg/fix-autocomplete-confirm
fix: autocomplete to use tab instead of return
2016-08-03 13:28:11 +01:00
Matthew Hodgson 569b6057c3 fix upload for video or image files where sniffing the content.info fails 2016-08-03 13:27:06 +01:00
Aviral Dasgupta 1f9a396fa5 fix: autocomplete to use tab instead of return 2016-08-03 17:51:40 +05:30
Matthew Hodgson 104ccc751f Merge pull request #375 from aviraldg/fix-574
strip (IRC) displayname suffix from autocomplete
2016-08-03 13:00:30 +01:00
Aviral Dasgupta 2cddf18461 strip (IRC) displayname suffix from autocomplete
Fixes vector-im/vector-web#574
2016-08-03 17:26:05 +05:30
David Baker ffa97a4095 Log out when account is deactivated 2016-08-03 11:47:29 +01:00
David Baker f8201ac2ea Merge branch 'dbkr/use_logout_api' into dbkr/deactivate_account 2016-08-03 11:39:22 +01:00
David Baker f47ac87775 Don't show deactivate button for guests 2016-08-03 11:34:31 +01:00
David Baker 2f0fd6da05 Actually commit the deactivate account dialog 2016-08-03 11:34:13 +01:00
David Baker d9a7d50a03 Add an interface for MatrixClientCreds
and make MatrixClientPeg functions use it consistently
2016-08-03 10:46:42 +01:00
David Baker cf7e7d65c8 Don't start the client twice
if we have a guest_access_token
2016-08-03 10:15:50 +01:00
David Baker 1f17b78371 log if we can't log out 2016-08-03 10:01:23 +01:00
David Baker e3a5776eae We should clear /login off the URL after login 2016-08-03 09:57:12 +01:00
David Baker 4825ab8fe7 No need to set options in WillStartClient
We can set them any time up to that point
2016-08-03 09:53:02 +01:00
David Baker 0c2bd10594 Comment functions 2016-08-02 19:05:05 +01:00
David Baker 0c61c52480 Just use Lifecycle.setLoggedIn 2016-08-02 19:02:07 +01:00
David Baker d74a8e405d Remove unused function 2016-08-02 19:00:01 +01:00
David Baker 65865f879f We already know we're a guest here 2016-08-02 18:59:09 +01:00
David Baker 40834d188e Don't let pendingEventOrdering be changed 2016-08-02 18:58:18 +01:00
David Baker 77a5384bf8 Comment startMatrixClient 2016-08-02 18:56:12 +01:00
David Baker c2c548ef5a Comment logout 2016-08-02 18:55:13 +01:00
David Baker b9a5f7902b Doc setLoggedIn & remove redundant opts 2016-08-02 18:52:56 +01:00
David Baker 58bbb35096 s/login/setLoggedIn/ 2016-08-02 18:48:27 +01:00
David Baker 3818a89ca3 Comment guestCreds 2016-08-02 18:46:43 +01:00
David Baker 54c10a5d89 Get name of section right 2016-08-02 18:42:02 +01:00
David Baker aafec49abf WIP for deactivaing account UI
https://github.com/vector-im/vector-web/issues/1775
2016-08-02 18:40:12 +01:00
David Baker 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
David Baker db9750a7e3 Call the logout API when we log out
Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient.
2016-08-02 14:04:20 +01:00
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 94350bc780 Fixed spelling mistake 2016-07-28 15:51:46 +01:00
wmwragg bc902a9741 Tidy up of the contextual menu refactor 2016-07-28 14:32:59 +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
David Baker cf3cd69f37 Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate
Remove relayoutOnUpdate prop on gemini-scrollbar
2016-07-27 15:21:46 +01:00
wmwragg 0660b9feff Fixes to properly point to the moved components 2016-07-27 14:49:10 +01:00
wmwragg 3cb3dd96a6 Added the moved ContextualMenu to the components list 2016-07-27 14:23:37 +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
David Baker 09993cd3bc Add comment back 2016-07-26 18:19:25 +01:00
David Baker 31399254b6 Fix onRoomStateMember debouncing
Don't have debounced functions take arsg, because they won't be the same for each invocation.
2016-07-26 18:15:26 +01:00
David Baker 4ecf5f6372 Fix bug where vector freezes on power level event
Make rate_limited_function accept functions with args so we can just ratelimit the event handler & be done with it.

Fixes https://github.com/vector-im/vector-web/issues/1877
2016-07-26 17:58:19 +01:00
wmwragg 0eb15085e9 some code tidyup 2016-07-26 17:25:16 +01:00
wmwragg 477a17b49f Removed debug statement 2016-07-26 10:39:34 +01:00
wmwragg 8f3e93214c Drawing cheveron with CSS so it can be styled 2016-07-25 18:02:30 +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
David Baker 4b763997df Merge pull request #361 from matrix-org/dbkr/refactor_matrixclientpeg
Refactor MatrixClientPeg
2016-07-25 16:36:47 +01:00
David Baker cbf10bfff6 PR feedback
Reintroduce replaceClient so we're not calling replaceUsingAccessToken without access tokens which is a bit silly.
Fix bug from previous commit (pass isGuest through)
2016-07-25 16:28:28 +01:00
David Baker 587a86441f This may as wel go in createclient 2016-07-25 16:20:03 +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
Matthew Hodgson ece575bd00 Merge pull request #363 from matrix-org/dbkr/fix_start_chat
Fix 'start chat' button on MemberInfo
2016-07-22 18:36:32 +01:00
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
David Baker ddbac8c73a More refactoring of MatrixClientPeg
Including getting rid of GuestAccess as it was basically doing nothing apart from remembering if we were a guest which may as well be done in the same place we save/restore everything else
2016-07-22 15:47:47 +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
David Baker b7e95b3883 Remove other guestAccess arg 2016-07-22 14:00:23 +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
David Baker ea5e021d8d Refactor MatrixClientPeg
Should be functionally identical
2016-07-21 17:57:55 +01:00
wmwragg 4013ea75d0 Testing out the context menu 2016-07-21 17:44:31 +01:00
Richard van der Hoff 9565eef84d Merge pull request #360 from matrix-org/dbkr/fix_tabcomplete_order_again
Fix tab complete order properly
2016-07-21 16:35:27 +01:00
David Baker 0b0f10ddf6 Fix tab complete order properly
Don't return NaN from your sort functions...
2016-07-21 16:25:51 +01:00
wmwragg 775fc97102 Slight refactor to better match current code 2016-07-21 14:33:54 +01:00
David Baker 030652f289 Add removeLisatener for account data listener 2016-07-21 13:49:31 +01:00
David Baker 46a2c74d71 Merge pull request #358 from matrix-org/rav/device_id_for_register
Set the device_id on pre-login MatrixClient
2016-07-21 13:15:39 +01:00
Richard van der Hoff e41df245c3 Set the device_id on pre-login MatrixClient
In order that device_id is set when we register a new user (or, for that
matter, when we register as a guest), we need to make sure that device_id is
set on the temporary MatrixClient which is created before the user is logged
in - ie, that created by replaceUsingUrls.

In order to achieve this, I've basically removed the distinction between
replaceUsingAccessToken and replaceUsingUrls. There is a side-effect in that
the temporary MatrixClient now gets an e2e sessionStore, but I don't think that
is a bad thing.
2016-07-20 20:20:10 +01:00
Matthew Hodgson 165b0810cc remove debug 2016-07-20 18:17:09 +01:00
Matthew Hodgson bc87fc575b remove debug 2016-07-20 18:16:54 +01:00
Matthew Hodgson d6415aceca handle accountData changes, and errors on toggling URL previews 2016-07-20 18:14:16 +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
David Baker 02e2ade7d9 Merge pull request #336 from matrix-org/dbkr/add_email_fail_if_in_use
Use HS proxy API for requestToken on adding email
2016-07-20 14:05:58 +01:00
David Baker ae7e51ae17 Merge pull request #337 from matrix-org/dbkr/password_reset_email_not_found
Error if email already in use when resetting pw
2016-07-20 14:00:12 +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 2190dcbe1e Merge pull request #354 from Half-Shot/develop
Add support for sending uploaded content as m.video
2016-07-20 11:15:38 +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
Will Hunt 4bd2b93f59 Add support for sending uploaded content as m.video 2016-07-19 16:05:15 +01:00
Matthew Hodgson 1ba0ef7369 Merge pull request #350 from matrix-org/wmwragg/spinner-fix
Wmwragg/spinner fix
2016-07-19 12:10:31 +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
Matthew Hodgson 6bf5499289 typos 2016-07-18 10:47:03 +01:00
Matthew Hodgson e92024f7a9 reskindex 2016-07-18 10:42:18 +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 f13bb5f656 typos 2016-07-18 01:39:24 +01:00
Matthew Hodgson ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +01:00
Matthew Hodgson bcd1c7e099 improve comment 2016-07-18 01:34:26 +01:00
wmwragg a385955c6b Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it. 2016-07-17 21:23:52 +01:00
wmwragg 1559c69ddf Create room Dialog Spinner fix. 2016-07-17 21:21:27 +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
David Baker 5c566cae5c typo 2016-07-15 18:10:56 +01:00
David Baker ccf8e269cd Comments & required props 2016-07-15 17:15:51 +01:00
David Baker 327015ba0f Tidy up autocomplete updating
..into a function
2016-07-15 17:03:53 +01:00