matrix-org/matrix-react-sdk

Pull Requests Commits

Merge branch 'develop' into kegan/rageshake-ui

kegsay committed 9 years ago

602ce37b

Merge pull request #647 from matrix-org/rav/megolm_backup_ui

richvdh committed 9 years ago

dc7a1697

Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality

richvdh committed 9 years ago

9cadc2f5

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

richvdh committed 9 years ago

ebe6cddd

Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down

richvdh committed 9 years ago

69b55fd9

Merge pull request #645 from matrix-org/rav/base_dialog

richvdh committed 9 years ago

7343ef96

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

richvdh committed 9 years ago

adf8f50f

Re-add dispatcher as alt-up/down uses it

dbkr committed 9 years ago

b34f63d3

Do not show the bug report section if there is no bug_report_endpoint_url

kegsay committed 9 years ago

b00e0906

Merge pull request #648 from matrix-org/rav/fix_set_displayname

dbkr committed 9 years ago

e567162d

Fix _renderCommaSeparatedList

Luke Barnard committed 9 years ago

f9ca2a8e

Merge pull request #643 from matrix-org/luke/fix-typing-indication

dbkr committed 9 years ago

f66e412d

Luke Barnard committed 9 years ago

b887d5b8

Merge pull request #646 from matrix-org/matthew/password-reset-warning

dbkr committed 9 years ago

fc9987a8

A lot of linting

Luke Barnard committed 9 years ago

24e94787

Improve comment

Luke Barnard committed 9 years ago

d5edf263

Enumerate->label

Luke Barnard committed 9 years ago

8091cf7d

Rename truncated->coalesced

Luke Barnard committed 9 years ago

f8e46819

Document _getCanonicalTransitions

Luke Barnard committed 9 years ago

3b8b2cf5

Get rid of .only

Luke Barnard committed 9 years ago

e9719b17

Fix SetDisplayNameDialog

richvdh committed 9 years ago

29b4dde8

Fix a bunch of lint complaints

richvdh committed 9 years ago

770820e6

actually, move signout warning to UserSettings.js

ara4n committed 9 years ago

6a40abbb

actually, move signout warning to UserSettings.js

ara4n committed 9 years ago

6e55bb49

Implement Megolm key importing

richvdh committed 9 years ago

b85f53ca

Implement e2e export

richvdh committed 9 years ago

e23deac1

warn on logout too

ara4n committed 9 years ago

b148619c

warn users that changing/resetting password will nuke E2E keys

ara4n committed 9 years ago

5b61d005

Add AccessibleButton to component-index

richvdh committed 9 years ago

86276450

Merge branch 'develop' into rav/base_dialog

richvdh committed 9 years ago

79e11085

Older