Commit Graph

62531 Commits

Author SHA1 Message Date
Michael Telatynski 8fa56f8c9a update and improve comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 14:27:10 +00:00
Weblate f6bcab18be Merge remote-tracking branch 'origin/develop' into develop 2018-02-19 09:59:30 +00:00
Kacper Fronc a35a80ca4f Translated using Weblate (Polish)
Currently translated at 97.3% (217 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2018-02-19 09:59:29 +00:00
Andrey Silversburg 0da2034a3e Translated using Weblate (Indonesian)
Currently translated at 86.9% (194 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/id/
2018-02-19 09:59:29 +00:00
Slavi Pantaleev 4ab94b397a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-02-19 09:59:28 +00:00
Luke Barnard e3e60bd372 Merge pull request #6187 from vector-im/luke/feature-tag-panel-global-filter
CSS for new global TagPanel filter
2018-02-19 09:59:25 +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
Weblate d0a38df67a Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 22:22:37 +00:00
Matthew Hodgson c3e34e5f05 Merge pull request #6194 from turt2live/patch-1
Separate the middle panel from the room list
2018-02-16 22:22:32 +00:00
Travis Ralston 514e042eec Separate the middle panel from the room list
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-02-16 14:53:52 -07: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 86d554b1dc CSS for new global TagPanel filter 2018-02-16 17:44:27 +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 57b34267c5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 11:53:35 +00:00
Tulir Asokan 4fc49850e1 Translated using Weblate (Finnish)
Currently translated at 99.5% (222 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2018-02-16 11:53:34 +00:00
Ralitsa Bozhkova 5e25844ea8 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-02-16 11:53:33 +00:00
Luke Barnard fc4da3e3bf Merge pull request #6176 from vector-im/luke/fix-invites-not-appearing
Only use DNDRoomTile for editable sub lists
2018-02-16 11:53:30 +00:00
Luke Barnard 0605d96014 Only use DNDRoomTile for editable sub lists
Otherwise, the DND tile will expect to be within a Droppable,
which is not supported by react-beautiful-dnd. This was causing
errors when receiving an invite.

Fixes #6144
2018-02-16 11:02:52 +00:00
Марко М. Костић 37a912e7ee Translated using Weblate (Serbian)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
2018-02-16 10:40:39 +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
Weblate f33bddaadd Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 14:51:12 +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
Ralitsa Bozhkova 5740274528 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-02-15 14:51:10 +00:00
Luke Barnard 332640c4ba Merge pull request #6131 from vector-im/luke/fix-scrollbars-on-jump-to-first
Adjust CSS to prevent scrollbars on message panel spinner
2018-02-15 14:51:06 +00:00
Luke Barnard 5c354dda23 Fix messagePanelSpinner flex order in RightPanel 2018-02-15 14:34:44 +00:00