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
406771532d
Correct path for MultiInviter
2016-09-13 14:56:54 +01:00
a53e009198
Missed a brace
2016-09-13 14:55:16 +01:00
e95a6228e0
Merge remote-tracking branch 'origin/wmwragg/chat-multi-invite' into dbkr/wmwragg/chat-multi-invite
2016-09-13 14:51:46 +01:00
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
2db8f4ae67
Added pass through of roomId
2016-09-13 14:30:37 +01:00
ca1bb0f700
Added new Invite button in the RHS footer which calls the new 'view_invite' action
2016-09-13 14:28:03 +01:00
79e5e6f6fe
Fix force completion and hide rooms with no alias
2016-09-13 18:02:33 +05:30
32b1b6f58a
WIP
2016-09-13 13:12:45 +01:00
c8def540c4
Merge pull request #464 from remram44/remove-mdown-breaks
...
Remove markdown line breaks
2016-09-13 13:11:18 +01:00
ed2595e300
Merge pull request #465 from matrix-org/dbkr/fix_unset_dm
...
Fix un-marking rooms as DM rooms
2016-09-13 13:08:31 +01:00
9a991a4dfd
Autocomplete fixes and improvements
2016-09-13 17:30:29 +05:30
538b68a6b2
Updated with the new createRoom DM stuff
2016-09-13 12:47:31 +01:00
524eeaa315
Merge up from develop
2016-09-13 12:37:52 +01:00
3b52081092
wip for collapsable RHS
2016-09-13 12:18:22 +01:00
fbf2d5f96c
Fix tests (wip)
2016-09-13 16:46:20 +05:30
cba76d651a
Moved the isValidAddress method to the Invite utilty object
2016-09-13 12:12:33 +01:00
0b267763e2
Small refactor to handle Direct Message chat as well as multi invite chat
2016-09-13 12:07:49 +01:00
b62622a814
Improve autocomplete behaviour
...
Fixes vector-im/vector-web#1761
2016-09-13 15:46:02 +05:30
d19686b96d
Fix un-marking rooms as DM rooms
2016-09-13 11:06:07 +01:00
ca2ba55288
Added error checking, and UI
2016-09-13 11:02:59 +01:00
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
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
ce40fa1a8f
add missing dialog
2016-09-12 23:43:00 +01:00
9b7ab46a72
dedicated dialog box for E2E messages
2016-09-12 23:42:24 +01:00
8cab40d987
Disable markdown line breaks
...
Stop combinations of - and _ turning into a line break.
2016-09-12 17:51:59 -04:00
5a548c3d12
add an onclick to the e2e icons
2016-09-12 18:50:52 +01:00
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
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
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
0f720dd6b8
Oops, toLowerCase call in wrong place
2016-09-12 17:41:32 +01:00
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
13eed6cd39
fix NPE in EventTile
2016-09-12 17:29:26 +01:00
5a0a72ee46
Added styling for unknown addresses
2016-09-12 17:25:14 +01:00
97976939bd
Merge pull request #462 from matrix-org/matthew/e2e
...
First wave of E2E Visuals
2016-09-12 17:20:18 +01:00
92b4107174
fix tests
2016-09-12 17:19:58 +01:00
95d9df7534
Make an invalid mx user an unknown user AddressTile
2016-09-12 17:15:56 +01:00
44b8c29c84
Allow addresses to be added as text when space or comma are pressed
2016-09-12 17:06:43 +01:00
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
9eae1c5bb7
final e2e icons
2016-09-12 16:51:19 +01:00
937e195157
Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm
2016-09-12 16:44:44 +01:00
fb639da128
Merge branch 'develop' into matthew/e2e
2016-09-12 16:32:39 +01:00
90fea6c389
unbreak video thumbs
2016-09-12 16:28:56 +01:00
8e7b1820b9
unbreak video thumbs
2016-09-12 16:28:39 +01:00
6ffa7c23cd
Don't re-use parted rooms for DMs
2016-09-12 16:05:51 +01:00
3fc657bce4
Merge pull request #450 from matrix-org/matthew/notif-panel
...
FilePanel, NotificationPanel and EventTimelineSet support
2016-09-12 15:57:13 +01:00
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
4836025a1d
First pass at adding multiple addresses, can only add from AddressSelector at the moment
2016-09-12 15:21:17 +01:00
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
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
William Wragg