OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,140 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

7140 Commits (f032284eff219c279939740d65216cb49e50dfa8)

Author SHA1 Message Date
Andrew (anoa) f032284eff
Remember whether widget drawer was hidden per-room 
Fixes #4850

Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-10-24 16:28:10 -07: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
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
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 459ffc47d6 Prevent editing of UI requiring user privilege if user unprivileged 2017-10-24 15:25:35 +01: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
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
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
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
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
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
David Baker 2340c1308e Fix bug with gen-i18n/js when adding new plurals 2017-10-23 19:53:17 +01: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
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
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
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
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
Luke Barnard e3de8ff72f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-23 14:55:08 +01:00
Luke Barnard e89371fb1c Add click-to-open-settings functionality to GroupAvatar 2017-10-23 14:54:57 +01:00
Luke Barnard c73ef2f83b Merge pull request #1515 from matrix-org/dbkr/geni18n_check_format_strings 
Make the gen-i18n script validate _t calls
 2017-10-23 14:12:28 +01:00
David Baker 54458f1438 Actually even out brackets 2017-10-23 14:02:58 +01:00
David Baker 8d1aea5b2e Misc PR review fixes 2017-10-23 10:18:29 +01:00
David Baker 317ad64ae6 Make the gen-i18n script validate _t calls 
And throw a massive tantrum if you've messed up your format strings.

Because broken format strings making their way into the app cause it
to throw exceptions.
 2017-10-20 18:38:22 +01:00
Luke Barnard b5c9fa4caa Merge pull request #1514 from matrix-org/luke/groups-my-groups-placeholder 
Add placeholder to MyGroups page, adjust CSS classes
 2017-10-20 18:16:28 +01:00
Luke Barnard 1a7710c192 Adjust wording on placeholder 2017-10-20 18:10:14 +01:00
Luke Barnard a0e218d107 Add placeholder to MyGroups page, adjust CSS classes 
- This is part of a general improvement in the look of MyGroups
 - Wording on "Create a community to..." modified to not have the word "community" twice
 2017-10-20 17:38:02 +01:00
Richard Lewis f4e3e84765 Merge pull request #1338 from matrix-org/rxl881/parallelshell 
Rxl881/parallelshell
 2017-10-20 17:11:03 +01:00
Luke Barnard d859504276 Merge pull request #1513 from matrix-org/dbkr/prunei18n_oct17 
Run prunei18n
 2017-10-20 11:56:35 +01:00
David Baker 00a13c780f Run prunei18n 2017-10-20 11:39:01 +01:00
David Baker 6fb8f06095 Merge pull request #1512 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-10-20 11:31:24 +01:00
Weblate db4d96a1eb Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 10:21:50 +00:00
Luke Barnard 93997ac5fd Merge pull request #1502 from matrix-org/dbkr/prunei18n 
Add script to prune unused translations
 2017-10-20 11:21:45 +01:00
Weblate 639820cfc8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 10:01:34 +00:00
Luke Barnard f15bf8931a Merge pull request #1510 from matrix-org/dbkr/fix_dms 
Fix creation of DM rooms
 2017-10-20 11:01:28 +01:00
Richard Lewis 3cf5864879 Update deps 2017-10-20 10:27:33 +01:00