62959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kegan Dougal	efbea0e942	Add css for bug report dialog	2017-01-24 14:45:16 +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	28939d3146	Merge pull request #3043 from vector-im/luke/fix-status-bar-chopped ... Increase the max-height of the expanded status bar	2017-01-24 14:07:55 +00:00
Luke Barnard	307c4f3dd1	Increase the max-height of the expanded status bar ... This will ensure that errors, unsent messages, etc. will be allowed enough height to display their contents from within the status bar without being chopped. Fixes #3041	2017-01-24 14:02:44 +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
David Baker	536167a6c8	Merge pull request #3040 from vector-im/rav/fix_test_fail ... Hopefully, fix intermittent test failure	2017-01-24 13:48:01 +00:00
Richard van der Hoff	fe64b04339	More test resilience ... Give the tests more than one chance for the roomview to load.	2017-01-24 13:35:41 +00:00
Richard van der Hoff	c0de0870ed	Some sarcastic comments	2017-01-24 13:32:17 +00:00
David Baker	31878d8a44	Also need eslint-config-google	2017-01-24 13:07:34 +00:00
Kegan Dougal	6f3b70dbb0	Use Q promises and isPending to make logic simpler	2017-01-24 12:43:18 +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
Richard van der Hoff	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
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	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
Luke Barnard	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
Matthew Hodgson	706ffbec3c	add riot logos	2017-01-23 19:01:35 +01:00
Kegan Dougal	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
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	4c3ea13413	Make jenkins run the linter	2017-01-23 15:42:50 +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	c31b65d093	Merge pull request #3032 from vector-im/dbkr/add_eslint_config ... Add eslint config	2017-01-23 14:57:39 +00: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	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