matrix-org/matrix-react-sdk

Pull Requests Commits

Show anything other than ban/invite -> leave as a kick

t3chguy committed 6 years ago

8d4356a5

Update copy as per design

turt2live committed 6 years ago

2ca6633f

Don't refuse the soft logout page if the user is soft logged out

turt2live committed 6 years ago

041379fa

Support SSO for rehydrating a soft-logged-out session.

turt2live committed 6 years ago

1eb60ef1

Merge pull request #3190 from matrix-org/travis/soft-logout-design

turt2live committed 6 years ago

Verified 6cb148a8

Merge pull request #3189 from matrix-org/travis/soft-logout-overwrite

turt2live committed 6 years ago

Verified 4c5a7d47

Merge branch 'develop' into travis/soft-logout-design

turt2live committed 6 years ago

4b1d78e0

Merge branch 'develop' into travis/soft-logout-overwrite

turt2live committed 6 years ago

623b8007

Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs

turt2live committed 6 years ago

Verified a33e5f19

Merge pull request #3187 from matrix-org/travis/soft-logout-keys

turt2live committed 6 years ago

Verified 370fa27d

Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate

turt2live committed 6 years ago

Verified 7b869f28

Change highlight colour on dark theme

turt2live committed 6 years ago

2142826f

use originalEvent if present and append it to list

bwindels committed 6 years ago

11718a98

Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions

bwindels committed 6 years ago

Verified 31723e9e

Merge pull request #3193 from matrix-org/bwindels/replace-server-date

bwindels committed 6 years ago

Verified 7ab665bf

Don't try to call bodyToHtml with an empty content

bwindels committed 6 years ago

f0318719

Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches

t3chguy committed 6 years ago

Verified 349afb13

use method that also takes server aggregations into account for tooltip date

bwindels committed 6 years ago

58d7ed02

Also clear data when the deviceId doesn't match

turt2live committed 6 years ago

8ebc0370

Remove backwards compat function

turt2live committed 6 years ago

ab63e8bd

Move key backup init to componentDidMount

turt2live committed 6 years ago

d2ab0a5c

Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys

turt2live committed 6 years ago

3e0be640

Move _initLogin to componentDidMount

turt2live committed 6 years ago

c3383e93

Merge pull request #3192 from matrix-org/bwindels/preserve-reply-fallback-on-edit

bwindels committed 6 years ago

Verified cd803617

turn flag into options object

bwindels committed 6 years ago

f6e71b23

don't show reply fallback in edit history

bwindels committed 6 years ago

e601037c

preserve reply fallback when editing

bwindels committed 6 years ago

888e4d1e

Merge branch 'master' into develop

RiotRobot committed 6 years ago

0347c427

RiotRobot committed 6 years ago

61e2d871

Prepare changelog for v1.3.0

RiotRobot committed 6 years ago

6cafcf64

Newer Older