David Baker
|
853d94e2d4
|
Merge pull request #656 from matrix-org/luke/fix-setState-warnings-from-RoomView
Guard onStatusBarVisible/Hidden with this.unmounted
|
2017-01-26 18:06:41 +00:00 |
|
Luke Barnard
|
9c99dafba5
|
Guard onStatusBarVisible/Hidden with this.unmounted
|
2017-01-26 17:03:01 +00:00 |
|
Richard van der Hoff
|
2c7b3d9a02
|
UnknownDeviceDialog: Reword the warning
|
2017-01-26 14:55:58 +00:00 |
|
Richard van der Hoff
|
0a3d9fc17f
|
Fix lint
|
2017-01-26 14:12:00 +00:00 |
|
Richard van der Hoff
|
67bd2cf9dd
|
Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified
|
2017-01-26 14:09:25 +00:00 |
|
David Baker
|
f06de1f129
|
Merge pull request #654 from matrix-org/rav/fix_e2e_dialog_cancel
Fix cancel button on e2e import/export dialogs
|
2017-01-26 11:41:30 +00:00 |
|
David Baker
|
e2edecc55b
|
Merge pull request #653 from matrix-org/dbkr/invite_look_up_emails
Look up email addresses in ChatInviteDialog
|
2017-01-26 11:35:06 +00:00 |
|
David Baker
|
c42b705497
|
Use a cancel function
rather than checking queryList each time
|
2017-01-26 10:54:07 +00:00 |
|
David Baker
|
23a25e550d
|
Missed a function
|
2017-01-26 10:09:33 +00:00 |
|
David Baker
|
bf66f77acb
|
Set state in _lookupThreepid
|
2017-01-26 10:08:44 +00:00 |
|
Richard van der Hoff
|
60d7575146
|
Merge branch 'matthew/warn-unknown-devices' of github.com:matrix-org/matrix-react-sdk into matthew/warn-unknown-devices
|
2017-01-25 23:17:57 +00:00 |
|
Matthew Hodgson
|
ebf6ba8994
|
explicitly set device known-ness
|
2017-01-25 23:52:56 +01:00 |
|
Richard van der Hoff
|
70190be65c
|
Factor out common onSendMessageFailed
|
2017-01-25 22:23:21 +00:00 |
|
Richard van der Hoff
|
5da6ca8fc1
|
Refactor UnknownDeviceDialog
hopefully make this a bit more readable, and use our new BaseDialog.
|
2017-01-25 22:23:21 +00:00 |
|
Richard van der Hoff
|
5538ce7c30
|
Merge branch 'develop' into matthew/warn-unknown-devices
|
2017-01-25 22:22:50 +00:00 |
|
Richard van der Hoff
|
81d95ecea0
|
Fix cancel button on e2e import/export dialogs
Make sure that we preventDefault on the cancel button.
Fixes https://github.com/vector-im/riot-web/issues/3066
|
2017-01-25 22:15:09 +00:00 |
|
David Baker
|
e1e87807b5
|
Look up email addresses in ChatInviteDialog
So email addresses known to the IS get a display name & avatar
|
2017-01-25 18:51:28 +00:00 |
|
Kegsay
|
c3616fd208
|
Merge pull request #652 from matrix-org/kegan/rageshake-glue
Move BugReportDialog to riot-web
|
2017-01-25 17:20:43 +00:00 |
|
David Baker
|
12642bdf2b
|
Merge pull request #651 from matrix-org/rav/roomheader_theming_fix
Fix dark theme styling of roomheader cancel button
|
2017-01-25 17:02:07 +00:00 |
|
David Baker
|
8a5e19f64f
|
Merge pull request #649 from matrix-org/rav/stack_dialogs
Allow modals to stack up
|
2017-01-25 16:45:50 +00:00 |
|
Richard van der Hoff
|
a2dd1fa0a9
|
Merge branch 'develop' into matthew/warn-unknown-devices
|
2017-01-25 16:44:03 +00:00 |
|
Richard van der Hoff
|
21f3aeac8e
|
Revert accidental change
This was an unrelated change which is being done on another branch anyway
|
2017-01-25 16:40:27 +00:00 |
|
Kegan Dougal
|
e9de34ec40
|
We no longer supply a BugReportDialog
|
2017-01-25 16:35:16 +00:00 |
|
Richard van der Hoff
|
5099f07562
|
Fix dark theme styling of roomheader cancel button
|
2017-01-25 16:33:29 +00:00 |
|
Kegan Dougal
|
bea6df88e0
|
Move BugReportDialog to riot-web
|
2017-01-25 16:33:00 +00:00 |
|
Richard van der Hoff
|
55dc2e0161
|
Factor out common CancelButton
|
2017-01-25 16:32:06 +00:00 |
|
Kegsay
|
e5fde759e6
|
Merge pull request #642 from matrix-org/kegan/rageshake-ui
Add bug report UI
|
2017-01-25 16:03:22 +00:00 |
|
David Baker
|
a3b938427d
|
Merge pull request #625 from matrix-org/dbkr/user_search_feedback
Better feedback in invite dialog
|
2017-01-25 15:59:47 +00:00 |
|
Kegan Dougal
|
602ce37ba7
|
Merge branch 'develop' into kegan/rageshake-ui
|
2017-01-25 15:52:00 +00:00 |
|
Richard van der Hoff
|
dc7a169779
|
Merge pull request #647 from matrix-org/rav/megolm_backup_ui
Import and export for Megolm session data
|
2017-01-25 15:43:15 +00:00 |
|
David Baker
|
ced1c45a34
|
Doc state in getinitialstate
|
2017-01-25 15:23:50 +00:00 |
|
Richard van der Hoff
|
9cadc2f55f
|
Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality
Overhaul MELS to deal with causality, kicks, etc.
|
2017-01-25 15:20:30 +00:00 |
|
Richard van der Hoff
|
ebe6cddd21
|
Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui
|
2017-01-25 15:13:14 +00:00 |
|
Richard van der Hoff
|
69b55fd9d1
|
Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down
Re-add dispatcher as alt-up/down uses it
|
2017-01-25 15:10:56 +00:00 |
|
Richard van der Hoff
|
7343ef968e
|
Merge pull request #645 from matrix-org/rav/base_dialog
Create a common BaseDialog
|
2017-01-25 15:09:34 +00:00 |
|
David Baker
|
e9804086ca
|
Point to InviteAddressType
|
2017-01-25 15:03:01 +00:00 |
|
Richard van der Hoff
|
adf8f50f6e
|
Merge remote-tracking branch 'origin/develop' into rav/base_dialog
|
2017-01-25 15:01:11 +00:00 |
|
David Baker
|
b34f63d3e7
|
Re-add dispatcher as alt-up/down uses it
Alt-up/down still doesn't go through rooms in the right order,
but it should probably not error.
|
2017-01-25 14:59:18 +00:00 |
|
David Baker
|
fd8d5af63a
|
Fix import of InviteAddressType
and rewrite to import while we're at it
|
2017-01-25 14:54:21 +00:00 |
|
David Baker
|
9020a7515c
|
Correctly bail out on unknown address
|
2017-01-25 14:50:00 +00:00 |
|
Kegan Dougal
|
b00e090600
|
Do not show the bug report section if there is no bug_report_endpoint_url
|
2017-01-25 14:43:47 +00:00 |
|
David Baker
|
e567162d28
|
Merge pull request #648 from matrix-org/rav/fix_set_displayname
Fix SetDisplayNameDialog
|
2017-01-25 14:32:52 +00:00 |
|
Luke Barnard
|
f9ca2a8e59
|
Fix _renderCommaSeparatedList
|
2017-01-25 11:28:12 +00:00 |
|
David Baker
|
f66e412d3a
|
Merge pull request #643 from matrix-org/luke/fix-typing-indication
Sync typing indication with avatar typing indication
|
2017-01-25 11:13:55 +00:00 |
|
Luke Barnard
|
b887d5b823
|
Much linting
|
2017-01-25 11:05:45 +00:00 |
|
David Baker
|
fc9987a827
|
Merge pull request #646 from matrix-org/matthew/password-reset-warning
Warn users of E2E key loss when changing/resetting passwords or logging out
|
2017-01-25 11:04:35 +00:00 |
|
Luke Barnard
|
24e94787dd
|
A lot of linting
|
2017-01-25 10:52:55 +00:00 |
|
Luke Barnard
|
d5edf26371
|
Improve comment
|
2017-01-25 10:39:39 +00:00 |
|
Luke Barnard
|
8091cf7df8
|
Enumerate->label
|
2017-01-25 09:32:28 +00:00 |
|
Luke Barnard
|
f8e46819c5
|
Rename truncated->coalesced
|
2017-01-25 09:28:26 +00:00 |
|