Commit Graph

62585 Commits

Author SHA1 Message Date
Michael Telatynski
5514d81683 Add Mention button to MemberInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 23:01:40 +01:00
Michael Telatynski
c896dfb17b delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:21:33 +01:00
Michael Telatynski
f813a752e7 only show change power level option in MemberInfo if we can actually
send m.room.power_level AND are lower PL than them

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:12:48 +01:00
Stefan Parviainen
88fd60066f Fix typo
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 20:07:57 +02:00
Szimszon
b0d4fb09c6 Translated using Weblate (Hungarian)
Currently translated at 100.0% (905 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-24 17:48:58 +00:00
Stefan Parviainen
bc034f3083 Update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:32 +02:00
Stefan Parviainen
b5024cca75 Further simplify MemberEventListSummary a bit
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:08 +02:00
Luke Barnard
e9ce7f97f5 canSetRelatedRooms -> canSetRelatedGroups 2017-10-24 17:57:26 +01:00
Weblate
3bff844a62 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 16:48:15 +00:00
Luke Barnard
a747a78e06 CSS to allow multi-line "Add rooms to this community" 2017-10-24 17:48:06 +01:00
Stefan Parviainen
6406fc3865 Use plurals in WhoIsTyping 2017-10-24 18:32:50 +02:00
Stefan Parviainen
4ff369c884 Merge branch 'develop' into departify 2017-10-24 18:27:24 +02:00
Luke Barnard
bd15a88c89 Use CSS to stop greyed Right/LeftPanel UI from being interactable 2017-10-24 17:10:29 +01:00
Weblate
e2b80e9e80 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 16:01:07 +00:00
Luke Barnard
858e1fa341 Fix #5361
Make it possible to click on the camera icon under group icon
2017-10-24 17:00:57 +01:00
Weblate
b2d5f4ce80 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 15:41:57 +00:00
Jan Kudrik
5d53f30619 Translated using Weblate (Czech)
Currently translated at 57.2% (518 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-24 15:41:56 +00:00
Luke Barnard
0463f0e581 Merge pull request #1530 from matrix-org/luke/fix-room-tile-highlighted-viewing-groups
When dispatching view_[my_]group[s], reset RoomViewStore
2017-10-24 16:41:52 +01:00
Luke Barnard
7b666af24c When dispatching view_[my_]group[s], reset RoomViewStore
so that RoomTiles are not highlighted when the user is looking at MyGroups or GroupView
2017-10-24 16:32:52 +01:00
Andrey
2b0cb7e28e Translated using Weblate (Russian)
Currently translated at 100.0% (905 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-24 15:26:51 +00:00
Luke Barnard
640d88f25d Typo 2017-10-24 16:21:18 +01:00
Luke Barnard
ee7ebc425c Only show editing UI for aliases/related_groups for users /w power 2017-10-24 16:19:09 +01:00
Weblate
cd3d6f9642 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 14:51:21 +00:00
Jan Kudrik
825e7eb8ab Translated using Weblate (Czech)
Currently translated at 56.0% (507 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-24 14:51:20 +00:00
David Baker
f7dce8ec70 Merge pull request #1528 from matrix-org/luke/groups-settings-privileged-only
Prevent editing of UI requiring user privilege if user unprivileged
2017-10-24 15:51:16 +01:00
Weblate
a58ea58380 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 14:51:12 +00:00
Balaji
e2924d30df Translated using Weblate (Tamil)
Currently translated at 78.6% (169 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
2017-10-24 14:51:12 +00:00
David Baker
f258b3253f Merge pull request #5417 from vector-im/luke/groups-settings-privileged-only
CSS for preventing editing of UI requiring user privilege if user unprivileged
2017-10-24 15:51:07 +01:00
Weblate
dc7037b4fa Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 14:31:54 +00:00
David Baker
9e54002983 Merge pull request #1526 from matrix-org/luke/fix-group-rooms-guest-can-join-
Use the correct property of the API room objects
2017-10-24 15:31:49 +01:00
Luke Barnard
01d6577abd CSS for preventing editing of UI requiring user privilege if user unprivileged 2017-10-24 15:27:11 +01:00
Luke Barnard
459ffc47d6 Prevent editing of UI requiring user privilege if user unprivileged 2017-10-24 15:25:35 +01:00
Weblate
78f1f5bae8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 13:40:30 +00:00
David Baker
8b4b3565a7 Merge pull request #1527 from matrix-org/dbkr/geni18n-no-other
Don't include the |other in the translation value
2017-10-24 14:40:25 +01:00
David Baker
8447d15013 Don't include the |other in the translation value 2017-10-24 14:26:30 +01:00
Weblate
433d62e48c Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 12:56:47 +00:00
David Baker
def3bcce5f Merge pull request #1525 from matrix-org/dbkr/rerun_i18n
Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521
2017-10-24 13:56:42 +01:00
Luke Barnard
e955d27b5f Use the correct property of the API room objects 2017-10-24 13:47:10 +01:00
David Baker
f9c45d2c45 Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521 2017-10-24 13:40:44 +01:00
Weblate
43f1951f37 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:19:34 +00:00
Luke Barnard
1704a2fb9c Merge pull request #5409 from vector-im/luke/fix-privileged-group-ui-1
Only show UI for adding rooms/users to groups to privileged users
2017-10-24 11:19:30 +01:00
Weblate
e9eb4a4647 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:18:07 +00:00
David Baker
ba46faf1b1 Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings
Fix some react warnings in GroupMemberList
2017-10-24 11:18:03 +01:00
Weblate
870babb71e Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:15:55 +00:00
David Baker
93fca8439e Merge pull request #1521 from matrix-org/dbkr/geni18n-addplural
Fix bug with gen-i18n/js when adding new plurals
2017-10-24 11:15:51 +01:00
Luke Barnard
6a0ecfba7f Merge branch 'develop' into luke/fix-privileged-group-ui-1 2017-10-24 11:09:05 +01:00
Weblate
7a9908da60 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:05:18 +00:00
David Baker
f29f627c31 Merge pull request #1524 from matrix-org/luke/groups-store-true-global
Make GroupStoreCache global for cross-package access
2017-10-24 11:05:14 +01:00
Weblate
6e5ae0c664 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:03:49 +00:00
David Baker
ff5fbd4863 Merge pull request #5407 from vector-im/luke/fix-invite-to-community
Only show "Invite to this community" when viewing group members
2017-10-24 11:03:44 +01:00