Commit Graph

7010 Commits (15cadd864c9bcb91b4308e297abe1673c5c6cc6b)

Author SHA1 Message Date
Weblate 15cadd864c Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 14:18:25 +00:00
David Baker 577d68f628 Merge pull request #1494 from matrix-org/luke/groups-auto-relate-group-to-added-room
Attempt to relate a group to a room when adding it
2017-10-18 15:18:21 +01:00
Luke Barnard 96cc74ab62 Attempt to relate a group to a room when adding it
So as to remove another step on "The Route To Flair" (the steps taken for a user to get flair to appear on their SenderProfile in a room).
2017-10-18 15:00:54 +01:00
Weblate 47dcf4849e Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 09:13:05 +00:00
Walter b211b9d344 Translated using Weblate (Russian)
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/ru/
2017-10-18 09:13:04 +00:00
Luke Barnard 8c162766fe Merge pull request #1490 from matrix-org/luke/groups-move-buttons
Shuffle GroupView UI
2017-10-18 11:12:58 +02:00
Luke Barnard 677c8e95ee Merge branch 'develop' into luke/groups-move-buttons 2017-10-18 10:31:54 +02:00
Weblate dd33092985 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 18:30:54 +00:00
David Baker 62a79d823d Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties
Fix bug preventing partial group profile
2017-10-17 19:30:50 +01:00
Weblate dc6f10ee7f Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 17:11:14 +00:00
Ramon Vilar 2b3a8cd365 Translated using Weblate (Catalan)
Currently translated at 4.5% (42 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2017-10-17 17:11:13 +00:00
Luke Barnard df9e037bfc Default values when GETing instead of when POSTing 2017-10-17 18:11:00 +01:00
David Baker c9576c9065 Merge pull request #1492 from matrix-org/luke/fix-room-address-tile-no-room-id
Don't show room IDs when picking rooms
2017-10-17 18:10:58 +01:00
Luke Barnard 1b8c5b50db Don't show room IDs when picking rooms 2017-10-17 18:02:35 +01:00
Luke Barnard 3bbff627fc Fix bug preventing partial group profile
When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.
2017-10-17 17:26:34 +01:00
Luke Barnard 49b7525a67 Actually move the buttons in GroupView
- The "Leave" button is now in the top-right
 - The "Publish" button is not a checkbox
2017-10-17 16:10:34 +01:00
Luke Barnard 0415869b8c Add useful functions to GroupView to inspect user flags 2017-10-17 16:08:19 +01:00
Luke Barnard 626f007f4e Move membership section above long description textarea 2017-10-17 12:00:31 +01:00
Luke Barnard 7df3335570 Only show membership settings when editing 2017-10-17 11:59:52 +01:00
Luke Barnard 495465e865 Put invite accept/decline buttons in correct div to align them to the right 2017-10-17 11:59:16 +01:00
Weblate 68c02cad33 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 10:33:45 +00:00
Bamstam ba160ffbd0 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-17 10:33:44 +00:00
Luke Barnard 24c4c1edc7 Merge pull request #1489 from matrix-org/luke/groups-invited-users-hide-if-empty
Only show invited section if there are invited group members
2017-10-17 12:33:39 +02:00
Luke Barnard 85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01:00
Szimszon 5686d8204a Translated using Weblate (Hungarian)
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/hu/
2017-10-16 20:16:58 +00:00
Krombel 09070a7747 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 19:05:05 +00:00
Andrey b7644a9595 Translated using Weblate (Russian)
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/ru/
2017-10-16 17:28:06 +00:00
Luke Barnard 14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Weblate 8921eb903f Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 16:29:19 +00:00
Luke Barnard 760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users
Show "Invited" section in the user list
2017-10-16 18:29:15 +02:00
Luke Barnard 9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
Weblate 88cc53f770 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 15:42:28 +00:00
David Baker 9d2f5b0a8a Merge pull request #1487 from matrix-org/luke/fix-overflow-entity-tile
Refactor class names for an entity tile being hovered over
2017-10-16 16:42:23 +01:00
Luke Barnard 008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard 47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Weblate 598a9a6cf3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 13:46:40 +00:00
Stefan Parviainen 9edcd0a9e5 Translated using Weblate (Finnish)
Currently translated at 78.8% (729 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-10-16 13:46:39 +00:00
David Baker bbf3550865 Merge branch 'master' into develop 2017-10-16 14:46:11 +01:00
David Baker f58d89ef80 v0.10.7 2017-10-16 14:45:14 +01:00
David Baker bb623ca0a7 Prepare changelog for v0.10.7 2017-10-16 14:45:13 +01:00
David Baker bcb792a412 Released js-sdk 2017-10-16 14:41:23 +01:00
Weblate 09b381bc82 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 09:17:50 +00:00
André Breda b8aa9e8bc1 Translated using Weblate (Portuguese)
Currently translated at 94.3% (872 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-16 09:17:50 +00:00
Bamstam 62897457fa Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 09:17:50 +00:00
David Baker e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Krombel b230bb02b3 Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 21:08:30 +00:00
Bamstam b483b4f3a0 Translated using Weblate (German)
Currently translated at 99.7% (922 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:15:27 +00:00
Krombel 9a6bbf373b Translated using Weblate (German)
Currently translated at 99.6% (921 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:14:44 +00:00
Bamstam 851e278295 Translated using Weblate (German)
Currently translated at 99.4% (919 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:13:25 +00:00
Krombel 8f5cb598f0 Translated using Weblate (German)
Currently translated at 99.3% (918 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:12:33 +00:00