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

7344 Commits (e2a0cba6cb4e42e10602ab604e7c560df1e31995)

Author SHA1 Message Date
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
Luke Barnard bf77b51b5e Merge branch 'develop' into luke/groups-room-publicity 2017-11-02 13:39:33 +00:00
Luke Barnard 790db94fd7 Add toggle to alter the visibility of a room-group association 2017-11-02 13:31:11 +00:00
David Baker 6baf6af332
Merge pull request #1563 from matrix-org/luke/groups-room-info 
Implement simple GroupRoomInfo
 2017-11-02 11:10:43 +00:00
Luke Barnard e909d859ab
Merge branch 'develop' into luke/groups-room-info 2017-11-02 10:56:33 +00:00
Matthew Hodgson 815b42f0ac
Merge pull request #1565 from matrix-org/matthew/group-promise-npe 
turn NPE on flair resolution errors into a logged error
 2017-11-01 22:18:05 +00:00
Matthew Hodgson 7d7cd30e46 turn NPE on flair resolution errors into a logged error 2017-11-01 22:10:03 +00:00
David Baker 4f8d6d8fbe Pillify room notifs in the timeline 
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
 2017-11-01 19:42:47 +00:00
Luke Barnard 80f79e6b84 Generate translations 2017-11-01 17:58:45 +00:00
Luke Barnard acd1f31010
Merge pull request #1484 from pafcu/departify 
Less translation in parts
 2017-11-01 17:44:03 +00:00
Luke Barnard 64a369216a Implement simple GroupRoomInfo 
which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.
 2017-11-01 17:27:35 +00:00
Luke Barnard 0dcd52d88f Fix some react warnings firing 2017-11-01 17:12:22 +00:00
Stefan Parviainen e1e4fc2dac Make eslint happy 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-01 16:18:48 +01:00
Stefan Parviainen 15bafd6818 Convert from weblate to counterpart at runtime to make tests happy 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-01 15:55:58 +01:00
Stefan Parviainen d6f1e12bee Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-01 15:50:45 +01:00
Luke Barnard 44aea85792
Merge pull request #1562 from matrix-org/luke/redact-group-ids 
Redact group IDs from analytics
 2017-11-01 11:44:27 +00:00
Luke Barnard 047bf6e4dd Redact group IDs from analytics 2017-11-01 11:30:25 +00:00
David Baker 273aae207a
Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state 
Display whether the group summary/room list is loading
 2017-10-31 17:29:36 +00:00
Luke Barnard 16dca08b77 Use constants instead of string literals 2017-10-31 16:13:13 +00:00