4d76194a9d
Merge remote-tracking branch 'origin/develop' into develop
2018-03-06 12:22:19 +00:00
d167dbcf86
Merge pull request #1788 from matrix-org/luke/fix-flair-store-potential-mem-leak
...
Potentially fix a memory leak in FlairStore
2018-03-06 12:22:14 +00:00
faf517419f
Return null instead of undefined on failure
2018-03-06 12:14:41 +00:00
0fc79a4a0d
Remove delay used in testing
2018-03-06 12:13:46 +00:00
afbd563810
Potentially fix a memory leak in FlairStore
...
For each successful request of a group profile, we previously
emitted an `updateGroupProfile` event per caller of
`getGroupProfileCached`. This is sub-optimal because only a single
event emit is required to update the views listening.
It's possible that this was enabling some race to cause a memory
leak but this is not certain, hence the extra logging for future
debugging.
2018-03-06 11:33:56 +00:00
b529edb5cc
Linting
2018-03-06 11:02:36 +00:00
d5465cf2fa
Prefix and clarify global variable naming.
2018-03-06 10:55:59 +00:00
7755a3ce90
Nest sticker image element for correct positioning of tooltips.
2018-03-06 10:48:32 +00:00
17657aa8e2
Merge remote-tracking branch 'origin/develop' into develop
2018-03-06 09:43:39 +00:00
bd8f78526e
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-06 09:43:38 +00:00
213e25ab0f
Merge pull request #1785 from matrix-org/luke/fix-room-tile-cosmetics
...
Implement transparent RoomTile for use in some places
2018-03-06 09:43:33 +00:00
e2cedbe9d7
Pull in changes from develop
2018-03-05 16:43:59 +00:00
ecad9b9dd3
Translated using Weblate (German)
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-05 16:38:43 +00:00
a95f6a9804
Implement transparent RoomTile for use in some places
...
where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
2018-03-05 12:36:02 +00:00
3b02766be9
isHtml makes no sense if there is no formatted_body
...
this is a bug pre-replies but replies exacerbates it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-05 07:33:18 +00:00
df56a67fda
Add reply fallback and run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-04 12:39:34 +00:00
73768a7afc
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-03 08:36:20 +00:00
8d8d73942e
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-03-02 13:18:50 +00:00
ffcf58b144
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-02 08:53:42 +00:00
7daf0279d6
Merge remote-tracking branch 'origin/develop' into develop
2018-03-01 15:56:37 +00:00
9a7a7ea2d6
Merge pull request #1784 from matrix-org/luke/fix-group-avatar-default-colour
...
Fix varying default group avatar colour for given group
2018-03-01 15:56:33 +00:00
94c1baa25d
Fix varying default group avatar colour for given group
2018-03-01 15:42:22 +00:00
2aa15095f2
Merge remote-tracking branch 'origin/develop' into develop
2018-03-01 15:38:16 +00:00
a62a650c5a
Merge pull request #1783 from matrix-org/luke/fix-group-avatar-update
...
Fix bug where avatar change not reflected in LLP
2018-03-01 15:38:12 +00:00
379690bcc2
Translated using Weblate (Russian)
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-01 15:36:58 +00:00
86295acba3
Merge branch 'develop' into luke/fix-group-avatar-update
2018-03-01 15:27:06 +00:00
25e8272d2c
Translated using Weblate (French)
...
Currently translated at 100.0% (990 of 990 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-03-01 15:07:44 +00:00
d5908fbc1e
Fix FlairStore cache busting
2018-03-01 15:06:05 +00:00
8499a95f18
Merge remote-tracking branch 'origin/develop' into develop
2018-03-01 15:05:51 +00:00
e91ae6b5ac
Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness
...
Workaround for atlassian/react-beautiful-dnd#273
2018-03-01 15:05:47 +00:00
ad2a8469a3
Merge remote-tracking branch 'origin/develop' into develop
2018-03-01 15:05:14 +00:00
8b51ad7053
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (989 of 989 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-01 15:05:13 +00:00
ef58f71152
Merge pull request #1781 from matrix-org/luke/feature-disable-tag-panel
...
Add setting to disable TagPanel
2018-03-01 15:05:09 +00:00
61a6f140f5
onClientSync -> _onClientSync
2018-03-01 14:43:26 +00:00
4037a22492
Fix bug where avatar change not reflected in LLP
...
Fixes vector-im/riot-web#6189
2018-03-01 14:40:03 +00:00
64332b3021
Workaround for atlassian/react-beautiful-dnd#273
...
Fix two bugs in Riot due to a single bug in react-b-dnd
Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
2018-03-01 13:48:46 +00:00
35b42ad729
Translated using Weblate (German)
...
Currently translated at 100.0% (989 of 989 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-01 10:33:56 +00:00
f29918b766
gen-i18n
2018-02-28 18:18:59 +00:00
27c71f15b9
Add setting to disable TagPanel
2018-02-28 18:16:01 +00:00
b57c9c579c
Merge remote-tracking branch 'origin/develop' into develop
2018-02-28 17:07:36 +00:00
1ac62a17ff
Merge pull request #1779 from matrix-org/luke/fix-room-settings-power-levels
...
Fix room power level settings
2018-02-28 17:07:31 +00:00
de727b37a8
Merge remote-tracking branch 'origin/develop' into develop
2018-02-28 16:58:32 +00:00
14d7e5e73d
Translated using Weblate (German)
...
Currently translated at 99.6% (986 of 989 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-28 16:58:31 +00:00
a48d17258a
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (989 of 989 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-02-28 16:58:30 +00:00
758bc2976c
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 76.3% (755 of 989 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-02-28 16:58:30 +00:00
a36ff75da7
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (989 of 989 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-02-28 16:58:30 +00:00
fa9ff4ae6e
Merge pull request #1769 from matrix-org/t3chguy/fix_hide_joins_parts
...
fix shouldHideEvent saying an event is a leave/join when a profile ch…
2018-02-28 16:58:26 +00:00
d3dc2a33b4
Fix bug preventing setting room power levels
...
- don't use refs, use onChange of PowerSelector
- store power levels as state in the RoomSetting component
2018-02-28 16:32:20 +00:00
567d83ba52
Update PowerSelector to support powerLevelKey prop
...
As a key to send as second argument to onChange. This is useful
when passing the same callback to multiple PowerSelectors.
2018-02-28 16:15:20 +00:00
9a72e69a43
Handle lack of room directory visibility response
2018-02-28 16:14:18 +00:00
Weblate