Commit Graph

2365 Commits (48340a28176c9856c555b0dacb805c3d7ea23dc3)

Author SHA1 Message Date
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