Matthew Hodgson
|
c6a9614372
|
Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
Wmwragg/chat multi invite
|
2016-09-13 19:31:05 +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
|
a623430c2b
|
Merge pull request #2182 from vector-im/matthew/right-panel-collapse
shuffle bottomleftmenu around a bit
|
2016-09-13 19:08:54 +01:00 |
|
Matthew Hodgson
|
b247c8a87f
|
rename 'start chat' tooltip
|
2016-09-13 19:08:43 +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 |
|
wmwragg
|
56606c01a0
|
Added valid but unknown mx user
|
2016-09-13 17:09:01 +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 |
|
Matthew Hodgson
|
eb2a55445c
|
Merge pull request #2175 from aviraldg/feature-autocomplete-behaviour
Improve autocomplete behaviour (styling)
|
2016-09-13 16:17:14 +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 |
|
wmwragg
|
3fe8b503e5
|
Fixed over collapse on Safari, and now hide the RHS footer Invite when collapsed
|
2016-09-13 14:57:58 +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
|
bdee2d3b28
|
Shifting icon to center of collapsed section
|
2016-09-13 14:44:54 +01:00 |
|
wmwragg
|
15ee2578c5
|
Tweak to font colour
|
2016-09-13 14:36:13 +01:00 |
|
wmwragg
|
f8c9a28194
|
Updated to correct invite icon
|
2016-09-13 14:33:19 +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 |
|
wmwragg
|
768f11fe58
|
Added new Invite button in the RHS footer
|
2016-09-13 14:27:23 +01:00 |
|
wmwragg
|
acdcb21830
|
Fixed weird margin bug when LHS panel is collapsed
|
2016-09-13 13:32:50 +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 |
|
Matthew Hodgson
|
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 |
|
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
|
1530568354
|
Merge branch 'develop' into wmwragg/chat-multi-invite
|
2016-09-13 12:38:45 +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 |
|
Matthew Hodgson
|
7b25f4e069
|
wip for collapsable RHS
|
2016-09-13 12:18:09 +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 |
|
Aviral Dasgupta
|
cbab2c142b
|
Autocomplete restyling
|
2016-09-13 15:43:59 +05:30 |
|
Aviral Dasgupta
|
81bbc05028
|
Merge branch 'develop' of github.com:vector-im/vector-web into develop
|
2016-09-13 15:42:36 +05:30 |
|
David Baker
|
d19686b96d
|
Fix un-marking rooms as DM rooms
|
2016-09-13 11:06:07 +01:00 |
|
wmwragg
|
f59dbe40ec
|
Added error checking, and UI
|
2016-09-13 11:03:27 +01:00 |
|
wmwragg
|
ca2ba55288
|
Added error checking, and UI
|
2016-09-13 11:02:59 +01:00 |
|