Commit Graph

9450 Commits (03b46e766b877507cfb17230b8d27263f106fce9)

Author SHA1 Message Date
Richard Lewis c93faf7de7 Fix promise wrapping. 2018-02-25 22:21:30 +00:00
Richard Lewis e249e3d622 Correct stickerpicker naming, 2018-02-25 22:10:38 +00:00
Richard Lewis ee4310cc41 Avoid potential NPE. 2018-02-25 21:47:23 +00:00
Richard Lewis 86461bc88f Disable all widget assets on widget removal. 2018-02-24 00:10:28 +00:00
Richard Lewis 332892fee6 Pull in changes from develop 2018-02-23 17:30:42 +00:00
Weblate 26c4192cbd Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 16:36:17 +00:00
Matthew Hodgson 3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg
Give emptySubListTip a container for correct bg colour
2018-02-23 16:36:10 +00:00
Richard Lewis 891199b739 Force rebuild 2018-02-23 16:20:15 +00:00
Richard Lewis b2bf4d4709 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
Richard Lewis 9ae89e2b43 Reduce logging. 2018-02-23 15:27:55 +00:00
Richard Lewis 9b667f2c38 Reduce logging. 2018-02-23 15:26:47 +00:00
Richard Lewis d755b8284c Remove logging and cleanup. 2018-02-23 15:22:56 +00:00
Weblate f053a6b623 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 15:16:01 +00:00
David Baker d23cb4dc1f
Merge pull request #1776 from matrix-org/luke/fix-to-device-event-bug
Do proper null-checks on decypted events to fix NPEs
2018-02-23 15:15:56 +00:00
Richard Lewis 57b027b776 Fix API names. 2018-02-23 15:11:28 +00:00
Luke Barnard fae7af1a62 Do proper null-checks on decypted events to fix NPEs
Previously we assumed that a decrypted event has a room_id
but this isn't necessarily true for to_device events.

It makes sense to ignore events that aren't associated with
rooms anyway given that the list we're updating only contains
rooms!
2018-02-23 15:04:04 +00:00
Richard Lewis 46f94b3c5a Ensure that roomId is validated before accessing room-based widgets. 2018-02-23 14:53:52 +00:00
Weblate 78d2ebdb6b Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 10:38:54 +00:00
David Baker a28691b9de
Merge pull request #1775 from matrix-org/luke/fix-room-list-reordering-e2e
Reorder the RoomListStore lists on Event.decrypted
2018-02-23 10:38:49 +00:00
Luke Barnard 9e969e33b7 Reorder the RoomListStore lists on Event.decrypted 2018-02-23 10:32:33 +00:00
Richard Lewis fefc325b12 Remove unused dep. 2018-02-23 10:29:52 +00:00
Richard Lewis 88288ff3f5 Add error handling for failure to connect to integration manager. 2018-02-23 10:20:16 +00:00
Weblate 534e81ba60 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 10:14:12 +00:00
Matthew Hodgson d8ef6f79b1 s/autoShow/autoshow/ 2018-02-23 10:14:02 +00:00
Weblate 9cdc73bdb8 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 10:12:22 +00:00
Xose M 070619bfdb Translated using Weblate (Galician)
Currently translated at 99.1% (979 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-02-23 10:12:21 +00:00
Ralitsa Bozhkova bc162d3bd0 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-23 10:12:21 +00:00
David Baker 6efb3abba4
Merge pull request #1772 from matrix-org/luke/fix-unverified-device-blacklist2
Fix bug where global "Never send to unverified..." is ignored
2018-02-23 10:12:16 +00:00
Ralitsa Bozhkova e1fc1c1c6c Translated using Weblate (Bulgarian)
Currently translated at 99.8% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:56:47 +00:00
Slavi Pantaleev 45172537f5 Translated using Weblate (Bulgarian)
Currently translated at 99.8% (986 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:56:47 +00:00
Ralitsa Bozhkova 0838ef3299 Translated using Weblate (Bulgarian)
Currently translated at 99.8% (986 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:56:19 +00:00
Slavi Pantaleev 5402f4919c Translated using Weblate (Bulgarian)
Currently translated at 99.7% (985 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 20:55:54 +00:00
Luke Barnard 5d6a447620 Fix bug where global "Never send to unverified..." is ignored 2018-02-22 18:47:27 +00:00
Michael Telatynski 4c4c9506ca
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_hide_joins_parts 2018-02-22 16:21:35 +00:00
Michael Telatynski a897da7504
Use undocumented piwik cmd to disable heartbeattimer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-22 16:15:50 +00:00
Michael Telatynski 773fef7f1d
fix shouldHideEvent saying an event is a leave/join when a profile change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-22 16:14:56 +00:00
Osoitz f4bdb4897e Translated using Weblate (Basque)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-02-22 15:36:13 +00:00
Richard Lewis 9a5c916570 Close modal on integration manager launch. 2018-02-22 15:36:01 +00:00
Richard Lewis ce560c577f Fix link spacing 2018-02-22 15:20:51 +00:00
adi1 f2e1c0ebca
Fix TextualBody.js to remove NodeList.forEach()
Not all browsers support forEach() on NodeList objects. This causes crashes on some browsers, such as IE and FF<50.
2018-02-22 13:59:37 +01:00
Weblate 8b9f265f1c Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 11:15:24 +00:00
Ralitsa Bozhkova dbe0a64e39 Translated using Weblate (Bulgarian)
Currently translated at 92.0% (909 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 11:15:22 +00:00
Matthew Hodgson 663c7e5285
Merge pull request #1767 from matrix-org/luke/fix-tint-updating
Fix bug that prevented tint updates
2018-02-22 11:15:19 +00:00
Luke Barnard f08ec3498a Fix bug that prevented tint updates 2018-02-22 10:53:06 +00:00
Weblate 99b42857b9 Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 10:30:49 +00:00
Ralitsa Bozhkova cc727bc5b5 Translated using Weblate (Bulgarian)
Currently translated at 90.0% (889 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-22 10:30:47 +00:00
Matthew Hodgson 8e0f0d3c0b
Merge pull request #1765 from matrix-org/luke/fix-group-member-spinner-order
Fix group member spinner being out of flex order
2018-02-22 10:30:42 +00:00
Szimszon 0c0d4707e1 Translated using Weblate (Hungarian)
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-22 07:56:27 +00:00
Weblate 862b7b736c Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 00:18:32 +00:00
Richard Lewis 8ac02b34ef
Merge pull request #1766 from matrix-org/rxl881/iframePermissionsFix
Allow widget iframes to request camera and microphone permissions.
2018-02-22 00:18:26 +00:00