Mark Haines
72d24f58d0
Make the promises be q promises
2016-11-11 13:57:45 +00:00
Mark Haines
bf5ecbd016
Review comments
...
Conflicts:
src/ContentMessages.js
2016-11-11 13:57:42 +00:00
Mark Haines
ee1768f644
Use data:// URI rather than blob: URI to avoid XSS
2016-11-11 13:55:57 +00:00
Mark Haines
a4a0d02848
Move decryptFile into a utility function so that it can be shared between different components
...
Conflicts:
src/components/views/messages/MImageBody.js
2016-11-11 13:55:48 +00:00
David Baker
1e163eabf0
Revert "Encrypt attachments in encrypted rooms,"
2016-11-11 11:59:08 +00:00
Mark Haines
c838164f40
Make the promises be q promises
2016-11-08 16:26:25 +00:00
Mark Haines
911f9e4e63
Review comments
2016-11-08 11:42:20 +00:00
Mark Haines
8f778f54fd
Use data:// URI rather than blob: URI to avoid XSS
2016-11-04 15:39:39 +00:00
Mark Haines
b6653dd0ed
Move decryptFile into a utility function so that it can be shared between different components
2016-11-04 12:46:45 +00:00
David Baker
2be1cc9f85
Give DMRoomMap an explicit makeShared
...
Otherwise it will hang on to the old state client on logout.
2016-09-27 09:56:31 +01:00
David Baker
690309adfc
Bring back the little green men without slowness
...
Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.
2016-09-26 18:02:14 +01:00
Matthew Hodgson
0046ae50b5
switch to 3-digit formatting for counts
2016-09-17 02:39:19 +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
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
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
8e518af96c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms
2016-09-09 17:38:13 +01:00
David Baker
f1ed750246
Don't crash if no DM rooms with someone
...
...when opening MemberInfo.
getDMRoomsForUserId should always return a valid list, since it's a list of what DM rooms you have with somebody.
2016-09-09 17:35:35 +01:00
David Baker
6f2e0a4cdf
Make rooms in MemberInfo update when necessary
...
Factor out the chunk of code that looks through a read receipt event
to see if it contain a read receipt from a given user, now we use it
in 2 places.
2016-09-09 16:59:59 +01:00
David Baker
aa0f15c46e
List common rooms in MemberInfo
2016-09-09 16:15:01 +01:00
David Baker
8f6d413ebd
Move DMRoomMap to a util subdir
2016-09-07 10:07:43 +01:00
