OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,685 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

2685 Commits (55d14d2adc9dd0f2c236a36a692ebb145b5a2104)

Author SHA1 Message Date
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
Matthew Hodgson 97976939bd Merge pull request #462 from matrix-org/matthew/e2e 
First wave of E2E Visuals
 2016-09-12 17:20:18 +01:00
Matthew Hodgson 92b4107174 fix tests 2016-09-12 17:19:58 +01:00
wmwragg 95d9df7534 Make an invalid mx user an unknown user AddressTile 2016-09-12 17:15:56 +01:00
wmwragg 44b8c29c84 Allow addresses to be added as text when space or comma are pressed 2016-09-12 17:06:43 +01:00
wmwragg 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
Matthew Hodgson 9eae1c5bb7 final e2e icons 2016-09-12 16:51:19 +01:00
David Baker 937e195157 Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm 2016-09-12 16:44:44 +01:00
Matthew Hodgson fb639da128 Merge branch 'develop' into matthew/e2e 2016-09-12 16:32:39 +01:00
Matthew Hodgson 90fea6c389 unbreak video thumbs 2016-09-12 16:28:56 +01:00
Matthew Hodgson 8e7b1820b9 unbreak video thumbs 2016-09-12 16:28:39 +01:00
David Baker 6ffa7c23cd Don't re-use parted rooms for DMs 2016-09-12 16:05:51 +01:00
Matthew Hodgson 3fc657bce4 Merge pull request #450 from matrix-org/matthew/notif-panel 
FilePanel, NotificationPanel and EventTimelineSet support
 2016-09-12 15:57:13 +01:00
wmwragg 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
wmwragg 4836025a1d First pass at adding multiple addresses, can only add from AddressSelector at the moment 2016-09-12 15:21:17 +01:00
wmwragg 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
wmwragg 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
wmwragg 7d58968ea6 Correctly positioning the selected element if list shrinks in size 2016-09-12 14:07:51 +01:00
wmwragg 28dcbb2a78 Refactored the queryList into seperate AddressSelector component 2016-09-12 13:00:44 +01:00
Matthew Hodgson 3a1159ce12 e2e look & feel 2016-09-12 01:37:51 +01:00
Matthew Hodgson e6b4b8c1cb bring back small avatars for info msgs otherwise the design breaks 2016-09-11 23:01:20 +01:00
Aviral Dasgupta 8db2a4d46f Fix linkification and bump linkifyjs dep 2016-09-12 03:30:00 +05:30
Matthew Hodgson 46205ad83c back out small avatars for emotes for now as they conflict with the E2E artwork. 
they will be reintroduced once we have lozenges
 2016-09-11 22:49:05 +01:00
Matthew Hodgson 83209197f4 Merge branch 'develop' into matthew/notif-panel 2016-09-11 02:38:16 +01:00
Matthew Hodgson 34bb37aaba layout for file & notif panel 2016-09-11 02:14:27 +01:00
Matthew Hodgson bae6409edb show badge menu on RoomTile hoverover 2016-09-11 00:30:43 +01:00
Matthew Hodgson be33c35876 use new onRoomTimelineReset API to let notif timeline reset itself 2016-09-10 10:46:30 +01:00
Matthew Hodgson 6f270fd621 remove debug 2016-09-10 01:39:19 +01:00