matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'new-guest-access' into luke/ilag-i18n

lukebarnard1 committed 8 years ago

4ab6dc9d

Merge pull request #1038 from matrix-org/dbkr/ilag_defer_create_room

dbkr committed 8 years ago

3553aea5

Defer an intention for creating a room

dbkr committed 8 years ago

5924654f

Add missing command

Luke Barnard committed 8 years ago

c690acc6

Merge pull request #1037 from matrix-org/dbkr/fix_create_room_button_ilag

lukebarnard1 committed 8 years ago

2030c188

Apply https://github.com/matrix-org/matrix-react-sdk/commit/9cae667c063e67b32e60b89e7256d714a056559b to ilag branch

dbkr committed 8 years ago

ad87e9bd

Add en_EN i18n strings for setMxIdDialog

Luke Barnard committed 8 years ago

9f6ab4a3

Merge branch 'develop' into luke/ilag-i18n

Luke Barnard committed 8 years ago

61983061

Revert "Call MatrixClient.clearStores on logout"

dbkr committed 8 years ago

c5cd6aec

_t for SetMxIdDialog

Luke Barnard committed 8 years ago

61253956

Merge pull request #1032 from matrix-org/luke/fix-welcome-user-background

dbkr committed 8 years ago

85aa3f6f

Update from Weblate. (#1030)

RiotTranslate committed 8 years ago

36218093

Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat-settings

dbkr committed 8 years ago

d8e34230

Only view welcome user if we are not looking at a room

Luke Barnard committed 8 years ago

c82e79ab

Merge pull request #1029 from matrix-org/luke/fix-multi-welcome-user

dbkr committed 8 years ago

cdd8cc41

Keep deferred actions for view_user_settings and view_create_chat

Luke Barnard committed 8 years ago

3195b9f9

Don't do a deferred start chat if user is welcome user

Luke Barnard committed 8 years ago

beafb685

Merge pull request #1028 from matrix-org/luke/fix-room-change-peek-spinner

lukebarnard1 committed 8 years ago

d72db5df

Introduce state `peekLoading` to avoid collision with `roomLoading`

Luke Barnard committed 8 years ago

239874cc

Update from Weblate. (#1026)

RiotTranslate committed 8 years ago

486a5bb5

Update from Weblate. (#1025)

RiotTranslate committed 8 years ago

28e8fac6

Update from Weblate. (#1024)

RiotTranslate committed 8 years ago

32f7cdaa

Update from Weblate. (#1023)

RiotTranslate committed 8 years ago

06f1f789

Update from Weblate. (#1020)

RiotTranslate committed 8 years ago

e3bf990e

strip most of the actual file path in the redacted url (#1022)

t3chguy committed 8 years ago

3411fabf

fix toAction i18n thinkos

ara4n committed 8 years ago

a9d516e8

Update from Weblate. (#1017)

RiotTranslate committed 8 years ago

9fdb3df9

Merge pull request #1016 from RiotTranslate/weblate-riot-web-matrix-react-sdk

ara4n committed 8 years ago

96a648af

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

RiotTranslate committed 8 years ago

fc5c2ec6

Translated using Weblate (Russian)

Studinsky committed 8 years ago

1ff8a9ac

Older