63c8d676cf
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 11:36:35 +00:00
20a16d71b8
Merge pull request #1590 from matrix-org/luke/fix-flair-store-2
...
Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise
2017-11-08 11:36:30 +00:00
f14f2f99ab
Translated using Weblate (Slovak)
...
Currently translated at 99.8% (927 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-08 11:31:58 +00:00
1c5e7f3048
Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise
2017-11-08 11:31:04 +00:00
4a9752a482
Added translation using Weblate (Slovak)
2017-11-08 11:21:21 +00:00
b496eec523
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:55:59 +00:00
c1d9d3714a
Fix not being able to filter community rooms - fixes vector-im/vector-web#5538
2017-11-08 10:55:51 +00:00
8f2bb73229
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-08 10:53:24 +00:00
077ca36b05
Rank rooms with shorter matching aliases first
2017-11-08 10:47:45 +00:00
b3674f503d
Do not search through room topics
2017-11-08 10:32:48 +00:00
59bf3b231c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:24:05 +00:00
120e7b821f
Merge pull request #1585 from matrix-org/luke/groups-inviter-profile
...
Use the getProfileInfo API for group inviter profile
2017-11-08 10:24:00 +00:00
10778e075e
Merge branch 'develop' into luke/groups-inviter-profile
2017-11-08 10:10:43 +00:00
4bb083d959
Style
2017-11-08 10:08:04 +00:00
f53f9ed8ca
inviterProfile = null initially
2017-11-08 10:07:43 +00:00
662a05e86f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:04:45 +00:00
4c47f75918
Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility
...
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-08 10:04:41 +00:00
a79a687e59
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 22:46:15 +00:00
ce6957a288
Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api
...
Alter group member api
2017-11-07 22:46:11 +00:00
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
d5d5b9e334
Translated using Weblate (French)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 21:41:16 +00:00
4e717f38d7
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-07 19:41:02 +00:00
17e7dc8eed
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:55:38 +00:00
8fbe50a1cf
Merge pull request #1580 from matrix-org/luke/groups-new-group-settings
...
Improve group creation UX
2017-11-07 18:55:34 +00:00
51ec12bfe9
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:53:08 +00:00
d777e370f2
Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing
...
Disable RoomDetailList in GroupView when editing
2017-11-07 18:53:04 +00:00
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +00:00
85ea67494c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:24:25 +00:00
3b1726657f
Merge pull request #1586 from turt2live/travis/message-pinning-fix1
...
Default to no read pins if there is no applicable account data
2017-11-07 18:24:21 +00:00
343ffa6b97
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:16:04 +00:00
49a935881f
Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk
...
UnknownDeviceDialog: get devices from SDK
2017-11-07 18:15:59 +00:00
e0ddd88ec9
Default to no read pins if there is no applicable account data
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:14:27 -07:00
ffd83f1faf
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 17:56:17 +00:00
002086de69
Translated using Weblate (Russian)
...
Currently translated at 98.7% (914 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-07 17:56:16 +00:00
e14e0bf200
Merge pull request #1486 from turt2live/travis/pinned-notice
...
Add a small indicator for when a new event is pinned
2017-11-07 17:56:12 +00:00
10f15dfc56
Unmounted guard
2017-11-07 17:10:40 +00:00
80d4873542
Disable RoomDetailList in GroupView when editing
...
Otherwise the rooms can be clicked on.
2017-11-07 16:54:28 +00:00
ed709f52d1
Use the getProfileInfo API for group inviter profile
2017-11-07 16:42:43 +00:00
ec560345c7
UnknownDeviceDialog: get devices from SDK
...
rather than having to have the error message passed in.
This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
2017-11-07 16:37:43 +00:00
142d23a099
Cap the read pin event IDs to 10
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 09:16:19 -07:00
2c096f45c2
Translated using Weblate (French)
...
Currently translated at 100.0% (926 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 15:34:05 +00:00
ed34c1cc63
Translated using Weblate (German)
...
Currently translated at 100.0% (926 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-07 15:24:45 +00:00
397d7724e5
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 15:22:40 +00:00
a8ff8973f8
Translated using Weblate (Russian)
...
Currently translated at 98.4% (911 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-07 15:22:39 +00:00
4d9f946388
Merge pull request #1582 from matrix-org/luke/group-rooms-tooltip
...
Implement tooltip for group rooms
2017-11-07 15:22:35 +00:00
646cabf324
Add missing whitespace
2017-11-07 15:15:10 +00:00
ddc1ff2f23
Name things in a sane way
2017-11-07 15:13:26 +00:00
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
3e29a26766
Translated using Weblate (German)
...
Currently translated at 100.0% (925 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-07 13:33:46 +00:00
96de72ab44
Switch to using existing dep "qs" and record in package.json
2017-11-07 12:45:12 +00:00
Weblate