OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,444 Commits
208 Branches
547 Tags
437 MiB
Commit Graph

9444 Commits (563fc9adc767fd87da3333c926dcd8e13f10ee9b)

Author SHA1 Message Date
Luke Barnard d21f55633d Fix DMs being marked as with the current user ("me") 
Whilst testing various DM paths, @lukebarnard1 found that there were
many failures to add the room as a DM against the correct user. It
turned out most of the failures seen were because the user chosen
was the current user. If the user accepted an invite it would often
be marked as with themselves because we chose the sender of the
join event as the DM user.

This fix makes the DM room setting process the same for both the
inviting client and the invited client. A RoomState.members
event causes the DM room state to be set in the room, regardless
of whether we are currently `joining` (see previous impl.)

The two cases for setting a DM are:
 - this user accepting an invite with is_direct
 - this user inviting someone with is_direct

This should handle all cases for setting DM state.
 2018-02-20 14:03:43 +00:00
Weblate d6e1ac3ca6 Merge remote-tracking branch 'origin/develop' into develop 2018-02-20 10:17:24 +00:00
Ralitsa Bozhkova c5ad486c57 Translated using Weblate (Catalan) 
Currently translated at 89.2% (880 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-02-20 10:17:23 +00:00
Ralitsa Bozhkova 1c96c1f4d9 Translated using Weblate (Bulgarian) 
Currently translated at 38.0% (375 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-20 10:17:22 +00:00
David Baker fd90a8b23c
Merge pull request #1756 from matrix-org/luke/fix-recent-ordering 
Make RoomListStore aware of Room.timeline events
 2018-02-20 10:17:16 +00:00
Michael Telatynski 7048d85246
attach message_sent and replies to file uploads 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 23:42:04 +00:00
Michael Telatynski 34b427d15e
s/quote_event/reply_to_event/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 23:41:07 +00:00
Weblate 46a29b56d9 Merge remote-tracking branch 'origin/develop' into develop 2018-02-19 16:39:22 +00:00
Ralitsa Bozhkova 4998890a0e Translated using Weblate (Bulgarian) 
Currently translated at 27.7% (274 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-19 16:39:20 +00:00
Richard van der Hoff 715198dc17
Merge pull request #1760 from matrix-org/matthew/improve-postmessage-origin-check2 
improve origin check of ScalarMessaging postmessage API.
 2018-02-19 16:39:15 +00:00
Michael Telatynski 6510989ac6
move unmounted init to willMount 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 14:28:31 +00:00
Michael Telatynski 8fa56f8c9a
update and improve comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 14:27:10 +00:00
Weblate 4c4b813aa1 Merge remote-tracking branch 'origin/develop' into develop 2018-02-19 09:59:25 +00:00
Simó Albert i Beltran 71a1de1e73 Translated using Weblate (Catalan) 
Currently translated at 89.2% (880 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-02-19 09:59:23 +00:00
Ralitsa Bozhkova da35871cb1 Translated using Weblate (Bulgarian) 
Currently translated at 24.4% (241 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-19 09:59:23 +00:00
Luke Barnard 5d1af70b96
Merge pull request #1759 from matrix-org/luke/feature-tag-panel-global-filter 
Implement global filter to deselect all tags
 2018-02-19 09:59:19 +00:00
Luke Barnard 32130fbc28 Don't regenerate RoomListStore state for notifs/scrollback/etc. 
Only do so for the live timeline of rooms.
 2018-02-19 09:56:03 +00:00
Matthew Hodgson 2d5a2a9d48 improve origin check of ScalarMessaging postmessage API. 
ensures that https://scalar.ve can't access the API.
many thanks to @rugk for pointing out the potential vuln.
cc @rxl881 in case this bug has been transplanted elsewhere.
 2018-02-17 00:02:38 +00:00
Michael Telatynski 4c08c51044
Reply; delay call to onWidgetLoad until after async setState completes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:24:42 +00:00
Michael Telatynski 0d6fc9bd3a
fix Composer focus after twiddling with Replies 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:17:41 +00:00
Michael Telatynski f1a3592eff
fix 12/24h in Reply/ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:14:03 +00:00
Michael Telatynski cb293a852d
reply and reply_preview only differ in whether they contain <Reply /> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:07:25 +00:00
Michael Telatynski 8062494692
show replies in ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 20:58:39 +00:00
Luke Barnard 7a0c82a327 Fix click background to deselect 2018-02-16 18:08:29 +00:00
Weblate d5b502743a Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 17:51:30 +00:00
Luke Barnard 01546c7f61
Merge pull request #1758 from turt2live/patch-3 
Don't show empty custom tags when filtering tags
 2018-02-16 17:51:25 +00:00
Luke Barnard 113fc696d8 Implement global filter to deselect all tags 
and make TagPanel scrollable whilst we're at it.
 2018-02-16 17:43:43 +00:00
Travis Ralston cbeee72062
Don't show empty custom tags when filtering tags 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-02-16 10:11:04 -07:00
Luke Barnard 3f6c15506c Remove unused `room` parameter of MatrixActions.Room.timeline 2018-02-16 16:17:47 +00:00
Weblate cedfa4b607 Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 16:01:17 +00:00
Tulir Asokan f2903d1439 Translated using Weblate (Finnish) 
Currently translated at 95.2% (939 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2018-02-16 16:01:16 +00:00
Ralitsa Bozhkova cca820c353 Translated using Weblate (Bulgarian) 
Currently translated at 15.2% (150 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-16 16:01:16 +00:00
Luke Barnard ad863afd6d
Merge pull request #1757 from matrix-org/luke/fix-assumed-removed-tags 
Do not assume that tags have been removed
 2018-02-16 16:01:11 +00:00
Luke Barnard 84ab1ae3e2 Do not assume that tags have been removed 
when moving tags
 2018-02-16 15:52:15 +00:00
Michael Telatynski 2e3cbb309e
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-02-16 14:35:04 +00:00
Luke Barnard 94a0a90457 Make RoomListStore aware of Room.timeline events 
so that we can do reorderings of lists ordered by most recent event.

No optimisations here; we only update for timeline events
on live timelines that could update the "unread count".
 2018-02-16 14:16:50 +00:00
Weblate aae428887a Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 20:20:33 +00:00
Ralitsa Bozhkova b111a824e8 Translated using Weblate (Bulgarian) 
Currently translated at 12.0% (119 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-15 20:20:32 +00:00
Matthew Hodgson 07b691a45d typo 2018-02-15 20:20:25 +00:00
Weblate 5e8ec9f451 Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 14:51:18 +00:00
Ralitsa Bozhkova 19b6684089 Translated using Weblate (Bulgarian) 
Currently translated at 7.0% (70 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-15 14:51:17 +00:00
Luke Barnard 1a880761e0
Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first 
Change CSS class for message panel spinner
 2018-02-15 14:51:12 +00:00
Luke Barnard 57419a7f8d Give emptySubListTip a container for correct bg colour 2018-02-15 14:11:45 +00:00
Weblate f46c16b94a Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 13:35:14 +00:00
Ralitsa Bozhkova 39af04f090 Translated using Weblate (Bulgarian) 
Currently translated at 5.5% (55 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-15 13:35:13 +00:00
David Baker 0c5b0fd52c
Merge pull request #1752 from matrix-org/dbkr/roomliststore_unregister 
Remove RoomListStore listener
 2018-02-15 13:35:08 +00:00
David Baker 55dc49f4ff Merge remote-tracking branch 'origin/develop' into dbkr/roomliststore_unregister 2018-02-15 13:29:30 +00:00
David Baker 44964e80a9 undo unintentional commit 2018-02-15 11:25:40 +00:00
David Baker ceec405519 Remove RoomListStore listener 
This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted)
 2018-02-15 11:23:00 +00:00
Weblate e79d502972 Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 11:05:34 +00:00