matrix-org/matrix-react-sdk

Pull Requests Commits

Put related groups UI behind groups labs flag

Luke Barnard committed 8 years ago

ed74ac39

Merge pull request #1447 from matrix-org/luke/feature-flair-related-only

lukebarnard1 committed 8 years ago

a400c037

Merge pull request #1446 from matrix-org/luke/feature-related-groups-ui

lukebarnard1 committed 8 years ago

54ba1648

Remove commented imports

Luke Barnard committed 8 years ago

0c6b5776

Remove constraint on groups being local, remove logging

Luke Barnard committed 8 years ago

02e72871

Restrict Flair in the timeline to related groups of the room

Luke Barnard committed 8 years ago

8d46b199

Merge pull request #1445 from matrix-org/luke/fix-editable-item-list

lukebarnard1 committed 8 years ago

9f39a151

Implement UI for editing related groups of a room

Luke Barnard committed 8 years ago

7be5e685

Fix a couple of bugs with EditableItemList

Luke Barnard committed 8 years ago

9e395486

Merge pull request #1444 from matrix-org/luke/refactor-editable-list-from-alias-settings

lukebarnard1 committed 8 years ago

1938a767

Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings

lukebarnard1 committed 8 years ago

28b8582b

Maintain "blur to add" function to match previous UX

Luke Barnard committed 8 years ago

4e9694be

Luke Barnard committed 8 years ago

407a632a

Remove cruft from EIL

Luke Barnard committed 8 years ago

d25ebfb8

Merge pull request #1421 from pafcu/develop

lukebarnard1 committed 8 years ago

011aadcb

Factor out EditableItemList from AliasSettings

Luke Barnard committed 8 years ago

8243c39d

Merge pull request #1438 from matrix-org/luke/groups-remove-room

lukebarnard1 committed 8 years ago

03581adf

Add confirmation dialog for removing room from group

Luke Barnard committed 8 years ago

6b834bc7

Log the error when failing to removie room from group

Luke Barnard committed 8 years ago

0116c4b4

Add error dialog for when removing room fails

Luke Barnard committed 8 years ago

3e34a460

Fix merge conflict

pafcu committed 8 years ago

a96169e8

Merge pull request #1443 from matrix-org/dbkr/fix_3pid_invites

lukebarnard1 committed 8 years ago

8d189cc3

Fix showing 3pid invites in member list

dbkr committed 8 years ago

b202601d

Implement button to remove a room from a group

Luke Barnard committed 8 years ago

955ca6cd

Merge pull request #1435 from matrix-org/luke/groups-button

lukebarnard1 committed 8 years ago

0a536308

Luke Barnard committed 8 years ago

c8b21581

Rename Flair feature to Groups

Luke Barnard committed 8 years ago

18e0d8da

Merge branch 'develop' into luke/groups-button

lukebarnard1 committed 8 years ago

739ddb84

Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing

lukebarnard1 committed 8 years ago

6a988a0d

Update travis script to use lintwithexclusions

Luke Barnard committed 8 years ago

07b6040c

Older