9020a7515c
Correctly bail out on unknown address
2017-01-25 14:50:00 +00:00
b00e090600
Do not show the bug report section if there is no bug_report_endpoint_url
2017-01-25 14:43:47 +00:00
e567162d28
Merge pull request #648 from matrix-org/rav/fix_set_displayname
...
Fix SetDisplayNameDialog
2017-01-25 14:32:52 +00:00
f9ca2a8e59
Fix _renderCommaSeparatedList
2017-01-25 11:28:12 +00:00
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
b887d5b823
Much linting
2017-01-25 11:05:45 +00:00
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
24e94787dd
A lot of linting
2017-01-25 10:52:55 +00:00
d5edf26371
Improve comment
2017-01-25 10:39:39 +00:00
8091cf7df8
Enumerate->label
2017-01-25 09:32:28 +00:00
f8e46819c5
Rename truncated->coalesced
2017-01-25 09:28:26 +00:00
3b8b2cf500
Document _getCanonicalTransitions
2017-01-25 09:18:47 +00:00
e9719b1766
Get rid of .only
2017-01-25 09:12:29 +00:00
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
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
770820e6fa
Fix a bunch of lint complaints
2017-01-24 22:41:52 +00:00
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
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
b85f53cadd
Implement Megolm key importing
2017-01-24 21:50:24 +00:00
e23deac1bb
Implement e2e export
2017-01-24 21:50:24 +00:00
b148619c52
warn on logout too
2017-01-24 22:47:03 +01:00
5b61d00533
warn users that changing/resetting password will nuke E2E keys
2017-01-24 22:36:55 +01:00
86276450f6
Add AccessibleButton to component-index
2017-01-24 21:27:57 +00:00
79e1108564
Merge branch 'develop' into rav/base_dialog
2017-01-24 21:03:08 +00:00
72492fd909
Fix broken merge
...
I messed up the merge in 6dd46d5
2017-01-24 20:55:10 +00:00
6dd46d532a
Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux
2017-01-24 20:47:24 +00:00
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
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
a92fff9da7
Fix linting warnings
2017-01-24 17:18:56 +00:00
4186a769ca
Default prop for whoIsTypingLimit
2017-01-24 17:16:26 +00:00
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
97387db014
Reduce log spam: Revert a16aeeef2a
...
As per #riot-dev, this is no longer required.
2017-01-24 16:40:26 +00:00
9a360a48d2
Use the same property to limit avatars
2017-01-24 16:04:37 +00:00
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
5991172182
Review comments
2017-01-24 15:51:53 +00:00
3b9a112136
Add bug report UI
2017-01-24 14:47:11 +00:00
91a052f817
Merge pull request #641 from matrix-org/luke/fix-statusbar-hidden
...
Expand timeline in situations when _getIndicator not null
2017-01-24 14:43:46 +00:00
ce7434984b
Expand timeline in situations when _getIndicator not null
...
The status bar will now be expanded when:
- props.numUnreadMessages
- !props.atEndOfLiveTimeline
- props.hasActiveCall
2017-01-24 14:32:52 +00:00
bd106968ce
Merge branch 'develop' into luke/fix-join-part-collapsing-causality
...
Conflicts:
src/components/structures/MessagePanel.js
2017-01-24 14:22:18 +00:00
d690677bde
Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality
...
Conflicts:
src/components/views/elements/MemberEventListSummary.js
2017-01-24 14:17:11 +00:00
5091bab657
Fix failed merge #2
2017-01-24 13:59:02 +00:00
5f24fc3e5d
Fix merge fail
2017-01-24 13:56:22 +00:00
c0de0870ed
Some sarcastic comments
2017-01-24 13:32:17 +00:00
e18a6151e4
Merge pull request #640 from matrix-org/dbkr/eslint_find_extend_module
...
Correctly get the path of the js-sdk .eslintrc.js
2017-01-24 11:34:28 +00:00
f1f6fc809c
Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback
2017-01-24 11:26:09 +00:00
c47d3e04a5
Merge pull request #621 from matrix-org/dbkr/add_searching_known_users
...
Add 'searching known users' to the user picker
2017-01-24 10:51:23 +00:00
905508f1ce
Correctly get the path of the js-sdk .eslintrc.js
...
So we work correctly when we're included in another module
2017-01-23 17:33:09 +00:00
1e77b2eba3
Bundle eslint config
2017-01-23 16:19:29 +00:00
94fdd2bcd2
lint all
2017-01-23 15:41:33 +00:00
a06ecb87bc
Hide RoomStatusBar when it displays nothing ( #615 )
...
Use CSS class `mx_RoomView_statusArea_expanded` to indicate an expanded status bar. Without this, the status bar may be hidden from view. A 10s debounce will prevent it from bouncing frequently.
2017-01-23 16:01:39 +01:00
David Baker