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

7311 Commits (4bb083d9599a48e9a4b17abbb5f7de67897c321e)

Author SHA1 Message Date
Luke Barnard 4bb083d959 Style 2017-11-08 10:08:04 +00:00
Luke Barnard f53f9ed8ca inviterProfile = null initially 2017-11-08 10:07:43 +00:00
Luke Barnard ed709f52d1 Use the getProfileInfo API for group inviter profile 2017-11-07 16:42:43 +00:00
Luke Barnard 47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills 
Room notifs in autocomplete & composer
 2017-11-07 10:25:48 +00:00
David Baker df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
Matthew Hodgson 17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug 
Ignore img tags in HTML if src is not specified
 2017-11-06 18:02:38 +00:00
Luke Barnard d14f943629 Ignore img tags in HTML if src is not specified 
This applies to HTML messages and group summaries.
 2017-11-06 17:52:46 +00:00
David Baker 029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges 
Indicate admins in the group member list with a sheriff badge
 2017-11-06 17:16:34 +00:00
David Baker 08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
Luke Barnard d6a6e59d6c Indicate admins in the group member list with a sheriff badge 2017-11-06 16:37:16 +00:00
David Baker 41e7496ff1 unused var 2017-11-06 15:25:25 +00:00
David Baker adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
Richard Lewis f1db564506
Merge pull request #1533 from anoadragon453/develop 
Remember whether widget drawer was hidden per-room
 2017-11-06 14:29:25 +00:00
David Baker 48def50fec
Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group 
Throw an error when trying to create a group store with falsey groupId
 2017-11-06 13:02:46 +00:00
Luke Barnard febeb0429e Throw an error when trying to create a group store with falsey groupId 2017-11-06 10:18:10 +00:00
Matthew Hodgson 3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing 
Fixes React warning
 2017-11-04 15:41:57 +00:00
Matthew Hodgson d4adff3d25
Merge pull request #1575 from matrix-org/luke/fix-flair-store-again 
Fix Flair not appearing due to missing this._usersInFlight
 2017-11-03 22:44:16 +00:00
Luke Barnard da23afdec2 Better comment on FlairStore _usersInFlight 2017-11-03 18:48:15 +00:00
Luke Barnard d03f2826c3
Merge pull request #1574 from matrix-org/luke/fix-groups-rooms-list-view-room-dispatch 
Use, if possible, a room's canonical or first alias when viewing the …
 2017-11-03 18:46:58 +00:00
Luke Barnard 4d8f18742b Check against non-existant promise to resolve a user's groups 2017-11-03 18:43:43 +00:00
Luke Barnard d64fc4c842 Fix Flair not appearing due to missing this._usersInFlight 2017-11-03 18:19:10 +00:00
Luke Barnard 58f1757f0c Handle rooms with no aliases or canonical alias 2017-11-03 17:52:36 +00:00
Luke Barnard 98312a4647 Use, if possible, a room's canonical or first alias when viewing the room 
(Only affects rooms the user has never joined)
 2017-11-03 17:37:13 +00:00
Luke Barnard abff4ee6b5
Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog 
Add CSS classes to group ID input in CreateGroupDialog
 2017-11-03 16:14:59 +00:00
Luke Barnard b88c13d527 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:41 +00:00
Luke Barnard e84e4ed5f5 Add CSS classes to group ID input in CreateGroupDialog 2017-11-03 15:38:12 +00:00
David Baker 49ee78dab1 Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills 2017-11-03 14:39:52 +00:00
David Baker 43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room 
Give autocomplete providers the room they're in
 2017-11-03 14:29:59 +00:00
David Baker 2c9a93a8ac
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills 
Fix multiple pills on one line
 2017-11-03 14:24:33 +00:00
David Baker 802ab16746 Fix multiple pills on one line 2017-11-03 14:06:59 +00:00
Luke Barnard d0b3368445
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance 
Fix group invites such that they look similar to room invites
 2017-11-03 13:53:58 +00:00
Michael Telatynski b2cd65e182
Fixes React warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-03 12:30:58 +00:00
Luke Barnard 151f9917b1 Fix group invites such that they look similar to room invites 
- Change GroupInviteTile to use RoomTile CSS
 - Give group invites their own sub list, with heading "Community Invites"
 2017-11-03 12:19:37 +00:00
Luke Barnard 4511856d3b
Merge pull request #1569 from matrix-org/luke/groups-fix-my-groups-layout 
Add a GeminiScrollbar to Your Communities
 2017-11-03 12:03:12 +00:00
Luke Barnard 71c59eff2c Add a GeminiScrollbar to Your Communities 2017-11-03 11:19:29 +00:00
David Baker 112c74a255 Add NotifProvider to offer @room as a completion 2017-11-02 18:54:25 +00:00
David Baker 843d797ded Better type checking 2017-11-02 18:17:57 +00:00
David Baker 7f9967389d Pass room into Autocompleter 2017-11-02 18:15:26 +00:00
David Baker 6ad4bb80dd == 2017-11-02 18:14:46 +00:00
David Baker 3b58f0ca2a Ignore removed events 2017-11-02 18:14:21 +00:00
David Baker ee43c635d1 phrasing 2017-11-02 18:11:18 +00:00
David Baker 42589281d1 comment stub method 2017-11-02 18:10:13 +00:00
David Baker f7201e8dee Revert unintentional changes 2017-11-02 18:08:24 +00:00
David Baker 498b117d5a copyrights 2017-11-02 18:01:28 +00:00
David Baker 4953d4de4d Give autocomplete providers the room they're in 
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
 2017-11-02 17:51:08 +00:00
David Baker 8800081cb9
Merge pull request #1567 from matrix-org/luke/fix-flair-store 
Fix multiple requests for publicised groups of given user
 2017-11-02 16:09:07 +00:00
Luke Barnard 21e09840dc Fix multiple requests for publicised groups of given user 
Previously, a single user could end up in multiple batches, which would have been fine if the logic didn't assume otherwise. If a request took longer than 200ms, multiple batches would occur with intersecting sets of users, deleting promises that were then assumed to exist.

The logic now takes all "in flight" users to also not be "pending". Pending now means that the user will be processed in the next batch. "In flight" means the user is part of an ongoing batch.
 2017-11-02 15:59:26 +00:00
David Baker 7c17ad8509
Merge pull request #1566 from matrix-org/luke/groups-room-publicity 
Add toggle to alter visibility of a room-group association
 2017-11-02 15:38:03 +00:00
Luke Barnard 982e87e01c Communities are communities, wrap div for label alignment 2017-11-02 15:04:40 +00:00
David Baker 8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room 
Pillify room notifs in the timeline
 2017-11-02 14:22:58 +00:00