Richard Lewis
98ac3dd19b
Explicitly set initialisation state.
2017-11-10 09:44:58 +00:00
Luke Barnard
7893927e14
Merge pull request #1598 from matrix-org/luke/groups-update-group-room-visibility-api
...
Modify the group room visibility API to reflect the js-sdk changes
2017-11-09 17:34:18 +00:00
Luke Barnard
31be27515c
Modify the group room visibility API to reflect the js-sdk changes
...
See https://github.com/matrix-org/matrix-js-sdk/pull/569
2017-11-09 16:28:21 +00:00
David Baker
b1ec430523
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
David Baker
820d9c1c25
Show staus bar on Unknown Device Error
...
Don't pop up the dialog as soon as we can't send a message.
Also removes dispatches used to keep the RoomStatusBar up to date.
We can get the same events straight from the js-sdk via the
pending events event.
2017-11-09 15:58:15 +00:00
Luke Barnard
a8487c540f
Convert group avatar URL to HTTP before handing to BaseAvatar
...
This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.
2017-11-09 14:34:04 +00:00
Richard Lewis
da8b1ff1cd
Ensure that loading state is reset when showing app panel.
2017-11-09 14:28:24 +00:00
Weblate
3807d99a6a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-09 14:17:07 +00:00
Peter Vágner
1c1acd6d12
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-09 14:17:06 +00:00
Andrey
f796c4c6d1
Translated using Weblate (Russian)
...
Currently translated at 98.4% (914 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-09 14:17:06 +00:00
bldrzzy
9b7f302310
Translated using Weblate (Polish)
...
Currently translated at 76.7% (712 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-11-09 14:17:06 +00:00
Xose M
0250958c25
Translated using Weblate (Galician)
...
Currently translated at 1.7% (16 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2017-11-09 14:17:06 +00:00
Luke Barnard
9a6c9594a1
Correctly display group invite
...
By making sure the groupName truncates in the right place
2017-11-09 14:16:54 +00:00
Richard Lewis
f796bc79c3
Fix addition of scalar token to widget URL.
...
Add error logging.
2017-11-09 14:07:29 +00:00
Luke Barnard
9027780215
Show group name in flair tooltip if one is set
...
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"
Fixes https://github.com/vector-im/riot-web/issues/5341
2017-11-09 12:38:43 +00:00
Luke Barnard
6eeb91ee2e
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
...
Fixes https://github.com/vector-im/riot-web/issues/5486
2017-11-09 12:24:20 +00:00
Xose M
9b7ab4b7bd
Added translation using Weblate (Galician)
2017-11-09 06:24:11 +00:00
Travis Ralston
030633fa90
Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings
2017-11-08 17:43:38 -07:00
Travis Ralston
2711da28b4
Use the SettingsStore in the UnknownDeviceDialog
2017-11-08 17:43:06 -07:00
Travis Ralston
f7da5836e1
Make blacklistUnverifiedDevices override the level order
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
Travis Ralston
c7d8f3931f
Revert notification toolbar setting
...
It isn't a setting.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:06:36 -07:00
Richard Lewis
8016fb82d7
Fix broken commit.
2017-11-08 20:38:54 +00:00
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
Peter Vágner
1e7fc953b3
Ooops, also add the string to the default language file.
2017-11-08 11:56:30 +01:00
Weblate
b496eec523
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:55:59 +00:00