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
f299572dc7
Merge pull request #2113 from vector-im/matthew/notif-panel
Matthew Hodgson
2016-09-12 15:57:51 +01:00
3fc657bce4
Merge pull request #450 from matrix-org/matthew/notif-panel
Matthew Hodgson
2016-09-12 15:57:13 +01:00
e28a3f10a0
Don't allow someone who is already on the invite list to appear in the AddressSelector
wmwragg
2016-09-12 15:48:32 +01:00
4836025a1d
First pass at adding multiple addresses, can only add from AddressSelector at the moment
wmwragg
2016-09-12 15:21:17 +01:00
5acdb8233b
The dismiss function now correctly deletes the dismissed element. Also the query render, will now render all invitees
wmwragg
2016-09-12 15:04:32 +01:00
d538377b82
Added an inviteList state to hold all the users to invite, but currently pretend it only has one users (the first one)
wmwragg
2016-09-12 14:48:00 +01:00
7d58968ea6
Correctly positioning the selected element if list shrinks in size
wmwragg
2016-09-12 14:07:51 +01:00
d65b791b2b
bump draft-js to 0.8.1 (as with matrix-react-sdk)
Aviral Dasgupta
2016-09-12 18:31:22 +05:30
2bf177dbcc
Refactored the queryList into seperate AddressSelector component
wmwragg
2016-09-12 13:01:08 +01:00
28dcbb2a78
Refactored the queryList into seperate AddressSelector component
wmwragg
2016-09-12 13:00:44 +01:00
5775552bab
css for e2e look & feel
Matthew Hodgson
2016-09-12 01:38:03 +01:00
3a1159ce12
e2e look & feel
Matthew Hodgson
2016-09-12 01:37:51 +01:00
dd4617a7c6
bring back small avatars for info msgs otherwise the design breaks
Matthew Hodgson
2016-09-11 23:01:28 +01:00
e6b4b8c1cb
bring back small avatars for info msgs otherwise the design breaks
Matthew Hodgson
2016-09-11 23:01:20 +01:00
8db2a4d46f
Fix linkification and bump linkifyjs dep
Aviral Dasgupta
2016-09-12 03:30:00 +05:30
46205ad83c
back out small avatars for emotes for now as they conflict with the E2E artwork. they will be reintroduced once we have lozenges
Matthew Hodgson
2016-09-11 22:49:05 +01:00
64dedef2c7
fix wordwrap on new panels
Matthew Hodgson
2016-09-11 21:55:57 +01:00
83209197f4
Merge branch 'develop' into matthew/notif-panel
Matthew Hodgson
2016-09-11 02:38:16 +01:00
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
Matthew Hodgson
2016-09-11 02:37:30 +01:00
3a8c94de5a
CSS for notif & file panel
Matthew Hodgson
2016-09-11 02:15:03 +01:00
dd39813cc2
show context menus on hoverover
Matthew Hodgson
2016-09-11 02:14:52 +01:00
34bb37aaba
layout for file & notif panel
Matthew Hodgson
2016-09-11 02:14:27 +01:00
bae6409edb
show badge menu on RoomTile hoverover
Matthew Hodgson
2016-09-11 00:30:43 +01:00
be33c35876
use new onRoomTimelineReset API to let notif timeline reset itself
Matthew Hodgson
2016-09-10 10:46:30 +01:00
6f270fd621
remove debug
Matthew Hodgson
2016-09-10 01:39:19 +01:00
e6c4273404
Merge pull request #2151 from vector-im/dbkr/memberinfo_createroom_cursor_pointer
Matthew Hodgson
2016-09-09 22:33:37 +01:00
86da0e0d63
Merge pull request #459 from VShell/fix-cas
Matthew Hodgson
2016-09-09 21:19:19 +01:00
1380bf705a
Fix CAS support by using a temporary Matrix client
Shell Turner
2016-09-09 18:21:31 +01:00
96fabe09d2
Update createRoom to support creating DM rooms
David Baker
2016-09-09 19:25:00 +01:00
e1c32536ff
Cursor: pointer on member info create room button
David Baker
2016-09-09 19:23:12 +01:00
8160613e01
Merge pull request #457 from matrix-org/dbkr/dont_crash_if_no_dm_rooms
Matthew Hodgson
2016-09-09 18:09:40 +01:00
8e518af96c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms
David Baker
2016-09-09 17:38:13 +01:00
f1ed750246
Don't crash if no DM rooms with someone
David Baker
2016-09-09 17:35:35 +01:00
9cff4d59ca
Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section
David Baker
2016-09-09 17:35:02 +01:00
013f68519e
Merge pull request #2147 from vector-im/dbkr/memberinfo_list_rooms
David Baker
2016-09-09 17:30:35 +01:00
78f53bd403
Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms
David Baker
2016-09-09 17:30:32 +01:00
4c5db7cc9f
Don't always show DM rooms in Direct Messages
David Baker
2016-09-09 17:23:15 +01:00
fed3f48297
Merge pull request #452 from aviraldg/test-rte
Matthew Hodgson
2016-09-09 17:16:04 +01:00
6f2e0a4cdf
Make rooms in MemberInfo update when necessary
David Baker
2016-09-09 16:59:59 +01:00
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
David Baker
2016-09-09 16:27:00 +01:00
590d6d3ee8
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
David Baker
2016-09-09 16:22:48 +01:00
57804f4e02
Support for common rooms in MemberInfo
David Baker
2016-09-09 16:15:45 +01:00
wmwragg