Richard Lewis
29962ed89d
Add stickerpack strings.
2018-02-05 11:48:48 +00:00
lukebarnard
81eca49266
Merge branch 'luke/room-list-flux' of github.com:matrix-org/matrix-react-sdk into luke/room-list-flux
2018-02-05 11:40:42 +00:00
Luke Barnard
ff8fcb3139
Merge branch 'develop' into luke/room-list-flux
2018-02-05 11:39:39 +00:00
David Baker
ec3a37d9f3
Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard
...
guard against m.room.aliases events with no keys (redaction?)
2018-02-05 10:21:05 +00:00
David Baker
3275a56013
Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites
...
Fix not showing Invited section if all invites are 3PID
2018-02-05 10:14:23 +00:00
David Baker
916ab68506
Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image
...
Fix Rich Replies on files
2018-02-05 09:58:37 +00:00
Michael Telatynski
d1a24ac87b
guard against m.room.aliases events with no keys (redaction?)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-02 08:12:56 +00:00
David Baker
497cf21c86
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-01 10:35:12 +00:00
Weblate
ee81d6aea1
Merge remote-tracking branch 'origin/develop' into develop
2018-01-31 18:10:59 +00:00
Nathan van Beelen
3a33eea5e9
Translated using Weblate (Dutch)
...
Currently translated at 75.5% (743 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-01-31 18:10:57 +00:00
David Baker
4c17b5f1c7
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard
...
Null guard against falsey (non-null) props.node, to make react happy
2018-01-31 18:10:52 +00:00
Weblate
f193b3ae2c
Merge remote-tracking branch 'origin/develop' into develop
2018-01-30 15:21:19 +00:00
David Baker
cfd1f28258
Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync
...
Use correct condition for getting account data after first sync
2018-01-30 15:21:12 +00:00
Michael Telatynski
8a6727ea98
This is actually MFileBody not MImageBody, change classname
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-30 10:55:23 +00:00
Weblate
1fa9e7420f
Merge remote-tracking branch 'origin/develop' into develop
2018-01-30 10:27:20 +00:00
Марко М. Костић
977dec40a3
Translated using Weblate (Serbian)
...
Currently translated at 60.8% (599 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-30 10:27:19 +00:00
Szimszon
fd4fc883c1
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-30 10:27:19 +00:00
Walter
5e34c8043f
Translated using Weblate (German)
...
Currently translated at 98.9% (974 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-01-30 10:27:19 +00:00
Xose M
8d902010f8
Translated using Weblate (Galician)
...
Currently translated at 99.1% (976 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-01-30 10:27:18 +00:00
Nathan van Beelen
4afdefb926
Translated using Weblate (Dutch)
...
Currently translated at 73.9% (728 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-01-30 10:27:18 +00:00
Simó Albert i Beltran
5c7bdcec4f
Translated using Weblate (Catalan)
...
Currently translated at 88.5% (871 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-30 10:27:18 +00:00
Osoitz
819dd93d1f
Translated using Weblate (Basque)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-30 10:27:18 +00:00
lukebarnard
c5a3a02e1d
Fix order calculation logic when reordering a room
2018-01-30 10:14:05 +00:00
Michael Telatynski
6dd63ae644
Null guard against falsey (non-null) props.node, to make react happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-29 19:17:46 +00:00
Michael Telatynski
5764280588
Persist contentState when sending SlashCommand via MessageComposerInput
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-29 09:09:22 +00:00
Michael Telatynski
56927b23e6
pass onWidgetLoad (which is required for SOME EventTileTypes)
...
XXX: they should follow an interface, this is somewhat nasty
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-28 22:14:22 +00:00
lukebarnard
40907ecf29
Use correct condition for getting account data after first sync
...
so that we can get tags sooner.
2018-01-26 19:39:06 +01:00
d1d4c
6fa217742f
Translated using Weblate (Catalan)
...
Currently translated at 88.5% (871 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-26 13:06:57 +00:00
lukebarnard
4820a195ab
Remove logging
2018-01-26 09:15:03 +01:00
Simó Albert i Beltran
18bf9ef598
Translated using Weblate (Catalan)
...
Currently translated at 88.5% (871 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-26 02:45:23 +00:00
lukebarnard
73e3a594ac
Prevent TagTiles from being dragged into other droppables
...
for the time being at least.
2018-01-25 22:52:19 +01:00
lukebarnard
701abb6a21
Move management of room lists to RoomListStore
...
this is part maintenance to make RoomList clearer and part
allowing room list state to be modified via a dispatch.
2018-01-25 22:16:03 +01:00
lukebarnard
d0e3319bd9
Remove DragDropContext from TagPanel and RoomList
...
So that we can have one context that can handle DND between
the TagPanel and RoomList.
2018-01-25 22:05:20 +01:00
lukebarnard
815f52587b
Move TagPanel out of LoggedInView
...
(...and into LeftPanel in riot-web. Can we merge the projects yet?)
2018-01-25 21:53:34 +01:00
lukebarnard
38de8a129b
Add transaction capability to asyncActions
...
for relating pending/success/failure actions. Particularly useful for mapping
a failure to a pending action to roll back any optimistic updates.
2018-01-25 21:45:21 +01:00
d1d4c
9223a5db9e
Translated using Weblate (Catalan)
...
Currently translated at 83.6% (823 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-25 17:48:58 +00:00
Szimszon
e78659642e
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-25 15:23:22 +00:00
Michael Telatynski
56bd4b7d06
Fix not showing Invited section if all invites are 3PID
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-25 12:18:02 +00:00
Osoitz
c86c12de40
Translated using Weblate (Basque)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-25 10:28:23 +00:00
Michael Telatynski
3060ec1053
Use invite_3pid prop of createRoom instead of manual invite after create
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-25 09:54:31 +00:00
Andrey
dd4cef4c3e
Translated using Weblate (Russian)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-25 04:48:39 +00:00
Jeff Huang
00f52edf4c
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-25 03:04:15 +00:00
Kévin C
899192b019
Translated using Weblate (French)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-24 20:27:07 +00:00
Weblate
6b62acd001
Merge remote-tracking branch 'origin/develop' into develop
2018-01-24 17:53:35 +00:00
Марко М. Костић
b7c32ee1b5
Translated using Weblate (Serbian)
...
Currently translated at 38.9% (383 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-24 17:53:34 +00:00
d1d4c
d3100f9bc9
Translated using Weblate (Catalan)
...
Currently translated at 54.3% (534 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-24 17:53:33 +00:00
David Baker
ebfdd7c718
Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear
...
Linear Rich Quoting
2018-01-24 18:53:29 +01:00
Simó Albert i Beltran
18d9de61fa
Translated using Weblate (Catalan)
...
Currently translated at 24.3% (239 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-24 11:02:53 +00:00
d1d4c
f45ad26423
Translated using Weblate (Catalan)
...
Currently translated at 24.3% (239 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-24 07:54:36 +00:00
Szimszon
71ecc5d7c5
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (983 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-23 07:09:24 +00:00
Jeff Huang
e5f5091505
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (983 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-23 05:16:28 +00:00
Kévin C
ace7b84987
Translated using Weblate (French)
...
Currently translated at 100.0% (983 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-22 20:43:11 +00:00
Osoitz
88443af8fa
Translated using Weblate (Basque)
...
Currently translated at 100.0% (983 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-22 19:23:52 +00:00
Andrey
e19435d39d
Translated using Weblate (Russian)
...
Currently translated at 100.0% (983 of 983 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-22 18:31:43 +00:00
Weblate
acc878bee5
Merge remote-tracking branch 'origin/develop' into develop
2018-01-22 17:57:46 +00:00
Luke Barnard
f013ffd068
Merge pull request #1714 from matrix-org/t3chguy/group_create_dialog_fixes
...
Fix CreateGroupDialog issues
2018-01-22 17:57:40 +00:00
Szimszon
294a5db20e
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-22 17:24:43 +00:00
Michael Telatynski
e3e3535072
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 17:02:20 +00:00
Michael Telatynski
4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear
2018-01-22 16:46:20 +00:00
Michael Telatynski
a6cefb83f8
basic error handling for malformed quotes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:41:32 +00:00
Michael Telatynski
3b1d69edbb
Change Quotes to be linearly rendered rather than recursively nested
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:34:47 +00:00
Michael Telatynski
33995b053e
Add class to EventTile Line's that are quotes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:34:14 +00:00
Andrey
34b9db2033
Translated using Weblate (Russian)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-22 16:03:49 +00:00
Richard Lewis
0441487e97
Manage sticker packs link and add comments
2018-01-22 17:00:50 +01:00
Michael Telatynski
37dcb33b15
Reset quotingEvent on Room Change because inideal UX
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 14:45:04 +00:00
Weblate
066d1a0ed2
Merge remote-tracking branch 'origin/develop' into develop
2018-01-22 11:16:48 +00:00
pebles
8496c947c8
Translated using Weblate (Spanish)
...
Currently translated at 58.3% (573 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-01-22 11:16:48 +00:00
Марко М. Костић
1d43ccde23
Translated using Weblate (Serbian)
...
Currently translated at 28.0% (275 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-22 11:16:48 +00:00
A.G
2326ee2586
Translated using Weblate (Italian)
...
Currently translated at 9.1% (90 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-01-22 11:16:47 +00:00
Szimszon
755ead7c1d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-22 11:16:47 +00:00
Matthew Hodgson
02824cfacf
fix i18n for show devices prompt
2018-01-22 12:16:11 +01:00
Osoitz
fb9930ad2c
Translated using Weblate (Basque)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-21 09:31:40 +00:00
Jeff Huang
fd2ef3e54d
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-21 00:11:52 +00:00
Andrey
2111271bda
Translated using Weblate (Russian)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-20 15:41:41 +00:00
Peter Vágner
a0ba25806c
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-01-20 15:13:54 +00:00
Kévin C
1356e6dfd2
Translated using Weblate (French)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-20 14:49:56 +00:00
Szimszon
38c58f3b23
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (982 of 982 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-20 13:40:43 +00:00
Michael Telatynski
61b3d050ab
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes
2018-01-20 13:39:57 +00:00
Michael Telatynski
2705397bf6
Add local GID==='' check, because Synapse says Group rather than Community
...
Reset createError when doing check because it is now stale
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-20 13:16:33 +00:00
Weblate
da5cf63daf
Merge remote-tracking branch 'origin/develop' into develop
2018-01-20 11:44:21 +00:00
Марко М. Костић
67a4c6c487
Translated using Weblate (Serbian)
...
Currently translated at 18.2% (179 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-20 11:44:21 +00:00
Will Hunt
5206c9d18b
Show a warning if the user attempts to leave a room that is invite only
2018-01-19 22:52:43 +00:00
Weblate
aff1fcde90
Merge remote-tracking branch 'origin/develop' into develop
2018-01-19 14:49:55 +00:00
Luke Barnard
a8320fe7e2
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd
...
Swap RoomList to react-beautiful-dnd
2018-01-19 14:49:49 +00:00
lukebarnard
6106b3ce44
newOrder defaults null
, allows check for newOrder
on line 357
2018-01-19 14:12:27 +00:00
lukebarnard
54f6d305d7
Null-guard for newTag
2018-01-19 14:11:05 +00:00
Weblate
e4b4a885ff
Merge remote-tracking branch 'origin/develop' into develop
2018-01-19 14:07:23 +00:00
lukebarnard
75a1922731
Fix linting
2018-01-19 14:07:13 +00:00
lukebarnard
00dc077271
Remove react-dnd, revert fa14bc9
as no longer needed
2018-01-19 13:34:56 +00:00
Weblate
533e5482d8
Merge remote-tracking branch 'origin/develop' into develop
2018-01-19 10:39:51 +00:00
Марко М. Костић
fba5d33923
Translated using Weblate (Serbian)
...
Currently translated at 12.0% (118 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-19 10:39:50 +00:00
Matthew Hodgson
6c15bd8599
fix NPE when getGroupProfiles returns null
2018-01-19 10:39:38 +00:00
lukebarnard
6f0d799912
Fix indentation
2018-01-18 18:15:34 +00:00
lukebarnard
59f4661bfd
Add comment
2018-01-18 18:01:31 +00:00
lukebarnard
dfecad181a
Swap RoomList to react-beautiful-dnd
2018-01-18 17:59:29 +00:00
Richard Lewis
23bef68a8f
Fix duplicate message listeners
2018-01-18 13:16:06 +00:00
Richard Lewis
910623d287
Close context menu on resize.
2018-01-18 12:04:00 +00:00
Richard Lewis
917d85d603
Refer rest parameters
2018-01-18 12:03:24 +00:00
Richard Lewis
1293c53c4b
Cleanup
2018-01-18 12:02:45 +00:00
Weblate
5adbedb28a
Merge remote-tracking branch 'origin/develop' into develop
2018-01-18 10:22:26 +00:00
David Baker
c090c2e7df
Merge pull request #1710 from matrix-org/t3chguy/roomColor
...
don't pass back {} when we have no `org.matrix.room.color_scheme`
2018-01-18 10:22:21 +00:00
Weblate
5fd7c30dbf
Merge remote-tracking branch 'origin/develop' into develop
2018-01-18 09:57:38 +00:00
Matthew Hodgson
80d3edfbb3
simplify the 'send anyway' text, as 'mark devices known' is meaningless to users
2018-01-18 09:57:29 +00:00
Weblate
9e987337b7
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 23:28:22 +00:00
Matthew Hodgson
d3292d9388
fix typos and NPE. fixes #5999
2018-01-17 23:28:14 +00:00
Weblate
0fb808ef99
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 19:28:56 +00:00
David Baker
27b27e3759
Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting
...
Don't paginate whilst decrypting events
2018-01-17 19:28:52 +00:00
Weblate
d93518ac43
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 19:28:43 +00:00
David Baker
6b43b412ab
Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback
...
Fall back for missing i18n plurals
2018-01-17 19:28:38 +00:00
Michael Telatynski
2f42e69b57
Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor
2018-01-17 18:20:35 +00:00
Michael Telatynski
b7204e79a7
fallback after receiving settings rather than {} because its truthy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-17 18:17:26 +00:00
Michael Telatynski
43bb8c561d
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-17 18:10:19 +00:00
Michael Telatynski
b90a98b5c1
don't pass back {} when we have no org.matrix.room.color_scheme
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-17 18:06:19 +00:00
Richard Lewis
f8d7ab10fa
Handle non-m.room.message event types.
2018-01-17 17:19:20 +00:00
Weblate
816a77c089
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 17:10:55 +00:00
lukebarnard
5f413ddf8b
Do not fetch GroupStore resources if already fetching
2018-01-17 17:01:42 +00:00
lukebarnard
3ebf278cf3
Refactor GroupStore based on existing STATE_KEY concept
...
by factoring out a lot of repeated code.
2018-01-17 16:59:13 +00:00
Richard Lewis
b6f85fbf92
Don't treat sticker messages as info messages.
2018-01-17 16:52:10 +00:00
Richard Lewis
aa524c339d
Update class names.
2018-01-17 15:49:36 +00:00
Richard Lewis
fa336b7a99
Bring hide stickers icon to front when menu open.
2018-01-17 15:41:15 +00:00
Richard Lewis
5a4271268b
Keep reference to stickers menu
2018-01-17 15:40:47 +00:00
Richard Lewis
3331c8af27
Use dispatcher ref for unregister call.
2018-01-17 15:40:04 +00:00
Weblate
7486da3e53
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 10:57:44 +00:00
lukebarnard
2a1f8bd394
Ignore remote echos caused by this client
...
by sending each tag_ordering with a _storeId and ignoring accout data
that has a matching _storeId.
This will tend to become out of sync with the server over time if
requests continually fail, but subsequent successful requests will
rectify any differences.
2018-01-17 10:51:28 +00:00
Richard Lewis
614a10c6d3
Add manage integration link.
2018-01-17 00:04:06 +00:00
Richard Lewis
86da204169
Add manage stickerpacks link
2018-01-16 23:25:07 +00:00
Richard Lewis
38ed01bebd
Pass room to stickerpack
2018-01-16 21:35:25 +00:00
Richard Lewis
7676fc0c10
Handle stickerpack close.
2018-01-16 21:28:15 +00:00
Richard Lewis
9339284090
Stickerpack content placeholder.
2018-01-16 21:06:57 +00:00
Richard Lewis
86542d86e9
Move stickers into stand-alone component.
2018-01-16 18:14:32 +00:00
David Baker
f76186d743
Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback
2018-01-16 17:45:45 +00:00
David Baker
0557737f8d
Don't modify original options arg
2018-01-16 17:45:29 +00:00
David Baker
c64b4e1b1c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting
2018-01-16 17:38:32 +00:00
Richard Lewis
87d8ed5af8
Add comment
2018-01-16 17:01:25 +00:00
Weblate
1c600ab8d5
Merge remote-tracking branch 'origin/develop' into develop
2018-01-16 11:26:49 +00:00
Xose M
5de8cf270c
Translated using Weblate (Galician)
...
Currently translated at 35.9% (353 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-01-16 11:26:48 +00:00
Luke Barnard
62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd
...
Replace TagPanel react-dnd with react-beautiful-dnd
2018-01-16 11:26:44 +00:00
Osoitz
1155c1c85c
Translated using Weblate (Basque)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-16 11:21:32 +00:00
lukebarnard
f19dcd8114
Comment workaround to atlassian/react-beautiful-dnd#273
2018-01-16 11:07:25 +00:00
lukebarnard
bda2d6b0a6
Work around atlassian/react-beautiful-dnd#273
...
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
2018-01-16 10:44:11 +00:00
lukebarnard
d2e5b12271
Update jsdoc for moveTag
2018-01-16 09:46:48 +00:00
Jeff Huang
bc2448fa7c
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-16 02:32:57 +00:00
Szimszon
732950594d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-15 19:01:37 +00:00
Richard Lewis
82b9897986
Select apropriate theme colour for popover.
2018-01-15 18:27:14 +00:00
lukebarnard
16c13fb079
Replace TagPanel react-dnd with react-beautiful-dnd
...
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.
It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).
Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).
The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
2018-01-15 18:12:27 +00:00
Kévin C
e085632d8d
Translated using Weblate (French)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-15 16:08:31 +00:00
Weblate
c3b3cc4a82
Merge remote-tracking branch 'origin/develop' into develop
2018-01-15 15:02:02 +00:00
David Baker
0a6018a945
Merge pull request #1704 from matrix-org/luke/perf-room-list
...
Only set selected tags state when updating rooms
2018-01-15 15:01:57 +00:00
lukebarnard
408f13f68c
Only set selected tags state when updating rooms
...
instead of every time we get an update from a GroupStore/otherwise.
This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.
Also, use the rate limited version of refreshRoomList.
2018-01-15 14:42:41 +00:00
Richard Lewis
5a9a4ead96
Remove arrow opacity.
2018-01-15 14:25:56 +00:00
Richard Lewis
5e6da4d758
* Fix key error
...
* Remove redundant logging
* Catch error
2018-01-15 14:22:41 +00:00
Andrey
7fadd0f4ac
Translated using Weblate (Russian)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-15 14:02:58 +00:00
Weblate
c0f6cf2343
Merge remote-tracking branch 'origin/develop' into develop
2018-01-15 13:45:17 +00:00
Jeff Huang
ab0c03369b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-15 13:45:16 +00:00
Richard Lewis
0fab905a2e
Cleanup styles.
2018-01-15 11:16:07 +00:00
Richard Lewis
351bbdfd4e
Styling
2018-01-15 10:25:19 +00:00
Michael Telatynski
b526fc057c
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
2018-01-14 18:32:17 +00:00
Jeff Huang
ba5d92559b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-13 12:59:09 +00:00
David Baker
e42bea6277
Don't paginate whilst decrypting events
...
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
2018-01-12 18:17:03 +00:00
Richard Lewis
a3c6dd36ef
Stickers popover.
2018-01-12 17:38:21 +00:00
David Baker
3cadb9b587
Fall back for missing i18n plurals
...
Counterpart doesn't do fallback if there is a translation for the
base string in the preferred language but not the required
pluralisation. This meant that if someone added some plurals to a
language or a string, but not all, you'd get completely empty
strings in the interface.
Work around this in the wrapper function.
2018-01-12 16:21:30 +00:00
Weblate
a013e7ea9a
Merge remote-tracking branch 'origin/develop' into develop
2018-01-12 13:56:31 +00:00
Osoitz
a40dafd701
Translated using Weblate (Basque)
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-12 12:38:21 +00:00
David Baker
99a72b5b2b
Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674
...
'focus' attribute was on the wrong thing
2018-01-12 10:52:51 +00:00
Weblate
3477c8a8d3
Merge remote-tracking branch 'origin/develop' into develop
2018-01-12 10:32:46 +00:00
David Baker
aa5d42d045
Remove spurious dot
2018-01-12 10:32:36 +00:00
Weblate
bd1312f673
Merge remote-tracking branch 'origin/develop' into develop
2018-01-12 09:41:19 +00:00
Szimszon
7a324b4104
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-12 09:41:19 +00:00
Osoitz
18098da94a
Translated using Weblate (Basque)
...
Currently translated at 98.8% (969 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-12 09:41:18 +00:00
Michael Telatynski
23bd612730
Focus composer when clicking Reply
(quote event)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:29:00 +00:00
Michael Telatynski
192cba2b79
allow text&onSenderProfileClick for tileShape===quote
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:25:43 +00:00
Richard Lewis
90b7cb3760
Consistent popover size
2018-01-11 13:41:55 +00:00
Richard Lewis
1ab71f6f50
Load stickers in AppTile
2018-01-11 13:20:58 +00:00
Richard Lewis
4f3670941d
Bind functions
2018-01-11 12:33:02 +00:00
Szimszon
3163673705
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-11 12:30:47 +00:00
Weblate
3b4e233535
Merge remote-tracking branch 'origin/develop' into develop
2018-01-11 12:06:52 +00:00
Andrey
0ad84f4ab5
Translated using Weblate (Russian)
...
Currently translated at 99.7% (978 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-11 12:06:52 +00:00
Klaus Marx
da562e015c
Translated using Weblate (German)
...
Currently translated at 99.2% (973 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-01-11 12:06:51 +00:00
Michael Telatynski
8ad4da54cb
Fix missing negation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 12:04:53 +00:00
Richard Lewis
d0c16fa7a1
Convert to ES6 class.
2018-01-11 11:49:46 +00:00
Richard Lewis
78bd25eff0
Sticker popover styling
2018-01-11 11:36:19 +00:00
Kévin C
8f26155c16
Translated using Weblate (French)
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-11 11:20:03 +00:00
Richard Lewis
2cf9da8c95
Load user stickerpacks
2018-01-11 11:12:46 +00:00
Weblate
52607c4122
Merge remote-tracking branch 'origin/develop' into develop
2018-01-11 11:02:40 +00:00
David Baker
b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info
...
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
2018-01-11 11:02:34 +00:00
Weblate
b2bc506b36
Merge remote-tracking branch 'origin/develop' into develop
2018-01-11 11:01:08 +00:00
David Baker
84da19c544
Merge pull request #1668 from turt2live/travis/re-register-scalar-token
...
Attempt to re-register for a scalar token if ours is invalid
2018-01-11 11:01:04 +00:00
Andrey
62ced91356
Translated using Weblate (Russian)
...
Currently translated at 100.0% (967 of 967 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-11 10:52:04 +00:00
Weblate
8ccc53088f
Merge remote-tracking branch 'origin/develop' into develop
2018-01-11 10:49:44 +00:00
Andrey
0ce043ab12
Translated using Weblate (Russian)
...
Currently translated at 99.5% (963 of 967 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-11 10:49:44 +00:00
David Baker
292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs
...
Normalise dialogs
2018-01-11 10:49:40 +00:00
Kévin C
5e7fab1e15
Translated using Weblate (French)
...
Currently translated at 100.0% (967 of 967 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-11 10:40:12 +00:00
Weblate
f845071f91
Merge remote-tracking branch 'origin/develop' into develop
2018-01-11 10:35:01 +00:00
David Baker
efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying
...
Add 'send without verifying' to status bar
2018-01-11 10:34:56 +00:00
Weblate
070114d911
Merge remote-tracking branch 'origin/develop' into develop
2018-01-11 10:34:44 +00:00
Richard Lewis
1a994b88f5
Move widget utility functions in to their own file.
2018-01-11 10:32:37 +00:00
David Baker
57e11cea1c
Fix jsdoc
2018-01-11 10:27:15 +00:00
Richard Lewis
52f28d09e0
Stickerpack styling
2018-01-10 20:44:14 +00:00
Richard Lewis
2bb51bafe1
Content placeholder.
2018-01-10 20:29:36 +00:00
Richard Lewis
53b590f55e
Add stickers popover.
2018-01-10 20:27:43 +00:00
Michael Telatynski
007715aeaa
Run prune-i18n.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:54:00 +00:00
Michael Telatynski
94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:52:20 +00:00
Michael Telatynski
1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:06:24 +00:00
Michael Telatynski
e45fcf10c7
Refactor DateUtils to ES6
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:00:11 +00:00
Michael Telatynski
9e2238e884
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 11:56:36 +00:00
Michael Telatynski
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
Michael Telatynski
454fd23f25
fix typo shsape->shape
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 11:51:48 +00:00
Michael Telatynski
a977ab9be4
change handler name to suit convention
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 11:51:23 +00:00
David Baker
9dd9a5be4b
Wording tweak
2018-01-09 17:59:49 +00:00
David Baker
dbb8f878cb
Tidy up imports
2018-01-09 17:57:18 +00:00
Richard Lewis
9abb160120
Replace apps button with stickers button in message composer.
2018-01-09 16:02:17 +00:00
Richard Lewis
6b0b25c2d2
Translations
2018-01-09 16:01:53 +00:00
Richard Lewis
9e9de765dc
Handle user widgets.
2018-01-09 14:37:45 +00:00
David Baker
4c101628b5
Add 'send without verifying' to status bar
...
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
2018-01-09 13:52:37 +00:00
Aidan Gauland
9365860075
Update copyright line
2018-01-09 18:40:12 +13:00
Richard Lewis
60e7646f92
Save user widgets in accountData
2018-01-08 16:47:49 +00:00
Richard Lewis
adebf71a1d
Set user widgets on application data.
2018-01-08 15:38:01 +00:00
Richard Lewis
0577316c86
Fix duplicate event registration.
2018-01-08 13:40:33 +00:00
Michael Telatynski
d0897dc8f3
update wording to not imply exhaustiveness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-08 13:29:27 +00:00
Richard Lewis
5df9a01e64
Use m.room.sticker event.
2018-01-08 12:06:32 +00:00
Richard Lewis
486b2cf102
Handle sticker message event.
2018-01-08 11:32:38 +00:00
Richard Lewis
dc1423052f
De-register listener.
2018-01-08 11:32:23 +00:00
Iru Cai (vimacs)
275c960337
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 76.8% (739 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-01-08 02:00:48 +00:00
Weblate
eae95fce61
Merge remote-tracking branch 'origin/develop' into develop
2018-01-07 20:31:12 +00:00
Osoitz
f6851101cc
Translated using Weblate (Basque)
...
Currently translated at 100.0% (961 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-07 20:31:11 +00:00
Matthew Hodgson
a88f92c3e3
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
2018-01-07 20:30:18 +00:00
Szimszon
b49c5a4c16
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (961 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-05 17:27:39 +00:00
Weblate
a9fa4c5f67
Merge remote-tracking branch 'origin/develop' into develop
2018-01-05 16:16:14 +00:00
lukebarnard
5ac1d8ce81
Merge branch 'develop' into luke/pref-tag-panel-selected2
2018-01-05 15:57:43 +00:00
Weblate
7fc21f4423
Merge remote-tracking branch 'origin/develop' into develop
2018-01-05 15:55:29 +00:00
David Baker
587a6f8e2b
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected
...
Improve performance of tag panel selection (when tags are selected)
2018-01-05 15:55:24 +00:00
Weblate
c0d14904ef
Merge remote-tracking branch 'origin/develop' into develop
2018-01-05 15:26:27 +00:00
Osoitz
f6b24b749f
Translated using Weblate (Basque)
...
Currently translated at 100.0% (961 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-05 15:26:26 +00:00
Luke Barnard
8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar
...
Hide status bar on visible->hidden transition
2018-01-05 15:26:22 +00:00
lukebarnard
8509db1bda
Cache isConfCallRoom
...
This only needs to be calculated one per room
2018-01-05 14:53:04 +00:00
Osoitz
1e66f4f0ed
Translated using Weblate (Basque)
...
Currently translated at 100.0% (961 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-05 14:31:24 +00:00
Kévin C
f1850d188e
Translated using Weblate (French)
...
Currently translated at 100.0% (961 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
Correction (Seul -> Seules)
2018-01-05 13:17:33 +00:00
lukebarnard
8ade357349
Handle newly added rooms and removed rooms.
2018-01-05 12:33:26 +00:00
Andrey
44d920afc8
Translated using Weblate (Russian)
...
Currently translated at 100.0% (961 of 961 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-05 12:27:22 +00:00
Weblate
8a805187dc
Merge remote-tracking branch 'origin/develop' into develop
2018-01-05 12:24:14 +00:00
David Baker
845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent
...
[revived] Singularise unsent message prompt, if applicable
2018-01-05 12:24:06 +00:00
Weblate
58c1118993
Merge remote-tracking branch 'origin/develop' into develop
2018-01-05 12:18:19 +00:00
Andrey
d3624886a7
Translated using Weblate (Russian)
...
Currently translated at 100.0% (958 of 958 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-05 12:18:19 +00:00
Michael Telatynski
c61d09464a
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self
...
small refactor && warn on self-demotion
2018-01-05 12:18:15 +00:00
Michael Telatynski
9f295b7a86
fix typo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 12:03:46 +00:00
Michael Telatynski
558a90a359
comment out RoomView.onStatusBarHidden
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 11:58:42 +00:00
Michael Telatynski
a8bd4bf858
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 11:56:18 +00:00
David Baker
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes
...
Remove use of deprecated React.PropTypes
2018-01-05 11:53:55 +00:00
Michael Telatynski
222b01e000
Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings
...
only save RelatedGroupSettings if it was modified. Otherwise perms issue
2018-01-05 11:53:30 +00:00
David Baker
350dab06a0
Merge pull request #1675 from turt2live/travis/fix-granular-again
...
Fix a couple more issues with granular settings
2018-01-05 11:48:32 +00:00