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
Luke Barnard
3b8b2cf500
Document _getCanonicalTransitions
2017-01-25 09:18:47 +00:00
Luke Barnard
e9719b1766
Get rid of .only
2017-01-25 09:12:29 +00:00
Richard van der Hoff
29b4dde878
Fix SetDisplayNameDialog
...
SetDisplayNameDialog got broken by the changes to support asynchronous loading
of dialogs.
Rather than poking into its internals via a ref, make it return its result via
onFinished.
Fixes https://github.com/vector-im/riot-web/issues/3047
2017-01-25 08:01:45 +00:00
Richard van der Hoff
10018374f8
Allow modals to stack up
...
Show the most recent modal; if we end up with more than one, just show the most
recent.
2017-01-25 07:44:33 +00:00
Richard van der Hoff
770820e6fa
Fix a bunch of lint complaints
2017-01-24 22:41:52 +00:00
Matthew Hodgson
6a40abbbf0
actually, move signout warning to UserSettings.js
...
also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152
2017-01-24 23:18:25 +01:00
Matthew Hodgson
6e55bb4956
actually, move signout warning to UserSettings.js
...
also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152
2017-01-24 23:15:00 +01:00
Richard van der Hoff
b85f53cadd
Implement Megolm key importing
2017-01-24 21:50:24 +00:00
Richard van der Hoff
e23deac1bb
Implement e2e export
2017-01-24 21:50:24 +00:00
Matthew Hodgson
b148619c52
warn on logout too
2017-01-24 22:47:03 +01:00
Matthew Hodgson
5b61d00533
warn users that changing/resetting password will nuke E2E keys
2017-01-24 22:36:55 +01:00
Richard van der Hoff
86276450f6
Add AccessibleButton to component-index
2017-01-24 21:27:57 +00:00
Richard van der Hoff
79e1108564
Merge branch 'develop' into rav/base_dialog
2017-01-24 21:03:08 +00:00
Richard van der Hoff
72492fd909
Fix broken merge
...
I messed up the merge in 6dd46d5
2017-01-24 20:55:10 +00:00
Richard van der Hoff
6dd46d532a
Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux
2017-01-24 20:47:24 +00:00
David Baker
6c263c1c89
Change what AddressTile takes to be Objects
...
Rather than just passing in a list of strings. This paves the way
for passing in display names & avatars of looked-up threepids.
2017-01-24 18:23:34 +00:00
Richard van der Hoff
56cf7a6af7
Create a common BaseDialog
...
I'm fed up with copying the boilerplate for modal dialogs the whole time.
2017-01-24 18:18:54 +00:00
Luke Barnard
a92fff9da7
Fix linting warnings
2017-01-24 17:18:56 +00:00
Luke Barnard
4186a769ca
Default prop for whoIsTypingLimit
2017-01-24 17:16:26 +00:00
Richard van der Hoff
55591f2019
Merge pull request #644 from matrix-org/kegan/rm-log-spam
...
Reduce log spam: Revert a16aeeef2a
2017-01-24 16:43:06 +00:00
Kegan Dougal
97387db014
Reduce log spam: Revert a16aeeef2a
...
As per #riot-dev, this is no longer required.
2017-01-24 16:40:26 +00:00
Luke Barnard
9a360a48d2
Use the same property to limit avatars
2017-01-24 16:04:37 +00:00
Luke Barnard
7c66d1c867
Sync typing indication with avatar typing indication
...
Follow the same rules for displaying "is typing" as with the typing avatars.
2017-01-24 16:01:39 +00:00
Kegan Dougal
5991172182
Review comments
2017-01-24 15:51:53 +00:00
Kegan Dougal
3b9a112136
Add bug report UI
2017-01-24 14:47:11 +00:00
