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
597705716b
Hopefully, fix intermittent test failure
...
This seeks to fix the intermittent failure of the "MatrixClient rehydrated from
stored credentials" tests.
The problem appears to be that the 'load_completed' is sometimes taking a while
to come through from the dispatcher - or rather, it is taking a long time to
get *sent* to the dispatcher: the chain of `q().then().catch().done()` in
componentDidMount can take a while to happen.
As a workaround, give the test a few goes when waiting for us to start
syncing. It's not ideal to be poking into the internal state of MatrixChat like
this, but it'll do for now.
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
6db5329d9c
Merge pull request #2971 from vector-im/dbkr/add_searching_known_users
...
CSS for 'searching known users'
2017-01-24 10:51:13 +00:00
ea82b90d35
Merge pull request #2981 from vector-im/luke/feature-animated-status-bar
...
Animate status bar max-height and margin-top
2017-01-23 23:08:23 +00:00
706ffbec3c
add riot logos
2017-01-23 19:01:35 +01:00
f3df86872b
Fix tightlooping when flush()ing without any logs
...
The promise would resolve immediately, nulling out `flushPromise`. This would
then immediately be set from `new Promise((resolve, reject) => {...})` turning
it back into non-null `flushPromise`. The resolve handler was called so the
next `flush()` would see "oh yes, there is a non-null `flushPromise`" then
promptly try to set `flushAgainPromise` which chains off the resolved
`flushPromise` which relied on `flushPromise` being `null`ed out after
`resolve()`, causing the chained `flush()` to see "oh yes, there is a non-null
`flushPromise`" which... ad infinitum.
This PR fixes it by making the nulling out asynchronous but the fact it took
me this long to debug this issue indicates to me that this is a terrible piece
of code. Will re-write.
2017-01-23 17:37:57 +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
4c3ea13413
Make jenkins run the linter
2017-01-23 15:42:50 +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
c31b65d093
Merge pull request #3032 from vector-im/dbkr/add_eslint_config
...
Add eslint config
2017-01-23 14:57:39 +00:00
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
bc714ba3a0
Add eslint config
...
An early start that gets some linting in place.
2017-01-23 14:22:54 +00:00
4d12a65529
Add mocha env for tests in eslint config
2017-01-23 14:16:25 +00:00
b7204bf868
Use primary bg color on statusArea
2017-01-23 13:33:39 +00:00
c4d246cd72
Merge branch 'develop' into luke/feature-animated-status-bar
2017-01-23 13:31:48 +00:00
b582cf0a5f
Remove CSS for StatusBar mid-timeline
2017-01-23 13:30:39 +00:00
f025afc297
Merge pull request #3030 from vector-im/luke/fix-typing-avatars-alignment
...
Re-position typing avatars relative to "is typing"
2017-01-23 12:44:47 +00:00
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
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
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
506d37bbad
Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users
2017-01-23 11:34:44 +00:00
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
d97fc0a99a
Fix typing avatars displaying "me"
2017-01-23 10:25:33 +00:00
57126efe86
Reposition typing avatars relative to "is typing"
2017-01-23 10:24:23 +00:00
2ecf65f057
Keep the logs if no store exists
2017-01-23 09:28:48 +00:00
7bc3fc8696
make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020
2017-01-22 01:28:43 +01:00
d907421ad4
crappy CSS for UnknownDeviceDialog
2017-01-22 01:25:32 +01:00
d9c0513ee2
make it work
2017-01-21 22:49:29 +01:00
39c122fe4f
fix local storage idiocy
2017-01-21 22:27:55 +01:00
532f4e59c9
literally blindly add verification buttons
2017-01-21 19:06:15 +01:00
071e364be2
improve the verify warning if blacklisting is unabled
2017-01-21 17:56:48 +00:00
c618880af9
oops
2017-01-21 17:43:46 +00:00
3071fc0ddc
UI for blacklisting unverified devices per-room & globally
...
(written blind; untested as yet)
2017-01-21 17:39:39 +00:00
2e15e8f9b4
very barebones support for warning users when rooms contain unknown devices
2017-01-21 05:13:36 +00:00
ef519231d6
fix mute button colors
2017-01-20 21:16:58 +00:00
83272f5cc5
fix badge color again
2017-01-20 21:11:28 +00:00
5b1fea46cb
fix badge color
2017-01-20 21:09:49 +00:00
a9c575b4d0
fix a bunch of dark-theme buttons
2017-01-20 21:00:33 +00:00
937f13d578
fix a bunch of dark-theme buttons
2017-01-20 21:00:22 +00:00
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
a24b568b73
Merge pull request #2998 from vector-im/luke/css-typing-avatars
...
CSS for avatars that appear when users are typing
2017-01-20 17:43:36 +01:00
afcf9de8d4
Handle avatars with initials
2017-01-20 17:35:01 +01:00
9ffedf5e7d
space after colons
2017-01-20 17:00:59 +01:00
956deca844
Add bg-color border to typing avatars
2017-01-20 16:59:41 +01:00
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
ea063ab8b0
Address race conditions when flushing logs
2017-01-20 14:46:19 +00:00
Richard van der Hoff
David Baker
Richard van der Hoff
David Baker
Luke Barnard
Matthew Hodgson
Kegan Dougal
Luke Barnard
lukebarnard