63695 Commits

Author SHA1 Message Date
Luke Barnard 2ba0a801c4 Merge pull request #1449 from matrix-org/luke/groups-store
Factor-out GroupStore and create GroupStoreCache
2017-10-04 18:11:11 +01:00
Luke Barnard cbb36b163b Typo 2017-10-04 18:05:40 +01:00
Luke Barnard c1318e9102 Only maintain one GroupStore in the GroupStoreCache
So that the group store data is up-to-date and to prevent group stores hanging around in memory
2017-10-04 17:51:38 +01:00
Luke Barnard b16eb1713e Typo 2017-10-04 17:01:44 +01:00
Luke Barnard 4017fa7f1d Factor-out GroupStore and create GroupStoreCache
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.

The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.

(We're running out of words to describe the hierachy of things that store things)
2017-10-04 16:56:35 +01:00
Luke Barnard 3d7b1cb382 Merge pull request #5164 from vector-im/luke/fix-no-roomlist-placeholders
Fix bug that made sub list placeholders not show for ILAG etc.
2017-10-04 16:13:45 +01:00
Luke Barnard 70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. 2017-10-04 15:58:40 +01:00
Luke Barnard 6875005e30 Merge pull request #1448 from matrix-org/luke/fix-related-groups-in-labs
Put related groups UI behind groups labs flag
2017-10-04 15:00:08 +01:00
Luke Barnard ed74ac394b Put related groups UI behind groups labs flag 2017-10-04 14:35:13 +01:00
Luke Barnard a400c03768 Merge pull request #1447 from matrix-org/luke/feature-flair-related-only
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:24:59 +01:00
Luke Barnard 54ba164862 Merge pull request #1446 from matrix-org/luke/feature-related-groups-ui
Implement UI for editing related groups of a room
2017-10-04 14:21:48 +01:00
Luke Barnard 0c6b5776ec Remove commented imports 2017-10-04 14:09:51 +01:00
Luke Barnard 02e7287123 Remove constraint on groups being local, remove logging 2017-10-04 14:08:31 +01:00
Luke Barnard 8d46b19916 Restrict Flair in the timeline to related groups of the room 2017-10-04 14:06:49 +01:00
Luke Barnard 9f39a15163 Merge pull request #1445 from matrix-org/luke/fix-editable-item-list
Fix a couple of bugs with EditableItemList
2017-10-04 13:22:46 +01:00
Luke Barnard 7be5e685f7 Implement UI for editing related groups of a room
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
Luke Barnard 9e3954865a Fix a couple of bugs with EditableItemList
- fix entering the same thing twice (which had the bug of not emptying the "new" field)
 - fix editing items in the list (which would stack overflow because of typo)
2017-10-04 13:15:38 +01:00
Luke Barnard 56c366ebd3 Merge pull request #5161 from vector-im/luke/refactor-editable-list-from-alias-settings
Factor out EditableItemList component from AliasSettings
2017-10-04 10:56:21 +01:00
Luke Barnard 1938a767a2 Merge pull request #1444 from matrix-org/luke/refactor-editable-list-from-alias-settings
Factor out EditableItemList from AliasSettings
2017-10-04 10:56:17 +01:00
Luke Barnard 28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings 2017-10-04 10:37:45 +01:00
Luke Barnard a9d308004e Factor out EditableItemList component from AliasSettings 2017-10-04 10:30:09 +01:00
Luke Barnard 4e9694be6d Maintain "blur to add" function to match previous UX 2017-10-04 10:28:26 +01:00
Luke Barnard 407a632a8d Fix typo 2017-10-04 10:26:43 +01:00
Walter a75fa7fd3e Translated using Weblate (Russian)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-10-04 09:24:42 +00:00
Danilo Resende 44162d5c8a Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
2017-10-04 09:24:42 +00:00
Luke Barnard ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations
Mark and remove some translations
2017-10-04 10:24:36 +01:00
Luke Barnard d25ebfb844 Remove cruft from EIL 2017-10-04 10:15:44 +01:00
Walter 5abf30f373 Translated using Weblate (Ukrainian)
Currently translated at 13.6% (117 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-10-04 09:09:15 +00:00
Walter a9a2b60dfc Translated using Weblate (Russian)
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-04 09:09:14 +00:00
Danilo Resende 00a89f8263 Translated using Weblate (Portuguese (Brazil))
Currently translated at 92.3% (790 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-10-04 09:09:14 +00:00
Luke Barnard 011aadcb94 Merge pull request #1421 from pafcu/develop
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
Luke Barnard 8243c39d83 Factor out EditableItemList from AliasSettings
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
2017-10-04 10:00:01 +01:00
Danilo Resende 23c1a3233b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
2017-10-03 22:19:54 +00:00
pafcu 9680bcb117 Implement reviewer suggestions 2017-10-03 18:22:58 +02:00
Bamstam f040a248d6 Translated using Weblate (German)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-10-03 14:34:35 +00:00
Walter 171353a87d Translated using Weblate (Ukrainian)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-10-03 12:38:04 +00:00
Weblate 65e73c71cd Merge remote-tracking branch 'origin/develop' into develop 2017-10-03 10:45:12 +00:00
syamkumar 3b8ad0e12e Translated using Weblate (Malayalam)
Currently translated at 93.2% (208 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-10-03 10:45:12 +00:00
Xose M 834801e9d7 Translated using Weblate (Galician)
Currently translated at 44.8% (100 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
2017-10-03 10:45:11 +00:00
Nathan van Beelen 233a611c22 Translated using Weblate (Dutch)
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-10-03 10:45:11 +00:00
Pitchaya Boonsarngsuk fa0a87ae39 Translated using Weblate (Thai)
Currently translated at 61.4% (525 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-10-03 10:45:08 +00:00
Luke Barnard d082e44d94 Merge pull request #5141 from vector-im/luke/groups-remove-room
CSS for "remove" button on GroupRoomTile
2017-10-03 11:45:07 +01:00
Luke Barnard 03581adf85 Merge pull request #1438 from matrix-org/luke/groups-remove-room
Implement button to remove a room from a group
2017-10-03 11:45:03 +01:00
Luke Barnard 6b834bc72e Add confirmation dialog for removing room from group 2017-10-03 11:16:22 +01:00
Luke Barnard 195395e7ee Adjust CSS for groupRoomTile and add QuestionDialog right padding
(The confirmation dialog for removing a room needed padding)
2017-10-03 11:14:43 +01:00
Luke Barnard 0116c4b486 Log the error when failing to removie room from group 2017-10-03 10:14:08 +01:00
Luke Barnard 3e34a460a4 Add error dialog for when removing room fails 2017-10-03 10:12:11 +01:00
Stefan Parviainen a96169e80e Fix merge conflict 2017-10-02 17:57:22 +02:00
Silke 4361953d6d Translated using Weblate (Dutch)
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-10-02 14:18:04 +00:00
Luke Barnard 8d189cc322 Merge pull request #1443 from matrix-org/dbkr/fix_3pid_invites
Fix showing 3pid invites in member list
2017-10-02 15:18:00 +01:00