Richard Lewis
|
56581ef408
|
Fix various loadingElement related issues.
|
2017-11-08 20:38:31 +00:00 |
|
Richard Lewis
|
b2b07d9370
|
Formatting
|
2017-11-08 20:17:28 +00:00 |
|
Weblate
|
23c9324fa5
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 18:52:33 +00:00 |
|
David Baker
|
be5e67245b
|
Merge pull request #1594 from matrix-org/revert-1584-dbkr/udd_devices_from_sdk
Revert "UnknownDeviceDialog: get devices from SDK"
|
2017-11-08 18:52:28 +00:00 |
|
David Baker
|
7b243bf64d
|
Revert "UnknownDeviceDialog: get devices from SDK"
|
2017-11-08 18:49:50 +00:00 |
|
Richard Lewis
|
be0a76dbd6
|
Update variable name and JSdoc for improved clarity.
|
2017-11-08 17:44:54 +00:00 |
|
Richard Lewis
|
ca1ffdfa9f
|
Remove unused dep.
|
2017-11-08 17:39:25 +00:00 |
|
Matthew Hodgson
|
58ee4d0a76
|
rewrite the tinter to be ES6, and correctly cache fixups per theme
|
2017-11-08 06:55:07 -08:00 |
|
Weblate
|
685e5b916b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 14:04:32 +00:00 |
|
David Baker
|
b575df7da7
|
Merge pull request #1591 from matrix-org/luke/groups-order-admins-first
Order users in the group member list with admins first
|
2017-11-08 14:04:28 +00:00 |
|
Luke Barnard
|
e2a0cba6cb
|
If group member privilege level is equal, disambiguate with displayname or userId
|
2017-11-08 13:57:38 +00:00 |
|
Weblate
|
02cce94c2b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 13:35:58 +00:00 |
|
Luke Barnard
|
65cea53f3d
|
Merge pull request #1592 from matrix-org/luke/groups-fix-accept-invite-refresh-members
Fetch group members after accepting an invite
|
2017-11-08 13:35:53 +00:00 |
|
Krombel
|
d583a12514
|
Translated using Weblate (German)
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/de/
|
2017-11-08 13:00:39 +00:00 |
|
Kévin C
|
569a3a3ac4
|
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-08 12:34:28 +00:00 |
|
Matthew Hodgson
|
e729bc431d
|
Merge remote-tracking branch 'origin/develop' into matthew/status
|
2017-11-08 04:29:52 -08:00 |
|
Peter Vágner
|
447f23796c
|
Translated using Weblate (Slovak)
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/sk/
|
2017-11-08 12:07:30 +00:00 |
|
Luke Barnard
|
3e3ebd6358
|
Fetch group members after accepting an invite
|
2017-11-08 11:52:52 +00:00 |
|
Luke Barnard
|
e3e161fbea
|
Order users in the group member list with admins first
|
2017-11-08 11:51:58 +00:00 |
|
Weblate
|
100053ff3d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 11:49:49 +00:00 |
|
Luke Barnard
|
7075931c58
|
Merge pull request #1589 from matrix-org/luke/improve-room-address-picker
Improve address picker for rooms
|
2017-11-08 11:49:45 +00:00 |
|
Weblate
|
63c8d676cf
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 11:36:35 +00:00 |
|
David Baker
|
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 |
|
Peter Vágner
|
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 |
|
Luke Barnard
|
1c5e7f3048
|
Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise
|
2017-11-08 11:31:04 +00:00 |
|
Peter Vágner
|
4a9752a482
|
Added translation using Weblate (Slovak)
|
2017-11-08 11:21:21 +00:00 |
|
Weblate
|
b496eec523
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 10:55:59 +00:00 |
|
Luke Barnard
|
c1d9d3714a
|
Fix not being able to filter community rooms - fixes vector-im/vector-web#5538
|
2017-11-08 10:55:51 +00:00 |
|
Szimszon
|
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 |
|
Luke Barnard
|
077ca36b05
|
Rank rooms with shorter matching aliases first
|
2017-11-08 10:47:45 +00:00 |
|
Luke Barnard
|
b3674f503d
|
Do not search through room topics
|
2017-11-08 10:32:48 +00:00 |
|
Weblate
|
59bf3b231c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 10:24:05 +00:00 |
|
Luke Barnard
|
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 |
|
Luke Barnard
|
10778e075e
|
Merge branch 'develop' into luke/groups-inviter-profile
|
2017-11-08 10:10:43 +00:00 |
|
Luke Barnard
|
4bb083d959
|
Style
|
2017-11-08 10:08:04 +00:00 |
|
Luke Barnard
|
f53f9ed8ca
|
inviterProfile = null initially
|
2017-11-08 10:07:43 +00:00 |
|
Weblate
|
662a05e86f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-08 10:04:45 +00:00 |
|
Luke Barnard
|
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 |
|
Weblate
|
a79a687e59
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-07 22:46:15 +00:00 |
|
Matthew Hodgson
|
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 |
|
Travis Ralston
|
289b0c2b6a
|
Merge branch 'develop' into travis/granular-settings
|
2017-11-07 14:55:12 -07:00 |
|
Kévin C
|
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 |
|
Szimszon
|
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 |
|
Weblate
|
17e7dc8eed
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-07 18:55:38 +00:00 |
|
Luke Barnard
|
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 |
|
Weblate
|
51ec12bfe9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-07 18:53:08 +00:00 |
|
Luke Barnard
|
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 |
|
Luke Barnard
|
edc744067f
|
Add checkbox to GroupAddressPicker for determining visibility of group rooms
|
2017-11-07 18:51:41 +00:00 |
|
Weblate
|
85ea67494c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-11-07 18:24:25 +00:00 |
|
Matthew Hodgson
|
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 |
|