matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into luke/fix-rte-inline-code-format

lukebarnard1 committed 8 years ago

29b6d70a

Merge pull request #1227 from matrix-org/luke/feature-matrixto-timeline-pills

lukebarnard1 committed 8 years ago

d179398c

Merge pull request #1232 from matrix-org/luke/fix-rte-backspace-unstyled-block

lukebarnard1 committed 8 years ago

75ca141c

Merge pull request #1231 from matrix-org/luke/fix-rte-duplicate-autocompletions

richvdh committed 8 years ago

8d7ff127

Don't truncate EmojiProvider completion pills

Luke Barnard committed 8 years ago

c8722292

Mimic ctrl+j of RT mode in MD mode

Luke Barnard committed 8 years ago

28c98d93

Interpret backspace at start of style block as block style toggle

Luke Barnard committed 8 years ago

98ca937f

Use _uniq instead of _sortedUniq for return unique matched results

Luke Barnard committed 8 years ago

b185f43d

Merge pull request #1230 from matrix-org/dbkr/fix_multi_invite

dbkr committed 8 years ago

b9dfaf77

Remove other promise notify

dbkr committed 8 years ago

7cfef04c

Fix inviting multiple people to a room

dbkr committed 8 years ago

b261c89a

Expand groups into variables with readable names

Luke Barnard committed 8 years ago

d207ee52

Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill

Luke Barnard committed 8 years ago

b1e3dc40

Remove redundant, unused decorators from RTE

Luke Barnard committed 8 years ago

31290f33

Merge pull request #1225 from matrix-org/luke/feature-rte-pills

lukebarnard1 committed 8 years ago

ee511752

Merge pull request #1224 from matrix-org/rav/upload_progress

dbkr committed 8 years ago

3aed1a62

Decorate http://matrix.to links in the composer as pills

Luke Barnard committed 8 years ago

43466016

Fix file uploading

richvdh committed 8 years ago

ad085a62

Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage

richvdh committed 8 years ago

2a52c902

Fix RoomSettings save

richvdh committed 8 years ago

9df1fb91

Hook up the edit widget button (#1218)

kegsay committed 8 years ago

5274cf59

Merge pull request #1222 from matrix-org/luke/fix-rte-allow-split-code-block

lukebarnard1 committed 8 years ago

1db2431c

Add code-block to the list of blocks where hitting return will split-block

Luke Barnard committed 8 years ago

219c00bb

Merge pull request #1219 from matrix-org/luke/fix-autcompleter-promises

lukebarnard1 committed 8 years ago

7945abe6

Merge pull request #1221 from matrix-org/luke/feature-rte-autoemoji

lukebarnard1 committed 8 years ago

33df4faf

Async functions now return `bluebird` promises, remove redundant Promise.resolve

Luke Barnard committed 8 years ago

dcc4db53

Merge branch 'develop' into luke/fix-autcompleter-promises

Luke Barnard committed 8 years ago

c47398e7

Merge pull request #1220 from matrix-org/rav/async_to_bluebird

lukebarnard1 committed 8 years ago

5a701d3b

Implement disabled-by-default setting for auto-replacement of plaintext emojis

Luke Barnard committed 8 years ago

d97de4d5

Do `reflect` in the same `map`

Luke Barnard committed 8 years ago

f78a49b3

Older