OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,273 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

7273 Commits (41257020c085b5d1f5bde78c7b963df2df917eaf)

Author SHA1 Message Date
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 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
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
Luke Barnard d1db0d6426 Deduplicate members, key by userId 2017-10-24 10:50:31 +01:00
Weblate 436fc95cdb Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 09:40:42 +00:00
Tirifto 2e7df425b9 Translated using Weblate (Esperanto) 
Currently translated at 4.5% (41 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2017-10-24 09:40:41 +00:00
Luke Barnard 353744b7f7 Merge pull request #1523 from matrix-org/luke/fix-group-rooms 
Add fields needed by RoomDetailList to groupRoomFromApiObject
 2017-10-24 10:40:37 +01:00
Luke Barnard 3ae31dd426 Make GroupStoreCache global for cross-package access 2017-10-24 10:39:47 +01:00
David Baker 46e9d4197a Use the 'and' feature! 2017-10-24 10:21:41 +01:00
Luke Barnard e419446081 Add fields needed by RoomDetailList to groupRoomFromApiObject 
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
 2017-10-24 10:13:38 +01:00
Luke Barnard 1cc427ba46 Fix some react warnings in GroupMemberList 
- If the list contains two users twice, react would warn about duplicate keys. Use `index` instead.
 - Check if unmounted before setting state after fetching members.
 2017-10-24 09:58:45 +01:00
Richard Lewis 11d4a63a32 Update text and split across multiple lines. 2017-10-23 23:59:36 +01:00
Richard Lewis 8b7f737c97 Remove logging. 
Return early.
 2017-10-23 23:47:37 +01:00
Richard Lewis 54bd916862 Split string across multiple lines. 2017-10-23 20:08:52 +01:00
David Baker 2340c1308e Fix bug with gen-i18n/js when adding new plurals 2017-10-23 19:53:17 +01:00
Richard Lewis 3c4c986aca Update button text 2017-10-23 18:42:43 +01:00
Richard Lewis 75303898e2 Remove package-lock :/ 2017-10-23 17:18:30 +01:00
Richard Lewis 94a1827418 Undo changes to package-lock 2017-10-23 17:15:31 +01:00
Weblate 4819379d3e Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 16:12:22 +00:00
Jan Kudrik 64e998cdf9 Translated using Weblate (Czech) 
Currently translated at 53.9% (488 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-10-23 16:12:21 +00:00
Luke Barnard 65ce71e6af Merge pull request #1519 from matrix-org/luke/groups-flair-avatars-set 
Only show flair for groups with avatars set
 2017-10-23 17:12:18 +01:00
Luke Barnard 2f418976aa Only show flair for groups with avatars set 
Fix vector-im/riot-web#5377
 2017-10-23 17:06:47 +01:00
Richard Lewis ee60155846 Add delete widget confirmation dialog. 2017-10-23 17:05:44 +01:00
Richard Lewis 625b87d346 Update package lock. 2017-10-23 17:00:52 +01:00
Bamstam d7c9109a66 Translated using Weblate (German) 
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/de/
 2017-10-23 15:45:31 +00:00
Weblate ee94895f0f Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 15:25:13 +00:00
Jan Kudrik 015fa776fb Translated using Weblate (Czech) 
Currently translated at 52.9% (479 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-10-23 15:25:12 +00:00
David Baker e023aa9a10 Merge pull request #1518 from matrix-org/luke/groups-update-on-invite 
Refresh group member lists after inviting users
 2017-10-23 16:25:09 +01:00
Luke Barnard b9dc5cb5ed Merge branch 'develop' into luke/groups-update-on-invite 2017-10-23 16:05:52 +01:00
Luke Barnard 0799e5cde4 Refresh group member lists after inviting users 2017-10-23 16:04:26 +01:00
Weblate 1243428836 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 14:59:38 +00:00
Luke Barnard 59c5dfda86 Merge pull request #1517 from matrix-org/luke/groups-invalidate-flair-cache 
Invalidate the user's public groups cache when changing group publicity
 2017-10-23 15:59:33 +01:00
Luke Barnard 0ff5b9c6a7 Invalidate the user's public groups cache when changing group publicity 
This will make the changes to their Flair "live", but only from the user's own perspective.
 2017-10-23 15:28:38 +01:00
Andrey 23dd059a7f 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-23 14:02:21 +00:00
Weblate 554114a4e9 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:58:36 +00:00
Luke Barnard 03f4e6c622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-23 14:57:50 +01:00
Luke Barnard a133fd1cf4 Fix "failed to create community" message 2017-10-23 14:57:40 +01:00
Weblate 4b09577dc2 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:56:32 +00:00
Matthew Hodgson 440b8e0e31 16px for flair please 2017-10-23 14:56:24 +01:00
Matthew Hodgson fb96f4fac2 fix typos 2017-10-23 14:55:54 +01:00