matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into dbkr/group_userlist

Luke Barnard committed 8 years ago

e9fb5712

Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined

dbkr committed 8 years ago

658285eb

Clarify comment

dbkr committed 8 years ago

4d8eadad

Merge pull request #1398 from matrix-org/luke/fix-ugly-manage-integs-button

dbkr committed 8 years ago

0958689d

Only show the integ management button if user is joined

Luke Barnard committed 8 years ago

caaf5cca

Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget

ara4n committed 8 years ago

09e6ea00

Merge pull request #1268 from matrix-org/t3chguy/devtools

ara4n committed 8 years ago

678a6c56

Merge pull request #1359 from rponline/master

ara4n committed 8 years ago

b93f1746

Merge pull request #1387 from turt2live/travis/tooltip_redacter

ara4n committed 8 years ago

141ae916

Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded

ara4n committed 8 years ago

b06d540f

Merge pull request #1389 from turt2live/travis/ignored_users

ara4n committed 8 years ago

6a53b7b1

Update ignored users when js-sdk on UserSettings on change

turt2live committed 8 years ago

2605004e

ara4n committed 8 years ago

9e77d1b7

Merge pull request #1392 from turt2live/travis/no_emoji

ara4n committed 8 years ago

bc565ba9

Merge pull request #1397 from matrix-org/t3chguy/i18n-1

ara4n committed 8 years ago

94498132

remove unused strings since base branch

t3chguy committed 8 years ago

2d6bbafc

add missing comma

t3chguy committed 8 years ago

e565882b

PL grew the missing string since my base branch so do for that too

t3chguy committed 8 years ago

342e1021

Merge branches 'develop' and 't3chguy/i18n-1' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n-1

t3chguy committed 8 years ago

63ccc455

remove redundant new line

t3chguy committed 8 years ago

bc4bb6cc

sanitize the i18n for fn:textForHistoryVisibilityEvent

t3chguy committed 8 years ago

ce2cdf3f

Merge pull request #1394 from matrix-org/dbkr/emoji_more_fast_path

ara4n committed 8 years ago

5bf8c1e9

Merge pull request #1393 from matrix-org/dbkr/fix_symbol_emojification

ara4n committed 8 years ago

13bfa5d5

Force rebuild again with new riot-web branch

dbkr committed 8 years ago

59ee401f

empty commit to force travis retest

dbkr committed 8 years ago

6e06b3a2

Fix RoomView stuck in 'accept invite' state

dbkr committed 8 years ago

c265ec95

Merge pull request #1395 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk

dbkr committed 8 years ago

fd1f9ac1

Don't check for only-emoji if there were none

dbkr committed 8 years ago

bfedcd1f

Fix emojification of symbol characters

dbkr committed 8 years ago

803e8f93

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

Weblate committed 8 years ago

c24804ea

Older