matrix-org/matrix-react-sdk

Pull Requests Commits

dbkr committed 8 years ago

86e717f3

dbkr committed 8 years ago

1e713557

Merge pull request #1197 from matrix-org/dbkr/my_groups_withMatrixClient

lukebarnard1 committed 8 years ago

b420a838

WithMatrixClient -> withMatrixClient

dbkr committed 8 years ago

bc8c2d44

dbkr committed 8 years ago

fea0a941

dbkr committed 8 years ago

3b439d4b

Fix lint errors

dbkr committed 8 years ago

183f45bc

Merge remote-tracking branch 'origin/develop' into dbkr/my_groups

dbkr committed 8 years ago

45986306

Merge pull request #1148 from matrix-org/erikj/group_server

dbkr committed 8 years ago

28c0daf5

dbkr committed 8 years ago

8df6deee

dbkr committed 8 years ago

1deb4062

Merge branch 'develop' into erikj/group_server

lukebarnard1 committed 8 years ago

32a01b54

Merge pull request #1195 from matrix-org/luke/fix-rte-emoji-suggestions2

lukebarnard1 committed 8 years ago

7fdbec40

Alter EMOJI_REGEX to include end of string ($)

Luke Barnard committed 8 years ago

0a4f8ffe

Merge pull request #1193 from matrix-org/luke/fix-create-room-preview

dbkr committed 8 years ago

282b63d0

Fix vector-im/riot-web#4526 by pretending to join

Luke Barnard committed 8 years ago

a9210594

Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u

lukebarnard1 committed 8 years ago

6404f760

Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on

lukebarnard1 committed 8 years ago

d9a67355

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u

t3chguy committed 8 years ago

ff7ae5b9

Merge pull request #1191 from matrix-org/t3chguy/room-settings-unban-no-pl

lukebarnard1 committed 8 years ago

2aa5a3a0

Allow underline through MD and in RTE (MD) using <u> which works with CM

t3chguy committed 8 years ago

fcd8321a

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl

t3chguy committed 8 years ago

6149b372

only show unban button in RoomSettings if user has sufficient PL to do so

t3chguy committed 8 years ago

c6d9ec42

Only insert HTML into the composer in RTE mode

Luke Barnard committed 8 years ago

bdefb35c

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop

Luke Barnard committed 8 years ago

3e93930d

Remove RTE content_state logging

Luke Barnard committed 8 years ago

6b6af3f1

Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key

richvdh committed 8 years ago

c2986336

mention preserving ordering in comment

richvdh committed 8 years ago

4f8d9d86

kegsay committed 8 years ago

42ba3ff4

Fix a React duplicate key error

richvdh committed 8 years ago

6a2d6b2e

Older