Commit Graph

9669 Commits (6bf1eb105a86edd43dfdffd06bf23ea727f24d2b)
 

Author SHA1 Message Date
Luke Barnard 6bf1eb105a
Merge pull request #1741 from matrix-org/t3chguy/m.relates_to 8 years ago
Michael Telatynski 4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling 8 years ago
Michael Telatynski f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 8 years ago
Luke Barnard 33e67a8f42
Merge pull request #1869 from matrix-org/dbkr/use_correct_js_sdk_branch 8 years ago
David Baker 9bccecf449 Get symlink right 8 years ago
David Baker 825d610938 Bah, no pushd. 8 years ago
David Baker c54198464b npm install the js-sdk 8 years ago
David Baker b44582777b Would if I added the script 8 years ago
David Baker 730512bc3f Use the right js-sdk branch when testing 8 years ago
David Baker 3d478c3c3a
Merge pull request #1867 from matrix-org/luke/fix-group-request-concurrency 8 years ago
Luke Barnard 2dfb3146b0 Simplify concurrent request error handling 8 years ago
Michael Telatynski ec4ec4717d
clean up EventTile:onWidgetLoad optional/required mess 8 years ago
Michael Telatynski db55f87699
avoid `.done` and `.then` anti-pattern 8 years ago
Luke Barnard 71c1198d12 Rewrite limitConcurrency to fix error catching 8 years ago
Michael Telatynski 11ae0805b0
re-order ReplyThread methods for readability 8 years ago
David Baker 1413890a9a
Merge pull request #1868 from matrix-org/luke/feature-refresh-group-rooms 8 years ago
Luke Barnard bd703b17e5 Update documentation for GroupStore.registerListener 8 years ago
Luke Barnard 56ec7713bb Refresh group rooms and members when selecting a tag 8 years ago
Luke Barnard 4d8394954c Only create one group store listener in RoomList 8 years ago
Luke Barnard da1a5616eb Prevent error responses wedging group request concurrency limit 8 years ago
Michael Telatynski f0bd4a54e7
Refactor tests to understand sendMessage instead of send{Text,Html}Message 8 years ago
Luke Barnard e3a07be127 Remove GroupStore logging 8 years ago
Luke Barnard 6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor 8 years ago
Luke Barnard 25690336c3 Prevent user getting trapped in group settings when an error occurs 8 years ago
Luke Barnard 38d7a5d394 Remove GroupStore listener when unmounting GroupPublicityToggle 8 years ago
Luke Barnard 28e8ce967f Correctly unregister group store listener when unmounting RoomList 8 years ago
Luke Barnard 023daef4b7 Refactor GroupStores into one global GroupStore 8 years ago
Michael Telatynski bbce6eea5b
update comment 8 years ago
Matthew Hodgson 5749fbcff9
Merge pull request #1864 from matrix-org/matthew/blob_urls 8 years ago
Luke Barnard 22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons 8 years ago
Luke Barnard 80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog 8 years ago
Eric Newport e037cf0063 namespace CSS better and fix bug 8 years ago
David Baker 5bacf50001
Merge pull request #1865 from matrix-org/matthew/image_errors 8 years ago
David Baker 025bffb4e9 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog 8 years ago
David Baker d743e6afe2 Merge branch 'dbkr/bug_report_dialog_basedialog' of github.com:matrix-org/matrix-react-sdk into dbkr/bug_report_dialog_basedialog 8 years ago
David Baker e28a927da9 lint 8 years ago
David Baker c3420c37fd Indentation 8 years ago
David Baker 54cccab0c7 Factor out clearStorageButton 8 years ago
David Baker 5d46efc3e8 Get docs right on hasCancel 8 years ago
David Baker dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux 8 years ago
David Baker a9b6db3f2e Lint 8 years ago
David Baker 37cb8abf13 Fix UX issues with bug report dialog 8 years ago
David Baker fc136607f1 UI fixes in SessionRestoreErrorDialog 8 years ago
Luke Barnard fba8a7d7d6
Merge pull request #1859 from matrix-org/dbkr/fix_session_restore_error_handling 8 years ago
Michael Telatynski 41af9f7a96
fix changed method name 8 years ago
Matthew Hodgson db5fc53853 final comment 8 years ago
Matthew Hodgson 45c0c0eddd add CSS destroyed by stickerpacks 8 years ago
Matthew Hodgson 8538cc1666 fix regressions introduced by 00b7cc512b 8 years ago
Matthew Hodgson be523b3edc lint 8 years ago
Matthew Hodgson 551d3ebda0 correctly fix up thumbnail height onload. 8 years ago