435570a022
Better error reporting for failed multi invites
wmwragg
2016-09-14 16:19:09 +01:00
75c9f707e0
Don't show current user in queryList
wmwragg
2016-09-14 15:35:04 +01:00
d3a709f98e
Missed a _isDmChat call when refactoring
wmwragg
2016-09-14 15:19:57 +01:00
c3566e0b49
_isDmChat needs to check the passed in addrs rather than the state.inviteList as they may now differ
wmwragg
2016-09-14 15:17:29 +01:00
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
wmwragg
2016-09-14 15:09:23 +01:00
2a8518b72b
Tab can now be used for selection of address from list, as well as adding a manual mxid or email address
wmwragg
2016-09-14 14:53:13 +01:00
66ef5213b8
Increased hitbox area to the whole invite section, not just the icon
wmwragg
2016-09-14 14:32:30 +01:00
370612135f
The scrollbars are nolonger always visible for the AddressSelector and ChatInviteDialog invite list
wmwragg
2016-09-14 13:55:10 +01:00
2752d6b444
improve e2e and scalar settings UI
Matthew Hodgson
2016-09-14 02:07:37 +01:00
ec05d1b9bd
improve e2e and scalar settings UI
Matthew Hodgson
2016-09-14 02:07:23 +01:00
0473b14564
fix e2e icon transitions
Matthew Hodgson
2016-09-14 01:25:43 +01:00
fd707f6f62
s/Direct Messages/People/
Matthew Hodgson
2016-09-13 19:47:41 +01:00
089951012b
actually, sod it, let's just call it Start chat
Matthew Hodgson
2016-09-13 19:42:35 +01:00
7d7cb35e15
Merge pull request #471 from matrix-org/revert-460-fix-linkify
Matthew Hodgson
2016-09-13 19:36:58 +01:00
ee672d06de
Revert "Fix linkification and bump linkifyjs dep"
Matthew Hodgson
2016-09-13 19:36:46 +01:00
c6a9614372
Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
Matthew Hodgson
2016-09-13 19:31:05 +01:00
8508e006f0
Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite
Matthew Hodgson
2016-09-13 19:30:02 +01:00
17cf2fc745
Merge pull request #470 from matrix-org/matthew/right-panel-collapse
Matthew Hodgson
2016-09-13 19:09:18 +01:00
a623430c2b
Merge pull request #2182 from vector-im/matthew/right-panel-collapse
Matthew Hodgson
2016-09-13 19:08:54 +01:00
b247c8a87f
rename 'start chat' tooltip
Matthew Hodgson
2016-09-13 19:08:43 +01:00
eadcc5e2b9
repin linkify
Matthew Hodgson
2016-09-13 19:02:44 +01:00
91b90aa1fd
Merge pull request #460 from aviraldg/fix-linkify
Matthew Hodgson
2016-09-13 19:01:56 +01:00
eb6a4f97ba
make it work
Matthew Hodgson
2016-09-13 19:00:35 +01:00
7fa102998c
Added valid but unknown mx user
wmwragg
2016-09-13 17:09:40 +01:00
56606c01a0
Added valid but unknown mx user
wmwragg
2016-09-13 17:09:01 +01:00
283e1ccf4c
Merge pull request #468 from matrix-org/dbkr/create_room_modal
David Baker
2016-09-13 17:05:24 +01:00
5450e93df1
Verbiage
David Baker
2016-09-13 16:56:53 +01:00
f82629aed0
Merge pull request #463 from matrix-org/dbkr/flag_incoming_dms
David Baker
2016-09-13 16:42:24 +01:00
3741768a3a
Add modal dialog on new room button
David Baker
2016-09-13 16:40:15 +01:00
890100a5bc
Silly mistake fixed, spotted by Dave (cheers)
wmwragg
2016-09-13 16:28:35 +01:00
8bb9422907
Merge pull request #466 from aviraldg/feature-autocomplete-behaviour
Matthew Hodgson
2016-09-13 16:17:23 +01:00
eb2a55445c
Merge pull request #2175 from aviraldg/feature-autocomplete-behaviour
Matthew Hodgson
2016-09-13 16:17:14 +01:00
272dd82b9d
Added multi invite functionality
wmwragg
2016-09-13 16:06:04 +01:00
f7f907a0c7
Merge pull request #467 from matrix-org/dbkr/wmwragg/chat-multi-invite
William Wragg
2016-09-13 15:22:06 +01:00
3fe8b503e5
Fixed over collapse on Safari, and now hide the RHS footer Invite when collapsed
wmwragg
2016-09-13 14:57:58 +01:00
406771532d
Correct path for MultiInviter
David Baker
2016-09-13 14:56:54 +01:00
a53e009198
Missed a brace
David Baker
2016-09-13 14:55:16 +01:00
e95a6228e0
Merge remote-tracking branch 'origin/wmwragg/chat-multi-invite' into dbkr/wmwragg/chat-multi-invite
David Baker
2016-09-13 14:51:46 +01:00
2fd9e2a98f
Pull out multi-inviting from MultiInviteDialog
David Baker
2016-09-13 14:47:56 +01:00
bdee2d3b28
Shifting icon to center of collapsed section
wmwragg
2016-09-13 14:44:54 +01:00
15ee2578c5
Tweak to font colour
wmwragg
2016-09-13 14:36:13 +01:00
f8c9a28194
Updated to correct invite icon
wmwragg
2016-09-13 14:33:19 +01:00
2db8f4ae67
Added pass through of roomId
wmwragg
2016-09-13 14:30:37 +01:00
ca1bb0f700
Added new Invite button in the RHS footer which calls the new 'view_invite' action
wmwragg
2016-09-13 14:28:03 +01:00
768f11fe58
Added new Invite button in the RHS footer
wmwragg
2016-09-13 14:27:23 +01:00
acdcb21830
Fixed weird margin bug when LHS panel is collapsed
wmwragg
2016-09-13 13:32:50 +01:00
79e5e6f6fe
Fix force completion and hide rooms with no alias
Aviral Dasgupta
2016-09-13 18:02:33 +05:30
32b1b6f58a
WIP
Matthew Hodgson
2016-09-13 13:12:45 +01:00
c8def540c4
Merge pull request #464 from remram44/remove-mdown-breaks
Matthew Hodgson
2016-09-13 13:11:18 +01:00
ed2595e300
Merge pull request #465 from matrix-org/dbkr/fix_unset_dm
Matthew Hodgson
2016-09-13 13:08:31 +01:00
9a991a4dfd
Autocomplete fixes and improvements
Aviral Dasgupta
2016-09-13 17:29:17 +05:30
538b68a6b2
Updated with the new createRoom DM stuff
wmwragg
2016-09-13 12:47:31 +01:00
1530568354
Merge branch 'develop' into wmwragg/chat-multi-invite
wmwragg
2016-09-13 12:38:45 +01:00
524eeaa315
Merge up from develop
wmwragg
2016-09-13 12:37:52 +01:00
3b52081092
wip for collapsable RHS
Matthew Hodgson
2016-09-13 12:18:22 +01:00
7b25f4e069
wip for collapsable RHS
Matthew Hodgson
2016-09-13 12:18:09 +01:00
81bbc05028
Merge branch 'develop' of github.com:vector-im/vector-web into develop
Aviral Dasgupta
2016-09-13 15:42:36 +05:30
d19686b96d
Fix un-marking rooms as DM rooms
David Baker
2016-09-13 11:06:07 +01:00
f59dbe40ec
Added error checking, and UI
wmwragg
2016-09-13 11:03:27 +01:00
ca2ba55288
Added error checking, and UI
wmwragg
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
wmwragg
2016-09-13 10:33:15 +01:00
562c3b0e04
fix notif icon
Matthew Hodgson
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
wmwragg
2016-09-13 10:29:17 +01:00
ce40fa1a8f
add missing dialog
Matthew Hodgson
2016-09-12 23:43:00 +01:00
f119a57952
dedicated dialog box for E2E messages
Matthew Hodgson
2016-09-12 23:42:43 +01:00
9b7ab46a72
dedicated dialog box for E2E messages
Matthew Hodgson
2016-09-12 23:42:24 +01:00
8cab40d987
Disable markdown line breaks
Remi Rampin
2016-09-12 17:51:59 -04:00
c6fa1e2e21
show e2e icon by default
Matthew Hodgson
2016-09-12 20:02:22 +01:00
5a548c3d12
add an onclick to the e2e icons
Matthew Hodgson
2016-09-12 18:50:46 +01:00
0bdc026b05
E2E CSS
Matthew Hodgson
2016-09-12 18:50:32 +01:00
2943db1072
Flag incoming DMs as such
David Baker
2016-09-12 18:32:44 +01:00
e49547eb3e
Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms
David Baker
2016-09-12 18:30:55 +01:00
f6478f111a
Merge pull request #458 from matrix-org/dbkr/createdoom_dm
David Baker
2016-09-12 18:29:43 +01:00
0f720dd6b8
Oops, toLowerCase call in wrong place
wmwragg
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
wmwragg
2016-09-12 17:38:32 +01:00
20eb28f052
fix e2e icon placement
Matthew Hodgson
2016-09-12 17:38:27 +01:00
bfd3ef0e44
Limit the invite area in height
wmwragg
2016-09-12 17:31:49 +01:00
13eed6cd39
fix NPE in EventTile
Matthew Hodgson
2016-09-12 17:29:10 +01:00
abda8c77ad
Added styling for unknown addresses
wmwragg
2016-09-12 17:25:38 +01:00
5a0a72ee46
Added styling for unknown addresses
wmwragg
2016-09-12 17:25:14 +01:00
9e5d090ddb
Merge pull request #2163 from vector-im/matthew/e2e
Matthew Hodgson
2016-09-12 17:20:23 +01:00
97976939bd
Merge pull request #462 from matrix-org/matthew/e2e
Matthew Hodgson
2016-09-12 17:20:18 +01:00
92b4107174
fix tests
Matthew Hodgson
2016-09-12 17:19:58 +01:00
95d9df7534
Make an invalid mx user an unknown user AddressTile
wmwragg
2016-09-12 17:15:56 +01:00
44b8c29c84
Allow addresses to be added as text when space or comma are pressed
wmwragg
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
wmwragg
2016-09-12 16:52:04 +01:00
906be376c9
Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId
wmwragg
2016-09-12 16:51:42 +01:00
9eae1c5bb7
final e2e icons
Matthew Hodgson
2016-09-12 16:51:19 +01:00
695930efa5
e2e icons
Matthew Hodgson
2016-09-12 16:50:53 +01:00
937e195157
Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm
David Baker
2016-09-12 16:44:44 +01:00
7f2c74e7a8
Merge branch 'develop' into matthew/e2e
Matthew Hodgson
2016-09-12 16:32:58 +01:00
fb639da128
Merge branch 'develop' into matthew/e2e
Matthew Hodgson
2016-09-12 16:32:39 +01:00
90fea6c389
unbreak video thumbs
Matthew Hodgson
2016-09-12 16:28:39 +01:00
8e7b1820b9
unbreak video thumbs
Matthew Hodgson
2016-09-12 16:28:39 +01:00
6ffa7c23cd
Don't re-use parted rooms for DMs
David Baker
2016-09-12 16:05:51 +01:00