OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,612 Commits
213 Branches
562 Tags
497 MiB
Commit Graph

2612 Commits (be232bc1dae463e2ca90fb0710a0220ac068abe9)

Author SHA1 Message Date
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
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 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
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
David Baker d19686b96d Fix un-marking rooms as DM rooms 2016-09-13 11:06:07 +01:00
wmwragg ca2ba55288 Added error checking, and UI 2016-09-13 11:02:59 +01:00
wmwragg 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
wmwragg 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
Matthew Hodgson ce40fa1a8f add missing dialog 2016-09-12 23:43:00 +01:00
Matthew Hodgson 9b7ab46a72 dedicated dialog box for E2E messages 2016-09-12 23:42:24 +01:00
Remi Rampin 8cab40d987 Disable markdown line breaks 
Stop combinations of - and _ turning into a line break.
 2016-09-12 17:51:59 -04:00
Matthew Hodgson 5a548c3d12 add an onclick to the e2e icons 2016-09-12 18:50:52 +01:00
David Baker 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
David Baker 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
David Baker 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
wmwragg 0f720dd6b8 Oops, toLowerCase call in wrong place 2016-09-12 17:41:32 +01:00
wmwragg 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
Matthew Hodgson 13eed6cd39 fix NPE in EventTile 2016-09-12 17:29:26 +01:00
wmwragg 5a0a72ee46 Added styling for unknown addresses 2016-09-12 17:25:14 +01:00