890100a5bc
Silly mistake fixed, spotted by Dave (cheers)
2016-09-13 16:28:35 +01:00
8bb9422907
Merge pull request #466 from aviraldg/feature-autocomplete-behaviour
...
Improve autocomplete behaviour
2016-09-13 16:17:23 +01:00
eb2a55445c
Merge pull request #2175 from aviraldg/feature-autocomplete-behaviour
...
Improve autocomplete behaviour (styling)
2016-09-13 16:17:14 +01:00
272dd82b9d
Added multi invite functionality
2016-09-13 16:06:04 +01:00
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
3fe8b503e5
Fixed over collapse on Safari, and now hide the RHS footer Invite when collapsed
2016-09-13 14:57:58 +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
bdee2d3b28
Shifting icon to center of collapsed section
2016-09-13 14:44:54 +01:00
15ee2578c5
Tweak to font colour
2016-09-13 14:36:13 +01:00
f8c9a28194
Updated to correct invite icon
2016-09-13 14:33:19 +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
768f11fe58
Added new Invite button in the RHS footer
2016-09-13 14:27:23 +01:00
acdcb21830
Fixed weird margin bug when LHS panel is collapsed
2016-09-13 13:32:50 +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
1530568354
Merge branch 'develop' into wmwragg/chat-multi-invite
2016-09-13 12:38:45 +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
7b25f4e069
wip for collapsable RHS
2016-09-13 12:18:09 +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
cbab2c142b
Autocomplete restyling
2016-09-13 15:43:59 +05:30
81bbc05028
Merge branch 'develop' of github.com:vector-im/vector-web into develop
2016-09-13 15:42:36 +05:30
d19686b96d
Fix un-marking rooms as DM rooms
2016-09-13 11:06:07 +01:00
f59dbe40ec
Added error checking, and UI
2016-09-13 11:03:27 +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
562c3b0e04
fix notif icon
2016-09-13 10:32:40 +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
f119a57952
dedicated dialog box for E2E messages
2016-09-12 23:42:43 +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
c6fa1e2e21
show e2e icon by default
2016-09-12 20:02:22 +01:00
5a548c3d12
add an onclick to the e2e icons
2016-09-12 18:50:52 +01:00
0bdc026b05
E2E CSS
2016-09-12 18:50:32 +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
wmwragg
Matthew Hodgson
David Baker
Aviral Dasgupta
Matthew Hodgson
Remi Rampin
David Baker