Commit Graph

62531 Commits

Author SHA1 Message Date
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 bc714ba3a0 Add eslint config
An early start that gets some linting in place.
2017-01-23 14:22:54 +00:00
David Baker 4d12a65529 Add mocha env for tests in eslint config 2017-01-23 14:16:25 +00:00
Luke Barnard b7204bf868 Use primary bg color on statusArea 2017-01-23 13:33:39 +00:00
Luke Barnard c4d246cd72 Merge branch 'develop' into luke/feature-animated-status-bar 2017-01-23 13:31:48 +00:00
Luke Barnard b582cf0a5f Remove CSS for StatusBar mid-timeline 2017-01-23 13:30:39 +00:00
David Baker 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
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
Luke Barnard 57126efe86 Reposition typing avatars relative to "is typing" 2017-01-23 10:24:23 +00:00
Kegan Dougal 2ecf65f057 Keep the logs if no store exists 2017-01-23 09:28:48 +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 d907421ad4 crappy CSS for UnknownDeviceDialog 2017-01-22 01:25:32 +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 ef519231d6 fix mute button colors 2017-01-20 21:16:58 +00:00
Matthew Hodgson 83272f5cc5 fix badge color again 2017-01-20 21:11:28 +00:00
Matthew Hodgson 5b1fea46cb fix badge color 2017-01-20 21:09:49 +00:00
Matthew Hodgson a9c575b4d0 fix a bunch of dark-theme buttons 2017-01-20 21:00:33 +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
Luke Barnard 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
lukebarnard afcf9de8d4 Handle avatars with initials 2017-01-20 17:35:01 +01:00
lukebarnard 9ffedf5e7d space after colons 2017-01-20 17:00:59 +01:00
lukebarnard 956deca844 Add bg-color border to typing avatars 2017-01-20 16:59:41 +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
Kegan Dougal ea063ab8b0 Address race conditions when flushing logs 2017-01-20 14:46:19 +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
Kegan Dougal 378126e746 Add another store to keep last modified times
This makes it easier to get a list of all the log IDs. It also makes it possible
to order the logs by the *LAST* log line and not the first as was the case
previously, which is important in the case of long-running tabs.
2017-01-20 14:00:30 +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
Kegan Dougal 41c6294be2 Remove clearAll from consume(): we want duplicate logs on multiple reports 2017-01-20 13:02:57 +00:00
Kegan Dougal ba1e166ac8 Line length 80 like we're still in the 80s 2017-01-20 12:02:48 +00:00
Kegan Dougal ea860807c4 Add a monkeyPatch function rather than monkey-patching in the constructor 2017-01-20 11:56:11 +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
Richard van der Hoff 01d4846526 Merge pull request #3001 from vector-im/dbkr/carlos22_desktop_wmclass
Add StartupWMClass
2017-01-20 10:38:52 +00:00
Matthew Hodgson b76b0f755d fix context menu bg 2017-01-20 02:47:47 +00:00
Matthew Hodgson 9b70e2e25f fix RTE bg color 2017-01-20 02:34:45 +00:00
Matthew Hodgson 4d8f5d4df1 change selection color & fix MD bg 2017-01-20 02:29:56 +00:00
Matthew Hodgson fa535996ae fix textarea bg 2017-01-20 02:22:11 +00:00