matrix-org/matrix-react-sdk

Pull Requests Commits

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

Merge pull request #1437 from matrix-org/lukebarnard1-patch-fix-inviting

lukebarnard1 committed 8 years ago

f3d155b6

Merge branch 'luke/lint-jsx-curly-spacing' of github.com:matrix-org/matrix-react-sdk into luke/lint-jsx-curly-spacing

Luke Barnard committed 8 years ago

010b8d8b

Add rule to enforce spacing in curly brackets in JSX children

Luke Barnard committed 8 years ago

6b9a2909

Fix ability to invite existing mx users

lukebarnard1 committed 8 years ago

3c99b2af

Add rule to enforce JSX tag spacing

Luke Barnard committed 8 years ago

e70336af

Merge pull request #1434 from matrix-org/luke/fix-address-picker-error-message

lukebarnard1 committed 8 years ago

1699c37f

Add eslint rule to disallow spaces inside of curly braces

Luke Barnard committed 8 years ago

6eedf8b0

Remove "You have entered an invalid contact..." from translations

Luke Barnard committed 8 years ago

e9cf25f9

Construct address picker message using provided `validAddressTypes`

Luke Barnard committed 8 years ago

38fdd155

Add eslint rule to disallow spaces inside of curly braces

Luke Barnard committed 8 years ago

c7728bd9

Older