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
David Baker
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
Luke Barnard
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
Luke Barnard
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
Luke Barnard
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
David Baker
5091bab657
Fix failed merge #2
2017-01-24 13:59:02 +00:00
David Baker
5f24fc3e5d
Fix merge fail
2017-01-24 13:56:22 +00:00
Richard van der Hoff
c0de0870ed
Some sarcastic comments
2017-01-24 13:32:17 +00:00
Richard van der Hoff
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
David Baker
f1f6fc809c
Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback
2017-01-24 11:26:09 +00:00
David Baker
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
David Baker
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
David Baker
1e77b2eba3
Bundle eslint config
2017-01-23 16:19:29 +00:00
David Baker
94fdd2bcd2
lint all
2017-01-23 15:41:33 +00:00
Luke Barnard
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
Richard van der Hoff
7a445e05f8
Merge pull request #639 from matrix-org/dbkr/lint_config_mocha
...
Add mocha env for tests in eslint config
2017-01-23 14:51:41 +00:00
David Baker
4d12a65529
Add mocha env for tests in eslint config
2017-01-23 14:16:25 +00:00
David Baker
3cfa539230
Merge pull request #637 from matrix-org/luke/fix-typing-avatars-displays-me
...
Fix typing avatars displaying "me"
2017-01-23 12:43:34 +00:00
David Baker
3df686c272
Merge pull request #638 from matrix-org/rav/unbreak_verification
...
Fix device verification from e2e info
2017-01-23 12:33:25 +00:00
Richard van der Hoff
dc08d9dfdf
Fix device verification from e2e info
...
Don't attempt to reuse the same AsyncWrapper for different dialogs - which ends
up pushing the props for the new dialog into the old dialog.
Fixes https://github.com/vector-im/riot-web/issues/3020
2017-01-23 12:18:41 +00:00
David Baker
506d37bbad
Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users
2017-01-23 11:34:44 +00:00
David Baker
f64a4e0ecb
Merge pull request #623 from matrix-org/dbkr/user_search_word_boundary
...
Make user search do a bit better on word boundary
2017-01-23 11:31:26 +00:00
Luke Barnard
d97fc0a99a
Fix typing avatars displaying "me"
2017-01-23 10:25:33 +00:00
Matthew Hodgson
7bc3fc8696
make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020
2017-01-22 01:28:43 +01:00
Matthew Hodgson
d9c0513ee2
make it work
2017-01-21 22:49:29 +01:00
Matthew Hodgson
39c122fe4f
fix local storage idiocy
2017-01-21 22:27:55 +01:00
Matthew Hodgson
532f4e59c9
literally blindly add verification buttons
2017-01-21 19:06:15 +01:00
Matthew Hodgson
071e364be2
improve the verify warning if blacklisting is unabled
2017-01-21 17:56:48 +00:00
Matthew Hodgson
c618880af9
oops
2017-01-21 17:43:46 +00:00
Matthew Hodgson
3071fc0ddc
UI for blacklisting unverified devices per-room & globally
...
(written blind; untested as yet)
2017-01-21 17:39:39 +00:00
Matthew Hodgson
2e15e8f9b4
very barebones support for warning users when rooms contain unknown devices
2017-01-21 05:13:36 +00:00
Matthew Hodgson
937f13d578
fix a bunch of dark-theme buttons
2017-01-20 21:00:22 +00:00
Luke Barnard
0c5762b91d
Implement "someone is typing" avatars ( #631 )
...
When users are typing, their avatars can be seen instead of "..." in the RoomView StatusBar
2017-01-20 17:51:35 +01:00
Richard van der Hoff
f1bb07729f
Merge pull request #634 from matrix-org/dbkr/use_js_sdk_eslint
...
Use an eslint config based on the js-sdk
2017-01-20 15:18:58 +00:00
David Baker
18d4d3392a
Fix a bunch of linting errors
...
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
David Baker
4ba224aac3
Use eslint config from the js sdk
...
Extend the js sdk's eslint config to give as consistent a code
style as possible. Add react/jsx/flow stuff that we use here.
2017-01-20 14:08:14 +00:00
Richard van der Hoff
a16aeeef2a
Temporarily add more logging, to try to catch failures on travis
2017-01-20 13:06:06 +00:00
David Baker
7351223fd4
Merge pull request #633 from matrix-org/rav/fix_deactivate_error
...
Fix error display in account deactivate dialog
2017-01-20 11:29:56 +00:00
Richard van der Hoff
2d060c8d2e
Fix error display in account deactivate dialog
2017-01-20 11:04:47 +00:00
Matthew Hodgson
b76b0f755d
fix context menu bg
2017-01-20 02:47:47 +00:00
Richard van der Hoff
16d8e8e681
Merge pull request #629 from matrix-org/rav/test_riot_after_build
...
Configure travis to test riot-web after building
2017-01-19 18:40:13 +00:00
Richard van der Hoff
33d741e83d
Do riot-web setup in a different order
...
... in an effort to stop npm cocking it up.
2017-01-19 18:24:28 +00:00
David Baker
bd0706f103
Merge pull request #626 from matrix-org/dbkr/sanitize_chatinvitedialog
...
Sanitize ChatInviteDialog
2017-01-19 18:23:36 +00:00
David Baker
afa384c4f3
Use null instead of false
2017-01-19 18:13:27 +00:00
