Commit Graph

2539 Commits (db66d728c9f91945c23bfa9cbb9438db4c29cc0b)

Author SHA1 Message Date
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
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
Matthew Hodgson 09b3395710 Merge pull request #476 from matrix-org/wmwragg/use-return-to-invite
Corrected onKeyUp misstype and return can now be used instead of clic…
2016-09-15 14:24:48 +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
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 7d7cb35e15 Merge pull request #471 from matrix-org/revert-460-fix-linkify
Revert "Fix linkification and bump linkifyjs dep"
2016-09-13 19:36:58 +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 eadcc5e2b9 repin linkify 2016-09-13 19:02:44 +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
William Wragg f7f907a0c7 Merge pull request #467 from matrix-org/dbkr/wmwragg/chat-multi-invite
Pull multi-inviting functionality out of MultiInviteDialog
2016-09-13 15:22:06 +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