2517 commits

Author	SHA1	Message	Date
Kegan Dougal	602ce37ba7	Merge branch 'develop' into kegan/rageshake-ui	2017-01-25 15:52:00 +00:00
Richard van der Hoff	dc7a169779	Merge pull request #647 from matrix-org/rav/megolm_backup_ui ... Import and export for Megolm session data	2017-01-25 15:43:15 +00:00
David Baker	ced1c45a34	Doc state in getinitialstate	2017-01-25 15:23:50 +00:00
Richard van der Hoff	9cadc2f55f	Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality ... Overhaul MELS to deal with causality, kicks, etc.	2017-01-25 15:20:30 +00:00
Richard van der Hoff	ebe6cddd21	Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui	2017-01-25 15:13:14 +00:00
Richard van der Hoff	69b55fd9d1	Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down ... Re-add dispatcher as alt-up/down uses it	2017-01-25 15:10:56 +00:00
David Baker	e9804086ca	Point to InviteAddressType	2017-01-25 15:03:01 +00:00
Richard van der Hoff	adf8f50f6e	Merge remote-tracking branch 'origin/develop' into rav/base_dialog	2017-01-25 15:01:11 +00:00
David Baker	b34f63d3e7	Re-add dispatcher as alt-up/down uses it ... Alt-up/down still doesn't go through rooms in the right order, but it should probably not error.	2017-01-25 14:59:18 +00:00
David Baker	fd8d5af63a	Fix import of InviteAddressType ... and rewrite to import while we're at it	2017-01-25 14:54:21 +00:00
David Baker	9020a7515c	Correctly bail out on unknown address	2017-01-25 14:50:00 +00:00
Kegan Dougal	b00e090600	Do not show the bug report section if there is no bug_report_endpoint_url	2017-01-25 14:43:47 +00:00
David Baker	e567162d28	Merge pull request #648 from matrix-org/rav/fix_set_displayname ... Fix SetDisplayNameDialog	2017-01-25 14:32:52 +00:00
Luke Barnard	f9ca2a8e59	Fix _renderCommaSeparatedList	2017-01-25 11:28:12 +00:00
David Baker	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
Luke Barnard	b887d5b823	Much linting	2017-01-25 11:05:45 +00:00
David Baker	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
Luke Barnard	8091cf7df8	Enumerate->label	2017-01-25 09:32:28 +00:00
Luke Barnard	f8e46819c5	Rename truncated->coalesced	2017-01-25 09:28:26 +00:00
Luke Barnard	3b8b2cf500	Document _getCanonicalTransitions	2017-01-25 09:18:47 +00:00
Richard van der Hoff	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
Richard van der Hoff	770820e6fa	Fix a bunch of lint complaints	2017-01-24 22:41:52 +00:00
Matthew Hodgson	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
Matthew Hodgson	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
Richard van der Hoff	b85f53cadd	Implement Megolm key importing	2017-01-24 21:50:24 +00:00
Richard van der Hoff	e23deac1bb	Implement e2e export	2017-01-24 21:50:24 +00:00
Matthew Hodgson	5b61d00533	warn users that changing/resetting password will nuke E2E keys	2017-01-24 22:36:55 +01:00
Richard van der Hoff	79e1108564	Merge branch 'develop' into rav/base_dialog	2017-01-24 21:03:08 +00:00
Richard van der Hoff	72492fd909	Fix broken merge ... I messed up the merge in 6dd46d5.	2017-01-24 20:55:10 +00:00
Richard van der Hoff	6dd46d532a	Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux	2017-01-24 20:47:24 +00:00
David Baker	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
Richard van der Hoff	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
Luke Barnard	a92fff9da7	Fix linting warnings	2017-01-24 17:18:56 +00:00
Luke Barnard	4186a769ca	Default prop for whoIsTypingLimit	2017-01-24 17:16:26 +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
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
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
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
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	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
David Baker	18d4d3392a	Fix a bunch of linting errors ... eslint --fix and a few manual ones	2017-01-20 14:22:27 +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
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
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
Richard van der Hoff	2637ae3af3	Merge pull request #630 from matrix-org/rav/fix_themes ... (hopefully) fix theming on Chrome	2017-01-19 17:34:36 +00:00
David Baker	a2ff1cd8e6	Factor out adding the input field to the list	2017-01-19 17:03:16 +00:00
David Baker	ee1f6c772e	Remove duplicate case handled above ... And fix typo where it was handled	2017-01-19 16:50:09 +00:00
David Baker	2a08abaa95	Keep old behaviour of submitting on enter ... if input is empty	2017-01-19 16:35:40 +00:00
David Baker	d8bcc1f067	Merge remote-tracking branch 'origin/develop' into dbkr/sanitize_chatinvitedialog	2017-01-19 16:26:59 +00:00
Richard van der Hoff	ba2460aef4	Merge pull request #618 from matrix-org/rav/async_dialog ... Allow Modal to be used with async-loaded components	2017-01-19 16:08:30 +00:00
Richard van der Hoff	a88f9fdd73	(hopefully) fix theming on Chrome ... Jump through some hoops to make Chrome behave sensibly on non-default themes.	2017-01-19 15:36:57 +00:00
Kegsay	89fa47dc26	Merge pull request #622 from kyrias/commonmark-fix-escaping ... Fix escaping markdown by rendering plaintext	2017-01-19 13:39:07 +00:00
David Baker	9e0c7a11d0	Merge pull request #628 from matrix-org/luke/feature-team-reg-auto-join-rooms ... Implement auto-join rooms on registration	2017-01-19 11:44:37 +00:00
Johannes Löthberg	9c1c657a1e	Markdown: delete remaining pre-split relics ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-19 11:55:36 +01:00
David Baker	b58a67f6b1	Add more punctuation. Also s/let/const/	2017-01-19 10:51:43 +00:00
David Baker	242f5e0301	PR feedback ... * Doc & properly indent escapeRegExp * Add close bracket to the list of punctuation chars we search after	2017-01-19 10:24:21 +00:00
lukebarnard	e9eb38fd74	Update propTypes and do null checks	2017-01-19 11:05:08 +01:00
lukebarnard	e06dd6e34a	Implement auto-join rooms on registration ... Also: This fixes registration with a team: only the email localpart was being used to register. When a registration is successful, the user will be joined to rooms specified in the config.json teamsConfig: "teamsConfig" : { "supportEmail": "support@riot.im", "teams": [ { "name" : "matrix", "emailSuffix" : "matrix.org", "rooms" : [ { "id" : "#irc_matrix:matrix.org", "autoJoin" : true } ] } ] } autoJoin can of course be set to false if the room should only be displayed on the (forthcoming) welcome page for each team, and not auto-joined.	2017-01-19 10:56:04 +01:00
Matthew Hodgson	4e5689082d	correctly load synced themes without NPE	2017-01-18 20:06:54 +00:00
Matthew Hodgson	4df968ecdf	fix css snafu	2017-01-18 20:06:44 +00:00
David Baker	7b7728c93a	Make behaviour of ChatInviteDialog more consistent ... * Pressing enter now always adds whatever was in the input box to the invite list, if it's a valid address (previously it added it to the list of it was a search result but submitted the form straight away if there were no results). * Remove isValidAddress as it was only used in the context of testing whether its return value was true or null (where null meant "unsure") so just use getAddressType instead.	2017-01-18 18:32:38 +00:00
Johannes Löthberg	30bd01cdf2	Markdown: Split up render function into toHTML/toPlaintext ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-18 19:29:11 +01:00
David Baker	f105ec2794	Attempt to sanitize ChatInviteDialog a bit ... * Use binds rather than onFoo functions which aren't actually handler functions themselves but return them * Rename onKeyUp to moveSelectionDown etc,, reserving onKeyUp for "a key has been released" rather than, "the up arrow key has been pressed"	2017-01-18 17:51:39 +00:00
Matthew Hodgson	fc63067237	improve commentary	2017-01-18 16:36:27 +00:00
David Baker	de621902fc	Better feedback in invite dialog ... Show feedback if you enter a valid but unknown email address or mxid Fixes https://github.com/vector-im/riot-web/issues/2933	2017-01-18 15:21:50 +00:00
Matthew Hodgson	3d30553b7f	review fixes, plus unbreak to work with new webpack layout	2017-01-18 14:06:47 +00:00
Matthew Hodgson	a0bbe3a306	Merge branch 'develop' into matthew/postcss	2017-01-18 12:52:59 +00:00
Luke Barnard	5ef5204c8c	Implement simple team-based registration (#620) ... * Implement simple team-based registration Config required goes in the `teams` top-level property in config.json. This consists of an array of team objects: ```json { "name": "University of Bath", "emailSuffix": "bath.ac.uk" } ``` These can be selected on registration and require a user to have a certain email address in order to register as part of a team. This is for vector-im/riot-web#2940. The next step would be sending users with emails matching the emailSuffix of a team to the correct welcome page as in vector-im/riot-web#2430.	2017-01-18 12:48:28 +01:00
lukebarnard	5dd1512ff2	Move aggregation code to dedicated function	2017-01-18 10:59:19 +01:00
lukebarnard	484549e50b	Refactor a few things and document everything	2017-01-18 10:26:25 +01:00
Johannes Löthberg	c819b433a2	Make old message composer use new markdown ... Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-17 20:37:27 +01:00
Matthew Hodgson	8288eb730c	a rather hacky implementation of theme switching	2017-01-17 19:13:23 +00:00
David Baker	a87e7d6617	Make user search do a bit better on word boundary	2017-01-17 18:17:51 +00:00
lukebarnard	3ba9f50873	Move functions around, remove redundancies, add docs	2017-01-17 19:07:45 +01:00
lukebarnard	9574a0b663	Remove pointless length guard	2017-01-17 18:56:57 +01:00
Johannes Löthberg	893a5c971f	Fix escaping markdown by rendering plaintext ... We still need to parse "plaintext" messages through the markdown renderer so that escappes are rendered properly. Fixes vector-im/riot-web#2870. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-01-17 16:23:58 +01:00
David Baker	0b67fd5b4e	Add 'searching known users' to the user picker ... So it's more obvious it's only finding people you've already seen Fixes https://github.com/vector-im/riot-web/issues/2931	2017-01-17 14:48:50 +00:00
Matthew Hodgson	a18d94099e	switch to using <span/> for edit button	2017-01-17 14:11:15 +00:00
Matthew Hodgson	203172c886	typos	2017-01-17 14:11:01 +00:00
lukebarnard	45655f4de3	Modified desc for invitation rejections, withdrawals	2017-01-17 12:01:19 +01:00
lukebarnard	aa6e168505	Remove comment	2017-01-16 18:58:53 +01:00
lukebarnard	5ab287fa1a	Use pre-calculated displaynames to handle dupes	2017-01-16 18:57:49 +01:00
lukebarnard	a79dc886ba	Order sequences by occurance of the first event in each sequence	2017-01-16 18:46:17 +01:00
Richard van der Hoff	ac22803ba0	Allow Modal to be used with async-loaded components ... Add Modal.createDialogAsync, which can be used to display asynchronously-loaded React components. Also make EncryptedEventDialog use it as a handy demonstration.	2017-01-16 17:18:38 +00:00
lukebarnard	4be444d524	Move shouldComponentUpdate	2017-01-16 15:12:00 +01:00
lukebarnard	82d6805a71	Canonicalise certain transition pairs, handle arbitrary consecutive transitions ... Transition pairs joined,left and left,joined are now transformed into single meta-transitions "joined_and_left" and "left_and_joined" respectively. These are described as "joined and left", "left and rejoined". Treat consecutive sequences of transitions as repetitions, and handle any arbitrary repetitions of transitions: ...,joined,left,joined,left,joined,left,... is canonicalised into ...,joined_and_left, joined_and_left, joined_and_left,... which is truncated and described as ... , joined and left 3 times, ... This also works if there are multiple consecutive sequences separated by other transitions: ..., banned, banned, banned, joined, unbanned, unbanned, unbanned,... becomes ... was banned 3 times, joined, was unbanned 3 times ...	2017-01-16 14:49:07 +01:00
lukebarnard	fb68fff536	Refactor renderCommaSeparated for reuse	2017-01-16 13:45:42 +01:00
Jani Mustonen	b323551f22	Adhered to code review	2017-01-13 19:36:41 +02:00
Jani Mustonen	5e013860ee	Definition for AccessibleButton	2017-01-13 19:36:41 +02:00
Jani Mustonen	959163f2ef	Proper accessible buttons	2017-01-13 19:36:41 +02:00
Jani Mustonen	041196d729	Added quick search functionality	2017-01-13 19:36:40 +02:00
Jani Mustonen	d2ff2715ce	Buttonified almost everything. Stylesheet is broken.	2017-01-13 19:36:40 +02:00
Jani Mustonen	8d79716421	Turned the links to buttons to comply with MDN's recommendations	2017-01-13 19:36:40 +02:00
Jani Mustonen	ad072cc179	Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons.	2017-01-13 19:36:40 +02:00
Luke Barnard	77ae041407	Order names by order of first events for users	2017-01-13 16:40:33 +00:00
Kegan Dougal	dcd0acb2b5	Review comments	2017-01-13 15:17:34 +00:00
Kegan Dougal	e196cfaf91	Show the error dialog when requests to PUT power levels fail ... This is why I dislike Q.	2017-01-13 14:51:01 +00:00
Luke Barnard	d2d78919ce	Overhaul MELS to deal with causality, kicks, etc. ... The MELS can now deal with arbitrary sequences of transitions per user, where a transition is a change in membership. A transition can be joined, left, invite_reject, invite_withdrawal, invited, banned, unbanned or kicked. Repeated segments (modulo 1 and 2), such as joined,left,joined,left,joined will be handled and will be rendered as " ... and 10 others joined and left 2 times and then joined". The repeated segments are assumed to be at the beginning of the sequence. This could be improved to handle arbitrary repeated sequences.	2017-01-12 18:55:53 +00:00
Matthew Hodgson	cc8b3d4ba4	spell out email invites better	2017-01-12 13:46:19 +00:00
David Baker	1f96467145	Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins ... Fix redacted member events being visible	2017-01-11 17:10:35 +00:00
Luke Barnard	baaf827c48	Use getStateKey instead of getSender ... This makes sure that the kickee is not the user used for the MemberEventListSummary	2017-01-11 17:03:14 +00:00
Luke Barnard	6e2a75bbee	Fix redacted member events being visible ... This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765.	2017-01-11 11:27:07 +00:00
David Baker	13a5337e0f	Fix 'create account' link in 'forgot password' ... Fixes https://github.com/vector-im/riot-web/issues/2853	2017-01-10 15:16:39 +00:00
Sijmen Schoon	ef88e02931	Add support for pasting into the text box ... Only supports the new rich-text-supporting text editor	2017-01-08 02:21:36 +01:00
Richard van der Hoff	42de77e588	Remove "Cannot re-join empty room" error ... This is a lying error message. burn it with fire	2016-12-27 19:17:48 +00:00
Matthew Hodgson	e2e3bc0637	improve captcha warning	2016-12-24 18:40:20 +00:00
Matthew Hodgson	69b277b282	ask electron users to do captchas in a web browser. ... This will happen anyway when they follow email verification links. make captchas poll for success so if they are completed elsewhere, electron moves on	2016-12-24 03:15:30 +00:00
Matthew Hodgson	b1c4c759f4	blind fix for captcha on electron	2016-12-23 14:35:40 +00:00
Luke Barnard	2a63017372	Account for timezone in date separator calculation (#595) ... * Account for timezone in date separator calculation Decide on date separators using MatrixEvent.getDate(). This requires matrix-org/matrix-js-sdk#311	2016-12-22 17:54:30 +00:00
David Baker	fd44d9f4d6	Merge pull request #597 from matrix-org/dbkr/delete_threepid ... Add support for deleting threepids	2016-12-22 15:31:34 +00:00
David Baker	8a3f2d9e91	Merge pull request #598 from matrix-org/dbkr/display_msisdn_threepid ... Display msisdn threepids as 'Phone'	2016-12-22 15:28:09 +00:00
David Baker	a6fdbda011	Get variable name right	2016-12-22 15:26:08 +00:00
David Baker	98b22460ec	They're not all emails anymore	2016-12-22 15:03:24 +00:00
Daniel Dent	7c841a86ef	Unbranded error messages	2016-12-21 14:28:01 -08:00
David Baker	3dfffa385e	Display msisdn threepids as 'Phone' ... rather than pretending only email exists	2016-12-21 18:56:50 +00:00
David Baker	5e10ec4ece	Add support for deleting threepids	2016-12-21 18:49:38 +00:00
Richard van der Hoff	4804fb3a1c	Revert "Fix performance issues with wantsDateSeperator" ... This change broke timezone handling, so that date-separators are shown at the wrong time of day. This reverts commit b908e7ef29.	2016-12-21 09:48:41 +00:00
Luke Barnard	2658cd09b5	Fix scroll jumping when a video is decrypted ... Call the `onWidgetLoad` prop on MVideoBody to notify the scroll panel to keep it's position when the size of the video widget updates.	2016-12-20 12:33:07 +00:00
Matthew Hodgson	d0d056e308	hide read markers	2016-12-20 02:26:23 +00:00
Richard van der Hoff	b8c0fa507e	Merge pull request #590 from matrix-org/luke/fix-membereventlistsummary-performance ... Improve the performance of MemberEventListSummary	2016-12-16 10:53:51 +00:00
Luke Barnard	7475056bb4	MELS component should update if there are fewEvents, effectively expanding the summary	2016-12-15 18:33:13 +00:00
Luke Barnard	6b52b247e7	Update comment on MELS key	2016-12-15 18:26:41 +00:00
Luke Barnard	88aeb6417e	Use the first member event ID or "initial" in the MELS key	2016-12-15 18:23:54 +00:00
Kegsay	71132c4610	Merge pull request #592 from matrix-org/kegan/bulk-reject-invites ... Implement bulk invite rejections	2016-12-15 16:16:55 +00:00
Kegan Dougal	ec41fc284a	Null guard on componentWillUnmount	2016-12-15 16:13:09 +00:00
Luke Barnard	55f85befc1	Allow component to update if currently expanded or if about to collapse	2016-12-15 14:43:59 +00:00
Kegan Dougal	8a511ed54b	Add .done() to catch exceptions which may be thrown in setState	2016-12-15 14:17:29 +00:00
Luke Barnard	e7564f4dc5	Spelling	2016-12-15 13:16:36 +00:00
Luke Barnard	86739e7d1e	Simplify handling of only one member event	2016-12-15 13:15:00 +00:00
Kegan Dougal	8f42134d9f	Explain why binding	2016-12-14 16:04:20 +00:00
Luke Barnard	b908e7ef29	Fix performance issues with wantsDateSeperator ... This was causing rendering of MemberEventListSummary to be quite slow. Instead of creating two date objects, just check to see if they represent timestamps that happened on different days.	2016-12-14 16:01:32 +00:00
Kegan Dougal	13dfe9ef0f	Implement bulk invite rejects	2016-12-14 16:00:50 +00:00
Luke Barnard	c07e5d4992	Improve the performance of MemberEventListSummary ... - The MessagePanel now uses the same key for the MELS instances rendered so that entirely new instances are not created, they are simply passed new props (namely when new events arrive). - MELS itself now uses `shouldComponentUpdate` so that it only updates if it is given a different number of events to previous or if it is toggled to expand.	2016-12-14 15:31:35 +00:00
Kegan Dougal	1d4591ce68	Add UI in UserSettings for bulk rejecting invites	2016-12-14 15:01:50 +00:00
Kegan Dougal	5d99d68a64	Show the full date and time if the receipt was sent days after the event	2016-12-09 11:43:23 +00:00
Kegan Dougal	49010c3e93	Refactor how 'readReceipts' are passed into EventTiles ... Instead of passing a list of RoomMembers, pass a list of records with a `roomMember` prop and a `ts` prop so we can display the timestamp on hover.	2016-12-09 11:24:10 +00:00
Kegan Dougal	bd7553d1ea	Add read receipt times to the hovertip of read markers ... Fixes #2709. Surprisingly, this data was never passed down to ReadReceiptMarker.	2016-12-08 16:23:20 +00:00
Richard van der Hoff	587325b36c	Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir ... Fix exception when clearing room dir search	2016-12-06 15:58:07 +00:00
David Baker	9e3c94edf4	Fix exception when clearing room dir search ... Needed more isMounted checks after promises return.	2016-12-06 14:59:10 +00:00
David Baker	a3ab59832e	Give the search box field a name ... Should fix https://github.com/vector-im/riot-web/issues/2462	2016-12-06 14:40:09 +00:00
David Baker	6777e07a41	Remove device name from crypto section ... As it was getting it by assuming our device was the first one, which is just not a valid assumption.	2016-12-05 20:03:43 +00:00
David Baker	8ffe14881e	Don't throw an exception entering settings page ... if end to end encryption is disabled (eg. if you're a guest and the server is too old to support e2e for guests).	2016-12-05 18:33:38 +00:00
Johannes Löthberg	f321c6c346	Strip (IRC) when clicking on username ... Fixes vector-im/riot-web#2072. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2016-12-03 01:20:50 +01:00
Mark Haines	81e429eb14	Fix e2e attachment download by using iframes. (#562) ... * Render attachments inside iframes. * Fix up the image and video views * Fix m.audio * Comments, and only use the cross domain renderer if the attachment is encrypted * Fix whitespace * Don't decrypt file attachments immediately * Use https://usercontent.riot.im/v1.html by default * typos * Put the config in the React context. Use it in MFileBody to configure the cross origin renderer URL. * Call it appConfig in the context * Return the promises so they don't get dropped	2016-12-02 14:21:07 +00:00
Luke Barnard	5665a0ef37	Fix scroll jump on image decryption ... `onWidgetLoad` is now being called when an image has been decrypted so that the ScrollPanel maintains its scroll position (whether it's stuckAtBottom or not). This attempts to fix https://github.com/vector-im/riot-web/issues/2624	2016-12-02 11:11:35 +00:00
Richard van der Hoff	c7fb83ed2d	s/block/blacklist for e2e ... Fixes https://github.com/vector-im/vector-web/issues/2315	2016-11-29 18:48:43 +00:00
David Baker	21d65d2ad1	Fix the download icon on attachments	2016-11-25 23:19:20 +00:00
David Baker	8547d00f32	Don't default the page_type to room directory ... As it breaks the behaviour of redirecting to /#/directory	2016-11-24 16:39:48 +00:00
David Baker	2aba646acd	Clear room alias etc. on logout	2016-11-24 14:58:37 +00:00
David Baker	0069393650	Go back to same room after logging in	2016-11-24 13:28:51 +00:00
David Baker	0bc4659fe0	Fix crash on logging in ... If you arrived at the page via a link to a room. Fixes https://github.com/vector-im/vector-web/issues/2634	2016-11-24 12:33:31 +00:00
Richard van der Hoff	6e6bcf8b78	Reinstate missing sections from the UserSettings ... The 'devices' and 'cryptography' sections got removed from UserSettings by #566.	2016-11-23 11:08:21 +00:00
Luke Barnard	42fc7b1b66	Use UNFILL_REQUEST_DEBOUNCE_MS constant, reset unfillDebouncer timeout reference.	2016-11-22 17:23:06 +00:00
Luke Barnard	d1a5d94916	Make the unpagination process less aggressive ... This increases `UNPAGINATION_PADDING` (see the ASCII on ScrollPanel.js, `_getExcessHeight`), and also debounces unfilling requests made for 200ms. This forces unfilling requests not to be sent unless the next 200ms has no scrolling, effectively.	2016-11-22 16:47:56 +00:00
Richard van der Hoff	06f12b91b8	Merge pull request #566 from matrix-org/rav/remove_dead_labs_settings ... Get rid of always-on labs settings	2016-11-21 10:38:06 +00:00
Richard van der Hoff	4476b09ce7	Get rid of always-on labs settings ... If the setting is on by default, it's not much use as a Labs setting. The E2e setting was only confusing everyone anyway.	2016-11-21 10:25:48 +00:00
Richard van der Hoff	03988015aa	Fix 'Quote' for e2e messages ... Fixes https://github.com/vector-im/vector-web/issues/2612	2016-11-21 09:19:40 +00:00
Matthew Hodgson	2e691240ae	fix e2e disclaimer	2016-11-19 02:44:36 +02:00
Matthew Hodgson	8a5678efdd	boldify the preview bar click	2016-11-19 01:20:09 +02:00
Mark Haines	7cb3c0935b	Make the spinner smaller, don't decrypt files as eagerly (#564)	2016-11-18 20:08:26 +00:00
Luke Barnard	341175ea58	Fix pagination issue where recent events are lost (#563) ... Fix pagination issue where recent events are lost Scrolling up a few pages followed by scrolling down to the most recent events previously caused some events to go missing. A test has been modified in conjunction with this fix to make sure that this failure mode is tested for in future. This commit should fix the issue, and the most recent events should be paginated back in.	2016-11-18 11:15:14 +00:00
Richard van der Hoff	f3582edb99	Merge pull request #560 from matrix-org/luke/fix-join-part-collapsing-regressions2 ... Fix more membership change collapsing bugs	2016-11-16 16:33:18 +00:00
Luke Barnard	7e88f0083d	Fix more join-part collapsing regressions ... Use the previous content of the first event known for a user in a block of membership changes. This means single events are not special cased.	2016-11-16 16:26:24 +00:00
Luke Barnard	3618b49982	Use new js-sdk public unpaginate	2016-11-16 16:10:23 +00:00
Luke Barnard	324448563a	If only one mevent, return than one ... Also, the net change of nil is detected as having the first and last events being _different_. The summary should only include those that have their first and last events being the _same_ because that is a net change (within the block of member events).	2016-11-16 16:07:19 +00:00
Luke Barnard	beecbc7cd7	Fix join/part collapsing regressions (#553) ... * Fix join/part collapsing regressions * Simplify loop * Explain e,e * Explain return null in _renderSummary * Kill it properly * Move . to _renderSummary * Only use the first and last events to decide whether a net change has occured * Do not sort events by TS before summarising * fix loop and comment * remove data-number-events * Better explanation comment in _renderSummary * Less tortuous comment	2016-11-16 14:42:30 +00:00
Luke Barnard	b718f1542c	Fix infinite loop when there are a lot of invisible events (#554) ... Instead of using a window of a fixed number of events, unpaginate based on the distance of the viewport from the end of the scroll range. The ScrollPanel uses the scrollTokens to convey to its parent (the TimelinePanel, in this case) the point to unpaginate up to. The TimelinePanel then takes a chunk of events off the front or back of `this.state.events` using `timelineWindow.unpaginate`. Fixes https://github.com/vector-im/vector-web/issues/2020	2016-11-16 14:25:52 +00:00
Mark Haines	6ccc825f0d	Cache the tinted SVGs for MFileBody as data URLs (#559) ... * Use a list of callbacks for things that need tinting. Rather than gutwrenching the internals of TintableSVG inside the Tinter. * Share a data: url for the tinted download svg in MFileBody * Check image exists before tinting * Add comments * Use fetch+DomParser rather than XMLHttpRequest * Remove comment about XMLHttpRequest	2016-11-16 14:16:51 +00:00
David Baker	218ced0276	Merge pull request #557 from matrix-org/rav/show_padlock_on_unencrypted_room ... Show an open padlock for unencrypted rooms	2016-11-16 13:03:52 +00:00
Mark Haines	595493e5bb	Clean up MFileBody.presentableTextForFile	2016-11-15 15:58:24 +00:00
David Baker	bb776c217d	Merge pull request #556 from matrix-org/rav/decrypt_after_keys_arrive ... Update eventtiles when the events are decrypted	2016-11-15 14:56:21 +00:00
Richard van der Hoff	a3d4ed5aee	Show an open padlock for unencrypted rooms ... Also, add a tooltip, and enlarge the img to 12px wide, because the open padlock looked silly at 10px and they both look fine at 12px	2016-11-15 12:31:17 +00:00
David Baker	ec999f6fa1	Merge pull request #552 from matrix-org/rav/event_tile_withmatrixclient ... Update EventTile to use WithMatrixClient instead of MatrixClientPeg	2016-11-15 11:25:48 +00:00
Mark Haines	13f28e53e1	Generate thumbnails when sending m.image and m.video messages. (#555) ... * Send a thumbnail when sending a m.image * Use the 'thumbnail_file' when displaying encrypted images * Whitespace * Generate thumbnails for m.video * Fix docstring, remove unused vars, use const * Don't change the upload promise behaviour * Polyfill for Canvas.toBlob to support older browsers * Lowercase for integer types in jsdoc	2016-11-15 11:22:39 +00:00
Richard van der Hoff	b209cc551e	Update eventtiles when the events are decrypted ... Events are sometimes decrypted after they arrive, so add an eventlistener for it and update the tile.	2016-11-15 11:12:52 +00:00
Richard van der Hoff	0e8a49ebb7	Update EventTile to use WithMatrixClient instead of MatrixClientPeg	2016-11-14 16:00:24 +00:00
Matthew Hodgson	69f6393ed9	try to make joining rooms more obvious	2016-11-13 14:13:21 +00:00
Matthew Hodgson	a967ddd1cb	quick and dirty support for custom welcome pages, with an example for geektime techfest	2016-11-13 14:10:46 +00:00
David Baker	1ff3a86457	Merge pull request #548 from matrix-org/markjh/encrypted-attachments ... Encrypt attachments in encrypted rooms	2016-11-11 14:49:52 +00:00
Mark Haines	72d24f58d0	Make the promises be q promises	2016-11-11 13:57:45 +00:00
Mark Haines	9edfea3b32	Make imports more consistent, fix m.video	2016-11-11 13:57:45 +00:00
Mark Haines	bf5ecbd016	Review comments ... Conflicts: src/ContentMessages.js	2016-11-11 13:57:42 +00:00
Mark Haines	734c4eb638	Fix gif hoverover	2016-11-11 13:57:11 +00:00
Mark Haines	de384480c6	Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself. ... Conflicts: src/components/views/messages/MImageBody.js	2016-11-11 13:57:08 +00:00
Mark Haines	736ab743ee	Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded ... Conflicts: src/components/views/messages/MImageBody.js	2016-11-11 13:56:30 +00:00
Mark Haines	ee1768f644	Use data:// URI rather than blob: URI to avoid XSS	2016-11-11 13:55:57 +00:00
Mark Haines	b69e88d4e3	Decrypt m.file attachments	2016-11-11 13:55:57 +00:00
Mark Haines	4e01a4f692	Decrypt m.audio attachments	2016-11-11 13:55:57 +00:00
Mark Haines	48340a2817	Fix unencrypted video thumbnail	2016-11-11 13:55:57 +00:00
Mark Haines	b56417f46e	Remove spurious TODO	2016-11-11 13:55:57 +00:00
Mark Haines	95e8889857	Decypt m.video events	2016-11-11 13:55:57 +00:00
Mark Haines	a4a0d02848	Move decryptFile into a utility function so that it can be shared between different components ... Conflicts: src/components/views/messages/MImageBody.js	2016-11-11 13:55:48 +00:00
Luke Barnard	5109833c42	Use correct prop types	2016-11-11 13:55:32 +00:00
Mark Haines	49b3aec1e2	Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates ... Conflicts: src/ContentMessages.js src/components/views/messages/MImageBody.js	2016-11-11 13:54:07 +00:00
Luke Barnard	2a1d32f4d5	Add key prop to memberlist summary	2016-11-11 13:49:25 +00:00
Mark Haines	23e764604c	Merge remote-tracking branch 'origin/master' into develop	2016-11-11 12:00:53 +00:00
Mark Haines	61921327c2	Merge remote-tracking branch 'origin/master' into develop	2016-11-11 12:00:30 +00:00
David Baker	1e163eabf0	Revert "Encrypt attachments in encrypted rooms,"	2016-11-11 11:59:08 +00:00
Richard van der Hoff	998690431f	Merge pull request #542 from matrix-org/dbkr/get_app_version ... Fix the vector web version in UserSettings	2016-11-11 11:11:36 +00:00
Richard van der Hoff	00ecff7497	Merge pull request #544 from matrix-org/luke/feature-truncate-m-room-member-events ... Truncate consecutive member events	2016-11-11 11:01:47 +00:00
David Baker	857c0d1747	Wrap getAppVersion() in promise ... in case it throws	2016-11-11 10:05:53 +00:00
Luke Barnard	d3a548773a	Remove redundant lines	2016-11-10 18:01:34 +00:00
Luke Barnard	3d7f6919cf	Refactor renderNameList (thanks, @richvdh)	2016-11-10 17:36:22 +00:00
Luke Barnard	0695037f5f	pass in prop onClick by default	2016-11-10 17:30:35 +00:00
Luke Barnard	87e8f0e4da	trailing commas	2016-11-10 17:27:59 +00:00
Luke Barnard	3ec7940d12	Inline renderEvents	2016-11-10 17:26:36 +00:00
Luke Barnard	d2d7ebc979	correct comment	2016-11-10 17:22:16 +00:00
Luke Barnard	b11dd9542f	Add class to expand link for pointer and colour	2016-11-10 17:09:18 +00:00
Luke Barnard	e05aeb35a1	npm run reskindex	2016-11-10 17:03:24 +00:00
Luke Barnard	ac460122cc	revert now redundant TruncatedList edits	2016-11-10 15:51:27 +00:00
Luke Barnard	f71ac93946	Prefer null to falsy, use correct plural	2016-11-10 15:38:20 +00:00
Luke Barnard	1a4df38500	remove href	2016-11-10 15:20:53 +00:00
Luke Barnard	d8bc4d9a6f	Factor out avatar click leads to view_user	2016-11-10 15:18:59 +00:00
Luke Barnard	6b2aa43b71	Factor out "and others"	2016-11-10 14:33:41 +00:00
Luke Barnard	d6b74becfc	Children are required	2016-11-10 14:12:45 +00:00
Luke Barnard	370f5f0a11	Use _ prefix for private methods	2016-11-10 14:12:05 +00:00
Luke Barnard	8422017827	events are required	2016-11-10 14:09:40 +00:00
Luke Barnard	dcbb31279f	Prefer import React, set prevEvent to last MemberhsipChange	2016-11-10 14:08:11 +00:00
Luke Barnard	e2936376b6	Unnecessary props	2016-11-10 13:26:27 +00:00
Luke Barnard	566034cf2b	Render children EventTiles before passing to summary element	2016-11-10 13:25:48 +00:00
Luke Barnard	764959ec1c	Comment on i after membershipchanges	2016-11-10 13:14:04 +00:00
Luke Barnard	0ec5eebfc9	Hoist isMembershipChange out of for loop	2016-11-10 13:03:17 +00:00
Luke Barnard	d01bb0b78f	Use sdk.getComponent	2016-11-10 13:01:48 +00:00
Luke Barnard	79c01fa1a4	Remove empty lines	2016-11-10 11:03:43 +00:00
Luke Barnard	f5bc8d1fe0	Removed logs, updated phrasing on 'others joined' ... Now it's: 1 user joined and left >1 others joined and left	2016-11-10 10:42:33 +00:00
Luke Barnard	5f0b891d47	Add date seperator to the expanded events ... netsplits across midnight is not handled, and @richvdh suggested splitting the list in two	2016-11-09 17:44:43 +00:00
Luke Barnard	04a934f738	Trying to get rid of the date separator problem	2016-11-09 16:24:56 +00:00
Luke Barnard	2f02c4b84e	WIP nicer join/part folding	2016-11-09 16:03:35 +00:00
Richard van der Hoff	f2222c84a8	Merge pull request #545 from matrix-org/dbkr/fix_ctrl_e ... Fix the ctrl+e mute camera shortcut	2016-11-08 18:37:58 +00:00
David Baker	a008f5010a	Fix the ctrl+e mute camera shortcut ... * Fixes the altgr+e shortcut on Windows (Fixes https://github.com/vector-im/vector-web/issues/2561) * Fixes the shortcuts to be cmd+e on mac rather than ctrl+e which is more normal and doesn't clobber ctrl+e which old school unix types use for go-to-end-of-line.	2016-11-08 18:04:22 +00:00
Luke Barnard	cd241a4a17	Truncate consecutive member events ... This is needed for the IRC bridge to be able to do full membership list syncing without cluttering the message panel.	2016-11-08 16:34:02 +00:00
Mark Haines	c838164f40	Make the promises be q promises	2016-11-08 16:26:25 +00:00
Mark Haines	93ddb5539e	Make imports more consistent, fix m.video	2016-11-08 12:57:24 +00:00
David Baker	d871ca2b24	PR feedback	2016-11-08 11:43:24 +00:00
Mark Haines	911f9e4e63	Review comments	2016-11-08 11:42:20 +00:00
Luke Barnard	de83e578e7	Use generic error message	2016-11-08 11:18:44 +00:00
Luke Barnard	c0c662aeaf	Show the error that occured when trying to reach scalar ... Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.	2016-11-08 10:57:48 +00:00
David Baker	d44adcb7a9	Fix the vector web version in UserSettings ... Add a getAppVersion() function to the platform rather than relying on the updater code firing an event before we know what the app version is.	2016-11-08 10:45:19 +00:00
David Baker	5c2c01d414	Fix function to consistently return boolean	2016-11-07 11:45:55 +00:00
David Baker	2bb7aec0de	Don't do URL previews for matrix.to	2016-11-07 10:57:08 +00:00
Richard van der Hoff	2ee98e9fdc	Fix NPE in LoggedInView ... Fixes a NPE displaying the new version bar (also fix displayname for WithMatrixClient)	2016-11-07 09:28:10 +00:00
Mark Haines	dc679a8eca	Fix gif hoverover	2016-11-04 18:41:05 +00:00
Mark Haines	4214c67f8f	Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself.	2016-11-04 18:20:20 +00:00
Mark Haines	1529396ef5	Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded	2016-11-04 18:09:12 +00:00
Mark Haines	8f778f54fd	Use data:// URI rather than blob: URI to avoid XSS	2016-11-04 15:39:39 +00:00
Mark Haines	6ea0085290	Decrypt m.file attachments	2016-11-04 14:00:26 +00:00
Mark Haines	94bfe31857	Decrypt m.audio attachments	2016-11-04 13:45:00 +00:00
Mark Haines	91123431dd	Fix unencrypted video thumbnail	2016-11-04 13:13:25 +00:00
Mark Haines	71c002d588	Remove spurious TODO	2016-11-04 13:08:17 +00:00
Mark Haines	48cfd4f399	Decypt m.video events	2016-11-04 13:05:34 +00:00
Mark Haines	b6653dd0ed	Move decryptFile into a utility function so that it can be shared between different components	2016-11-04 12:46:45 +00:00
Mark Haines	12fc70c671	Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates	2016-11-04 11:52:47 +00:00
David Baker	f301e55b6e	Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context	2016-11-04 10:54:32 +00:00
David Baker	da10660c86	Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context	2016-11-04 10:35:41 +00:00
Richard van der Hoff	cb5b311e44	Move saveScrollState into RoomView ... It fits much more naturally here than in LoggedInView.	2016-11-04 09:28:35 +00:00
Richard van der Hoff	ab7007784f	Make MemberInfo use the matrixclient from the context ... An arbitrary component to demonstrate how this works	2016-11-03 19:05:48 +00:00
Richard van der Hoff	d3f20e1d9d	Add the MatrixClient to the react context ... Because that's the reacty way	2016-11-03 19:02:27 +00:00
Richard van der Hoff	f85a37c667	Factor out LoggedInView from MatrixChat ... The idea here is to make a layer which sits around for as long as we have a valid MatrixClient. Also it makes a plausible split for the render of MatrixChat, even if they are much too tightly bound for now.	2016-11-03 18:59:32 +00:00
Mark Haines	e949d91162	Handle decryption errors	2016-11-03 16:39:20 +00:00
Mark Haines	e0cea74c7e	Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them	2016-11-02 16:26:10 +00:00
David Baker	3c4370c180	Move 'new version' support into Platform ... Also adds support for the platform providing a changelog	2016-11-02 15:58:17 +00:00
David Baker	f433f9ca32	Move platform-specific functionality into Platform ... Platform classes are provided by the application via PlatformPeg.set().	2016-11-02 15:10:21 +00:00
David Baker	8cf273a460	Run highlight.js asynchronously ... Move the very minimal logic of highlightDOM into TextualBody because then we can avoid scheduling a lot of timeouts which would ultimately do nothing (ie. any messages that don't have code blocks).	2016-10-26 18:41:28 +01:00
David Baker	8395717f9b	Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join ... Fix CPU spin on joining rooms	2016-10-26 15:46:42 +01:00
David Baker	32ebd8083b	Stray comma	2016-10-26 15:32:09 +01:00
David Baker	e5a770a373	Don't send read receipt if user has logged out	2016-10-26 13:19:36 +01:00
David Baker	a2eb0a9cf0	Fix CPU spin on joining rooms ... Ratelimit roomheader's updates and move some other things into rate limited functions.	2016-10-26 13:09:53 +01:00
Aviral Dasgupta	022eb575d9	Upgrade to babel6 and enable some presets.	2016-10-17 16:23:25 +01:00
Richard van der Hoff	4f901f1894	Keyboard shortcuts to mute microphone/camera ... Same as hangouts: ctrl-d for mute microphone; ctrl-e to mute camera.	2016-10-17 14:13:56 +01:00
David Baker	3f067cbdf6	Give our input fields names ... Otherwise browsers' 'Remember Password' feature has to guess badly and ends up putting the login username / password in the first two password reset fields which is a bit odd.	2016-10-14 15:34:44 +01:00
David Baker	920f498925	Merge pull request #517 from matrix-org/rav/interactive_auth_on_device_delete ... Interactive auth for device delete	2016-10-12 18:31:38 +01:00
David Baker	ef22ba1f39	Merge pull request #516 from matrix-org/rav/interactive_auth_dialog ... InteractiveAuthDialog	2016-10-12 18:27:23 +01:00
Richard van der Hoff	1e683427da	TODO comments on the registration flow ... Add some notes to Signup and the Registration component that it would be nice to factor out some common code someday.	2016-10-12 14:27:21 +01:00
Richard van der Hoff	1a81397d31	InteractiveAuthDialog ... A dialog which will take the user through an interactive-auth process	2016-10-12 08:23:28 +01:00
Richard van der Hoff	5c18a9ccca	Interactive auth for device delete	2016-10-12 08:23:08 +01:00
Richard van der Hoff	eb36509620	Refactor CaptchaForm to put less logic in signupstages ... A bunch of work being done in the Recaptcha signupstage makes more sense in the CaptchaForm; let's move it.	2016-10-11 18:57:51 +01:00
Richard van der Hoff	78c3d5943a	Fix a load of warnings in the tests ... Stub things out to make the tests not throw warnings, so we can see the actual problems.	2016-10-11 14:20:40 +01:00
David Baker	3756add402	Merge pull request #502 from matrix-org/dbkr/join_3p_location ... Move 'show join button' functionality out	2016-10-05 14:00:14 +01:00
Matthew Hodgson	9d303712f2	more s/Vector/Riot/	2016-10-03 10:18:43 +01:00
David Baker	91771ec17d	Ce n'est pas Python	2016-10-01 10:34:21 +01:00
David Baker	6abf6c9ec0	Merge pull request #505 from matrix-org/dbkr/dont_replacestate ... Fix version going blank after logging in	2016-09-30 14:32:01 +01:00
David Baker	be99f17ee0	Oops, right variable	2016-09-30 14:05:01 +01:00
David Baker	8aeb0cfb68	Dedicated function for resetting screen state	2016-09-30 11:56:32 +01:00
David Baker	c41a8da4be	Argh, there's more	2016-09-30 11:40:27 +01:00
David Baker	2f7366cb8a	Comment state fields	2016-09-30 11:37:50 +01:00
Richard van der Hoff	dca19a4940	Merge pull request #506 from matrix-org/dbkr/sign_in_not_log_in ... Use 'Sign In' / 'Sign Out' universally	2016-09-30 11:30:00 +01:00
Richard van der Hoff	302074c71f	Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined ... Prevent error when clicking 'log in'	2016-09-30 11:04:18 +01:00
Matthew Hodgson	ca5204c3f8	fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381	2016-09-30 00:17:52 +01:00
David Baker	d5af2d2c52	Use 'Sign In' / 'Sign Out' universally ... Rather than a mix of 'sign in/out' and 'log in/out'	2016-09-29 17:38:52 +01:00
David Baker	8cbddfcf28	Fix version going blank after logging in ... Don't use replaceState in MatrixClient: there's lots of stuff in MatrixClient's state now (including the app version) so replacing the entire state doesn't really make sense (and also blows away all of the nice defaults we set in getInitialState). Instead, setState of the things we actually care about wherever we used replaceState. Also add a couple of state variables to getInitialState that were missing. Fixes https://github.com/vector-im/vector-web/issues/2322	2016-09-29 17:23:07 +01:00
David Baker	7b28dde263	Prevent error when clicking 'log in' ... If you joined a room before clicking 'log in', it would throw an exception here and break.	2016-09-29 16:57:10 +01:00
David Baker	60ce49910a	Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper ... Make RTE mode use the new Markdown wrapper class	2016-09-29 15:33:18 +01:00
David Baker	9a633ee449	Move 'show join button' functionality out ... And have it as a prop to the directory search box instead, so the room directory can do more complex logic.	2016-09-29 15:05:15 +01:00
Matthew Hodgson	b366973151	let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585	2016-09-27 23:39:25 +01:00
David Baker	b9576754e6	Nomenclature	2016-09-27 14:50:18 +01:00
Richard van der Hoff	30ce35c3b4	Merge pull request #498 from matrix-org/dbkr/fast_lgm ... Bring back the little green men without slowness	2016-09-27 11:28:48 +01:00
David Baker	690309adfc	Bring back the little green men without slowness ... Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.	2016-09-26 18:02:14 +01:00
David Baker	2e1644877d	Merge pull request #496 from matrix-org/dbkr/directory_search_box ... Directory search join button	2016-09-26 15:38:45 +01:00
David Baker	ba090a1198	Trailing .+ was redundant	2016-09-26 15:13:57 +01:00
David Baker	9333f91533	Give react callbacks underscores too	2016-09-26 14:29:12 +01:00
David Baker	2dd0165bfc	Correct regex for hash at the start	2016-09-26 14:24:35 +01:00
David Baker	bbfc05b0c0	Fix name of text emote sending & fix tests	2016-09-26 10:20:56 +01:00
Matthew Hodgson	40ba1ff5aa	disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343	2016-09-24 00:43:46 +01:00
David Baker	bf037ed6c7	Add comment	2016-09-23 19:09:32 +01:00
David Baker	db3f0d298a	Make RTE mode use the new Markdown wrapper class ... Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode	2016-09-23 18:50:25 +01:00
David Baker	fa193e775a	Implement join button appearing ... Also switch input to controlled so we re-render when it changes so we can show/hide the join button	2016-09-23 16:34:47 +01:00
David Baker	eb5b175213	Layout to support less hardcoded CSS	2016-09-23 15:58:11 +01:00
David Baker	b1e4c911eb	WIP omnipresent join button	2016-09-23 15:25:38 +01:00
David Baker	6281d76ade	Merge remote-tracking branch 'origin/develop' into dbkr/directory_search_box	2016-09-23 14:43:13 +01:00
David Baker	d0a15975c8	Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive ... Make markdown less aggressive	2016-09-23 14:31:20 +01:00
David Baker	61b48a5b1a	Add component for the directory search box	2016-09-23 13:48:24 +01:00
Richard van der Hoff	dd2da20031	Add the deviceId back to memberdeviceinfo ... It was removed by @ara4n in 5fa5489, but it's still useful!	2016-09-22 19:28:50 +01:00
Richard van der Hoff	2f7b4f74fd	Move the device verification buttons to their own class ... Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog for utterly no reason and breaking everything	2016-09-22 19:24:09 +01:00
David Baker	de0c92dadf	Remove unused code	2016-09-22 18:37:14 +01:00
David Baker	6c7259eec8	Better detection of when input contains markdown	2016-09-22 17:18:12 +01:00
David Baker	898fbcee30	Merge pull request #489 from aviraldg/fix-2128 ... Force-hide autocomplete after sending message.	2016-09-22 10:49:23 +01:00
David Baker	b83d1db24a	Missed some Vectors	2016-09-21 14:03:35 +01:00
David Baker	5fa67d9617	Merge pull request #490 from matrix-org/rav/encrypted_event_dialog ... EncryptedEventDialog updates	2016-09-21 10:52:22 +01:00
Richard van der Hoff	2842506b27	EncryptedEventDialog updates ... * Separate info on the event from info on the device, and add a couple of new fields. * Use MatrixClient.getEventSenderDeviceInfo (requires https://github.com/matrix-org/matrix-js-sdk/pull/214) * Don't force a download of the device keys every time we open the dialog * Fix a react warning if the device query takes a while	2016-09-21 10:36:23 +01:00
Aviral Dasgupta	f171985e4c	Fix click-to-complete in RTE ... Closes vector-im/vector-web#2179	2016-09-21 07:40:48 +05:30
Aviral Dasgupta	44217422d0	Force-hide autocomplete after sending message. ... Fixes vector-im/vector-web#2128	2016-09-21 07:28:07 +05:30
David Baker	d1a5e54a69	Check if a room looks like a DM rooms on joining ... and mark it as one if so. Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.	2016-09-20 17:59:46 +01:00
David Baker	b66c449bd7	Comment typo ... and out comment in more sensible place	2016-09-20 16:08:11 +01:00
Matthew Hodgson	a2904ad33f	fix 'new chat' layout bug	2016-09-20 10:06:57 -04:00
David Baker	746aad9a18	Oops, missed one	2016-09-19 14:47:08 +01:00
David Baker	c40a7a696e	Merge pull request #485 from matrix-org/dbkr/riot ... Rebrand	2016-09-19 13:36:55 +01:00
David Baker	31753fc3f3	Rebrand	2016-09-19 13:26:59 +01:00
Matthew Hodgson	b348cf1244	actually apply scalar CSS :(	2016-09-19 07:01:46 -04:00
Matthew Hodgson	7691559e01	more disclaimer	2016-09-17 22:07:43 +01:00
Matthew Hodgson	53bb6b96ce	don't warn when disabling crypto	2016-09-17 21:56:10 +01:00
Matthew Hodgson	5fa5489bbd	disambiguate devices by ID in memberinfo	2016-09-17 20:12:56 +01:00
Matthew Hodgson	6e57faecb0	trim whitespace when adding to list	2016-09-17 16:14:02 +01:00
Matthew Hodgson	da85df9d1a	let comma trigger autocomplete. hook up backspace. search displaynames that include space	2016-09-17 15:21:08 +01:00
Matthew Hodgson	88273e8065	move admin tools to the top	2016-09-17 15:07:41 +01:00
Matthew Hodgson	cf1b1442eb	no labs for guests	2016-09-17 14:29:40 +01:00
Matthew Hodgson	0046ae50b5	switch to 3-digit formatting for counts	2016-09-17 02:39:19 +01:00
Matthew Hodgson	671eacaac7	fix self/this crash, and don't let guests invite	2016-09-17 02:05:27 +01:00
Matthew Hodgson	736b6dac7a	default labs correctly :/	2016-09-17 00:54:56 +01:00
Matthew Hodgson	cfba600961	Merge pull request #482 from aviraldg/fix-2165 ... Replace <p>s with <br/>s consistently	2016-09-16 22:46:41 +01:00
Matthew Hodgson	00d2fd471d	Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom ... Add 'startAtBottom' flag	2016-09-16 22:38:21 +01:00
Matthew Hodgson	c322a191af	turn on E2E and Scalar by default	2016-09-16 18:36:03 +01:00
Matthew Hodgson	08543a66c4	fix race between setting canonical alias and creating aliases	2016-09-16 18:01:14 +01:00
David Baker	d0fd6e985f	Document paranoia on the startAtBottom param	2016-09-16 17:48:08 +01:00
Matthew Hodgson	67565f88fa	Merge pull request #474 from matrix-org/markjh/olm_version ... Add the olm version to the settings page.	2016-09-16 17:30:35 +01:00
David Baker	806ef11fde	Add 'startAtBottom' flag ... Controls whether a scrollPanel starts off at the bottom. This may not be necessary and could either be derived from stickyBottom, but this means I can be sure that the behaviour of ScrollPanel is completely unchanged for all other uses to avoid breaking any other uses of ScrollPanel.	2016-09-16 17:18:58 +01:00
Aviral Dasgupta	6befb09509	Replace <p>s with <br/>s consistently ... Also, allow newlines in /commands. Fixes vector-im/vector-web#2114, vector-im/vector-web#2165.	2016-09-16 21:40:00 +05:30
David Baker	1341ffca59	Merge pull request #479 from matrix-org/dbkr/directory_network_selector ... Pass through config for Room Directory	2016-09-16 17:08:44 +01:00
Matthew Hodgson	a28aab42c4	fix NPE in guest access	2016-09-16 16:45:43 +01:00
Matthew Hodgson	e1bd97d509	don't try to set DM data for guests	2016-09-16 16:15:34 +01:00
Matthew Hodgson	b852756332	DM title	2016-09-16 14:35:43 +01:00
Matthew Hodgson	2b9258d377	use new rawDisplayName in AddressTile	2016-09-16 03:19:33 +01:00
Matthew Hodgson	2c7c382d56	stop continuations leaking on filepanel	2016-09-16 02:40:09 +01:00
Matthew Hodgson	ff00474aa5	show RightPanel when people click on users	2016-09-16 02:37:06 +01:00
Matthew Hodgson	8519756c8c	add dialog keyboard shortcuts.	2016-09-16 02:26:17 +01:00
Matthew Hodgson	eeb01563f8	add dialog keyboard shortcuts. download keys on demand	2016-09-16 02:26:09 +01:00
Matthew Hodgson	77595320a7	close the RoomSettings when you close Scalar	2016-09-15 22:56:12 +01:00
Matthew Hodgson	3fcea1bfc7	only apply verified css to genuinely verified tiles	2016-09-15 22:56:12 +01:00
Matthew Hodgson	c21309fdf6	remove stale state	2016-09-15 22:56:12 +01:00
Matthew Hodgson	b98c2ae25e	update crypto state of the room in realtime when turned on	2016-09-15 19:25:53 +01:00
David Baker	44fa851275	Pass through config for Room Directory	2016-09-15 17:18:53 +01:00
Matthew Hodgson	1899d61893	textual event for m.room.encryption	2016-09-15 17:01:02 +01:00
Matthew Hodgson	db66d728c9	more e2e disclaimers	2016-09-15 16:38:37 +01:00
Matthew Hodgson	70011410cf	Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning ... Wmwragg/correct incoming call positioning	2016-09-15 15:59:06 +01:00
wmwragg	d3f50dc2da	Tweaking the positoning of the incomingCallBox	2016-09-15 15:33:08 +01:00
Matthew Hodgson	2bd408983d	Merge pull request #475 from matrix-org/wmwragg/remove-old-filter ... Wmwragg/remove old filter	2016-09-15 15:01:19 +01:00
wmwragg	45f17eb973	Added incomingCallBox to header and removed from roomTile	2016-09-15 14:39:34 +01:00
wmwragg	54a65f8bd7	Corrected onKeyUp misstype and return can now be used instead of clicking the button	2016-09-15 12:17:32 +01:00
wmwragg	27456d0e20	Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog	2016-09-15 11:46:06 +01:00
wmwragg	faa39eb482	Removed the nolonger used InviteMemberList	2016-09-15 11:39:59 +01:00
Mark Haines	c54b9c911f	Add the olm version to the settings page.	2016-09-15 11:31:54 +01:00
wmwragg	0d4eb4d22c	Removed all the InviteMemberList from the MemberList, and added a srearch box	2016-09-15 11:31:49 +01:00
Matthew Hodgson	f95a74951e	label device IDs	2016-09-15 02:49:25 +01:00
Matthew Hodgson	ce655c7f50	improve device info	2016-09-15 02:44:55 +01:00
Matthew Hodgson	8bda0bb095	basic verification UI	2016-09-15 01:55:51 +01:00
Matthew Hodgson	d8770b2b41	oops	2016-09-15 00:49:10 +01:00
Matthew Hodgson	499783d697	hide room settings when you launch scalar if you haven't made changes	2016-09-15 00:43:38 +01:00
Matthew Hodgson	1a126fee54	Merge pull request #473 from matrix-org/wmwragg/multi-invite-bugfix ... Wmwragg/multi invite bugfix	2016-09-14 22:06:28 +01:00
Matthew Hodgson	acd999be45	better describe keys	2016-09-14 18:23:14 +01:00
wmwragg	6a91948469	Removed the Email (Invite by email) section	2016-09-14 18:01:07 +01:00
wmwragg	a06896f96c	Added the room name to the error message	2016-09-14 16:28:44 +01:00
wmwragg	435570a022	Better error reporting for failed multi invites	2016-09-14 16:19:09 +01:00
wmwragg	75c9f707e0	Don't show current user in queryList	2016-09-14 15:35:04 +01:00
wmwragg	d3a709f98e	Missed a _isDmChat call when refactoring	2016-09-14 15:19:57 +01:00
wmwragg	c3566e0b49	_isDmChat needs to check the passed in addrs rather than the state.inviteList as they may now differ	2016-09-14 15:17:29 +01:00
wmwragg	a7a81c8a32	A manual address doesn't have to be converted to an address tile before it can be used if it is the still in the input field when the start/invite button is pressed	2016-09-14 15:09:23 +01:00
wmwragg	2a8518b72b	Tab can now be used for selection of address from list, as well as adding a manual mxid or email address	2016-09-14 14:53:13 +01:00
Matthew Hodgson	2752d6b444	improve e2e and scalar settings UI	2016-09-14 02:07:37 +01:00
Matthew Hodgson	0473b14564	fix e2e icon transitions	2016-09-14 01:25:43 +01:00
Matthew Hodgson	fd707f6f62	s/Direct Messages/People/	2016-09-13 19:47:41 +01:00
Matthew Hodgson	8508e006f0	Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite ... Wmwragg/chat multi invite	2016-09-13 19:30:02 +01:00
Matthew Hodgson	17cf2fc745	Merge pull request #470 from matrix-org/matthew/right-panel-collapse ... Matthew/right panel collapse	2016-09-13 19:09:18 +01:00
Matthew Hodgson	eb6a4f97ba	make it work	2016-09-13 19:00:35 +01:00
wmwragg	7fa102998c	Added valid but unknown mx user	2016-09-13 17:09:40 +01:00
David Baker	283e1ccf4c	Merge pull request #468 from matrix-org/dbkr/create_room_modal ... Add modal dialog on new room button	2016-09-13 17:05:24 +01:00
David Baker	5450e93df1	Verbiage	2016-09-13 16:56:53 +01:00
David Baker	f82629aed0	Merge pull request #463 from matrix-org/dbkr/flag_incoming_dms ... Flag incoming DMs as such	2016-09-13 16:42:24 +01:00
David Baker	3741768a3a	Add modal dialog on new room button ... https://github.com/vector-im/vector-web/issues/2178	2016-09-13 16:40:15 +01:00
wmwragg	890100a5bc	Silly mistake fixed, spotted by Dave (cheers)	2016-09-13 16:28:35 +01:00
Matthew Hodgson	8bb9422907	Merge pull request #466 from aviraldg/feature-autocomplete-behaviour ... Improve autocomplete behaviour	2016-09-13 16:17:23 +01:00
wmwragg	272dd82b9d	Added multi invite functionality	2016-09-13 16:06:04 +01:00
wmwragg	2db8f4ae67	Added pass through of roomId	2016-09-13 14:30:37 +01:00
wmwragg	ca1bb0f700	Added new Invite button in the RHS footer which calls the new 'view_invite' action	2016-09-13 14:28:03 +01:00
Aviral Dasgupta	79e5e6f6fe	Fix force completion and hide rooms with no alias	2016-09-13 18:02:33 +05:30
Matthew Hodgson	32b1b6f58a	WIP	2016-09-13 13:12:45 +01:00
Matthew Hodgson	c8def540c4	Merge pull request #464 from remram44/remove-mdown-breaks ... Remove markdown line breaks	2016-09-13 13:11:18 +01:00
Aviral Dasgupta	9a991a4dfd	Autocomplete fixes and improvements	2016-09-13 17:30:29 +05:30
wmwragg	538b68a6b2	Updated with the new createRoom DM stuff	2016-09-13 12:47:31 +01:00
wmwragg	524eeaa315	Merge up from develop	2016-09-13 12:37:52 +01:00
Matthew Hodgson	3b52081092	wip for collapsable RHS	2016-09-13 12:18:22 +01:00
Aviral Dasgupta	fbf2d5f96c	Fix tests (wip)	2016-09-13 16:46:20 +05:30
wmwragg	cba76d651a	Moved the isValidAddress method to the Invite utilty object	2016-09-13 12:12:33 +01:00
wmwragg	0b267763e2	Small refactor to handle Direct Message chat as well as multi invite chat	2016-09-13 12:07:49 +01:00
Aviral Dasgupta	b62622a814	Improve autocomplete behaviour ... Fixes vector-im/vector-web#1761	2016-09-13 15:46:02 +05:30
wmwragg	ca2ba55288	Added error checking, and UI	2016-09-13 11:02:59 +01:00
wmwragg	99dfcb4ed2	It's no longer a onde to one chat dialog, as you can invite multiple people	2016-09-13 10:33:15 +01:00
wmwragg	a7ea193189	A supplied roomId property, will make the dialog use that room for the invites, rather than creating a new one	2016-09-13 10:29:17 +01:00
Matthew Hodgson	ce40fa1a8f	add missing dialog	2016-09-12 23:43:00 +01:00
Matthew Hodgson	9b7ab46a72	dedicated dialog box for E2E messages	2016-09-12 23:42:24 +01:00
Remi Rampin	8cab40d987	Disable markdown line breaks ... Stop combinations of - and _ turning into a line break.	2016-09-12 17:51:59 -04:00
Matthew Hodgson	5a548c3d12	add an onclick to the e2e icons	2016-09-12 18:50:52 +01:00
David Baker	2943db1072	Flag incoming DMs as such ... * Add the 'is_direct' flag to rooms created for DMs * For invites, look for the DM flag when getting the DM user ID for a room * When accepting an invite, look for the flag and mark the room as a DM room if appropriate.	2016-09-12 18:32:44 +01:00
David Baker	e49547eb3e	Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms ... Don't re-use parted rooms for DMs	2016-09-12 18:30:55 +01:00
David Baker	f6478f111a	Merge pull request #458 from matrix-org/dbkr/createdoom_dm ... Update createRoom to support creating DM rooms	2016-09-12 18:29:43 +01:00
wmwragg	0f720dd6b8	Oops, toLowerCase call in wrong place	2016-09-12 17:41:32 +01:00
wmwragg	96299e864a	Need cto push the actual userId not the toLowerCase version, as userId's are case sensitive	2016-09-12 17:38:32 +01:00
Matthew Hodgson	13eed6cd39	fix NPE in EventTile	2016-09-12 17:29:26 +01:00
wmwragg	5a0a72ee46	Added styling for unknown addresses	2016-09-12 17:25:14 +01:00
wmwragg	95d9df7534	Make an invalid mx user an unknown user AddressTile	2016-09-12 17:15:56 +01:00
wmwragg	44b8c29c84	Allow addresses to be added as text when space or comma are pressed	2016-09-12 17:06:43 +01:00
wmwragg	5b2cc555a3	Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId	2016-09-12 16:52:04 +01:00
Matthew Hodgson	9eae1c5bb7	final e2e icons	2016-09-12 16:51:19 +01:00
David Baker	937e195157	Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm	2016-09-12 16:44:44 +01:00
Matthew Hodgson	8e7b1820b9	unbreak video thumbs	2016-09-12 16:28:39 +01:00
David Baker	6ffa7c23cd	Don't re-use parted rooms for DMs	2016-09-12 16:05:51 +01:00
wmwragg	e28a3f10a0	Don't allow someone who is already on the invite list to appear in the AddressSelector	2016-09-12 15:48:32 +01:00
wmwragg	4836025a1d	First pass at adding multiple addresses, can only add from AddressSelector at the moment	2016-09-12 15:21:17 +01:00
wmwragg	5acdb8233b	The dismiss function now correctly deletes the dismissed element. Also the query render, will now render all invitees	2016-09-12 15:04:32 +01:00
wmwragg	d538377b82	Added an inviteList state to hold all the users to invite, but currently pretend it only has one users (the first one)	2016-09-12 14:48:00 +01:00
wmwragg	7d58968ea6	Correctly positioning the selected element if list shrinks in size	2016-09-12 14:07:51 +01:00
wmwragg	28dcbb2a78	Refactored the queryList into seperate AddressSelector component	2016-09-12 13:00:44 +01:00
Matthew Hodgson	3a1159ce12	e2e look & feel	2016-09-12 01:37:51 +01:00
Matthew Hodgson	e6b4b8c1cb	bring back small avatars for info msgs otherwise the design breaks	2016-09-11 23:01:20 +01:00
Matthew Hodgson	46205ad83c	back out small avatars for emotes for now as they conflict with the E2E artwork. ... they will be reintroduced once we have lozenges	2016-09-11 22:49:05 +01:00
Matthew Hodgson	83209197f4	Merge branch 'develop' into matthew/notif-panel	2016-09-11 02:38:16 +01:00
Matthew Hodgson	34bb37aaba	layout for file & notif panel	2016-09-11 02:14:27 +01:00
Matthew Hodgson	bae6409edb	show badge menu on RoomTile hoverover	2016-09-11 00:30:43 +01:00
Matthew Hodgson	be33c35876	use new onRoomTimelineReset API to let notif timeline reset itself	2016-09-10 10:46:30 +01:00
Matthew Hodgson	6f270fd621	remove debug	2016-09-10 01:39:19 +01:00
Matthew Hodgson	86da0e0d63	Merge pull request #459 from VShell/fix-cas ... Fix CAS support by using a temporary Matrix client	2016-09-09 21:19:19 +01:00
Shell Turner	1380bf705a	Fix CAS support by using a temporary Matrix client ... Signed-off-by: Shell Turner <cam.turn@gmail.com>	2016-09-09 21:01:10 +01:00
David Baker	96fabe09d2	Update createRoom to support creating DM rooms ... * Make ChatInviteDialog and MemberInfo createRoom use it * Fix bug in setDMRoom	2016-09-09 19:25:00 +01:00
David Baker	9cff4d59ca	Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section ... Don't always show DM rooms in Direct Messages	2016-09-09 17:35:02 +01:00
David Baker	78f53bd403	Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms ... Add DM rooms with that person to the MemberInfo panel	2016-09-09 17:30:32 +01:00
David Baker	4c5db7cc9f	Don't always show DM rooms in Direct Messages ... Favourites belong in favourites & parted ones belong in Historical, etc.	2016-09-09 17:23:15 +01:00
Matthew Hodgson	fed3f48297	Merge pull request #452 from aviraldg/test-rte ... Add some tests for the rich text editor	2016-09-09 17:16:04 +01:00
David Baker	6f2e0a4cdf	Make rooms in MemberInfo update when necessary ... Factor out the chunk of code that looks through a read receipt event to see if it contain a read receipt from a given user, now we use it in 2 places.	2016-09-09 16:59:59 +01:00
David Baker	590d6d3ee8	Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms	2016-09-09 16:22:48 +01:00
David Baker	aa0f15c46e	List common rooms in MemberInfo	2016-09-09 16:15:01 +01:00
Matthew Hodgson	4de0e19ef3	Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators ... Wmwragg/one to one indicators	2016-09-09 15:08:48 +01:00
wmwragg	a6b0a7d5dc	Should supply the roomId	2016-09-09 15:01:40 +01:00
wmwragg	17b75a589f	Added the little green men for direct message rooms	2016-09-09 14:36:51 +01:00
Aviral Dasgupta	fec1e4d4c1	Add some tests for the rich text editor	2016-09-09 18:07:42 +05:30
Richard van der Hoff	b724b0c6b6	Update MemberDeviceInfo display ... Show the displayname when we have it Show the deviceid in a tooltip Show the Ed25519 public key to help verify	2016-09-09 11:41:56 +01:00
Matthew Hodgson	904348e62a	Merge branch 'develop' into matthew/notif-panel	2016-09-09 11:12:52 +01:00
Matthew Hodgson	dce2dd36ec	Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat ... Wmwragg/one to one chat	2016-09-09 10:46:11 +01:00
wmwragg	840bfe84c1	Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters	2016-09-09 06:57:30 +01:00
Matthew Hodgson	db61d8e8ad	another null check	2016-09-09 02:28:14 +01:00
Matthew Hodgson	f4d939da81	null checks on room in onRoomTimeline	2016-09-09 02:09:12 +01:00
Matthew Hodgson	4aef352a5c	update to use new API based on js-sdk PR input	2016-09-08 22:48:44 +01:00
Matthew Hodgson	3c7864a7ad	remove unused _gatherTimelinePanelRef	2016-09-08 14:52:08 +01:00
Matthew Hodgson	f88ba9df11	fix comment & use room.getUnfilteredTimelineSet()	2016-09-08 14:38:34 +01:00
David Baker	c9475e2ae5	Merge pull request #449 from matrix-org/dbkr/toggle_dm_room ... API for (un)marking rooms as DM rooms	2016-09-08 14:11:22 +01:00
Matthew Hodgson	b0a4b017c3	Merge pull request #440 from aviraldg/feature-rte-formatbar ... Formatting toolbar for RTE message composer.	2016-09-08 13:54:26 +01:00
wmwragg	d1974a75fd	Only Direct Message rooms, that aren't parted or forgotten are used	2016-09-08 13:09:54 +01:00
wmwragg	d0523cae70	If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one	2016-09-08 11:45:09 +01:00
Aviral Dasgupta	8da7b98ad0	RTE: Remove dead code, fix <del> styling	2016-09-08 11:21:39 +05:30
Matthew Hodgson	c882d66b0d	make NotificationPanel work	2016-09-08 03:02:31 +01:00
Matthew Hodgson	7174648f94	don't show RRs if manageRRs is false	2016-09-08 03:01:38 +01:00
Matthew Hodgson	334564c814	unbreak tests	2016-09-07 22:54:38 +01:00
Matthew Hodgson	8f75bce29e	add fixmes	2016-09-07 22:54:37 +01:00
Matthew Hodgson	990d84df77	make FilePanel refresh when we switch rooms	2016-09-07 22:54:37 +01:00
Matthew Hodgson	e7074ef9af	apply FilePanel css and fix filtering	2016-09-07 22:54:37 +01:00
Matthew Hodgson	e5dd2e0b46	make FilePanel work, superficially at least	2016-09-07 22:54:37 +01:00
Matthew Hodgson	b4c1eca1c5	fix key warning	2016-09-07 22:54:37 +01:00
Matthew Hodgson	e22d0a53b6	WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets	2016-09-07 22:54:37 +01:00
Matthew Hodgson	820cd579d8	fix stupid double-spacing issue	2016-09-07 22:54:37 +01:00
Matthew Hodgson	c3de035964	filepanel	2016-09-07 22:54:37 +01:00
Matthew Hodgson	ae34f2ed5c	placeholder NotificationPanel	2016-09-07 22:53:15 +01:00
Matthew Hodgson	d9ffe30a0d	WIP notif panel	2016-09-07 22:53:15 +01:00
Aviral Dasgupta	c11232742b	Fix focus and toggling issues in formatting bar	2016-09-08 02:46:56 +05:30
Aviral Dasgupta	8974442084	Hide empty autocomplete and remove word counter	2016-09-08 00:43:10 +05:30
Aviral Dasgupta	802ec1169f	Fix Markdown conversion to not add extra \n ... Fixes vector-im/vector-web#2094	2016-09-08 00:03:55 +05:30
Aviral Dasgupta	f0f20beae0	RTE format bar enhancements	2016-09-08 00:03:54 +05:30
Aviral Dasgupta	0c0c44b050	Formatting toggle, markdown indicator, quoting ... Fixes vector-im/vector-web#1825	2016-09-08 00:02:55 +05:30
Aviral Dasgupta	71251293e4	RTE formatbar (wip) ... Fixes vector-im/vector-web#2024	2016-09-08 00:02:16 +05:30
David Baker	ec4086c5fc	API for (un)marking rooms as DM rooms	2016-09-07 17:46:45 +01:00
wmwragg	7dfb8857d8	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-07 17:22:10 +01:00
wmwragg	ca3910f5a8	Mouse actions on the queryList added, as well as better queryListElement styling	2016-09-07 16:18:50 +01:00
David Baker	df1cc8748f	Change references to MatrixTools to Rooms ... or remove where they were unused	2016-09-07 11:33:58 +01:00
wmwragg	dd186dd612	Fixed wrong type to justified prop	2016-09-07 10:59:06 +01:00
wmwragg	7e60012bd4	Added justification for the AddressTile, when requested	2016-09-07 10:55:44 +01:00
David Baker	094080629d	Actually commit changed path	2016-09-07 10:19:39 +01:00
wmwragg	45256f5d58	Validation checks added	2016-09-06 17:46:00 +01:00
David Baker	d5b23e9e0e	Save guessed DM rooms to account data ... Also bugfix	2016-09-06 17:43:39 +01:00
wmwragg	52f050b5f9	Better scrolling UX, and fixed bug which created a room when no address supplied	2016-09-06 17:20:37 +01:00
wmwragg	c03f145f04	Basic keyboard scrolling of queryList	2016-09-06 17:00:28 +01:00
wmwragg	91b1c1f0fc	Initial highlighting selected address - styling not final	2016-09-06 16:39:50 +01:00
David Baker	8401323156	Hopefully read DM rooms from account data	2016-09-06 16:39:21 +01:00
wmwragg	d1398b137a	Circumventing autofill by using a textarea rather than an input type=text	2016-09-06 16:15:48 +01:00
wmwragg	0f73c4326e	Added scrolling to queryList	2016-09-06 15:46:58 +01:00
wmwragg	391fe0ab77	Basic address list created, and UX tweaks for interaction	2016-09-06 15:24:23 +01:00
wmwragg	ddf1e4841a	Selecting users with arrow keys added	2016-09-06 13:07:06 +01:00
wmwragg	1fe85f37fd	Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching	2016-09-06 11:34:38 +01:00
David Baker	50ef695740	Fix: conference rooms were no longer hidden	2016-09-05 17:42:22 +01:00
wmwragg	5ed680e5ce	Picking the top of the queryList not _userList, as the queryList is the query filtered _userList	2016-09-05 17:34:20 +01:00
wmwragg	3dd84e2b8a	Initial AddressTile added	2016-09-05 17:28:08 +01:00
wmwragg	d9c6448a0f	Adding better deafults and ErrorDialog message	2016-09-05 14:29:21 +01:00
wmwragg	3d66dff0aa	Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any	2016-09-05 14:16:21 +01:00
wmwragg	9c0f51fb82	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-05 12:06:31 +01:00
wmwragg	ca443e01d8	Initial commit of the new ChatInviteDialog	2016-09-05 12:03:16 +01:00
Richard van der Hoff	31e09e6137	Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user ... Make MemberInfo to use client.getStoredDevicesForUser	2016-09-05 10:38:24 +01:00
wmwragg	67c623d410	Rename the action to make it clearer what it is doing	2016-09-05 10:29:03 +01:00
Kegsay	6e2fd85760	Merge pull request #437 from matrix-org/kegan/starter-links ... Implement starter link support	2016-09-05 09:10:39 +01:00
Kegan Dougal	56ac0004e5	Use href='#' hack to make link text look like a link	2016-09-05 09:10:15 +01:00
Richard van der Hoff	fc40bdcbfc	Make MemberInfo to use client.getStoredDevicesForUser ... It's more powerful than listDeviceKeys, and isn't deprecated.	2016-09-05 00:08:16 +01:00
Richard van der Hoff	a316c652b7	Convert MemberDeviceInfo to ES6 class	2016-09-04 21:49:06 +01:00
wmwragg	f9ab2fa957	When zoomed in, the sticky headers should correctly position themselves	2016-09-04 08:01:04 +01:00
wmwragg	721baf8d42	Tolltip tweak to not require the passing in of the parent	2016-09-04 07:42:09 +01:00
Richard van der Hoff	bc8e7724e8	Make the 'encrypt this room' knob be megolm	2016-09-03 18:42:54 +01:00
wmwragg	03e74f48f8	Positioned Tooltip better	2016-09-03 13:44:44 +01:00
Matthew Hodgson	fdfd6ecfd9	let users join confs as voice or video	2016-09-03 13:27:46 +01:00
wmwragg	405dcf76eb	Further tweaks to the tooltip to better handle its position, and simplify it's use	2016-09-03 12:44:55 +01:00
wmwragg	bffefd9261	Tweak of the RoomTooltip to use DOM element for the parent rather than a React component	2016-09-02 18:41:44 +01:00
Matthew Hodgson	b5f9c2a5ac	Merge branch 'master' into develop	2016-09-02 17:17:24 +01:00
Matthew Hodgson	d5062f1ff7	gah, revert debug	2016-09-02 17:15:21 +01:00
Matthew Hodgson	fd664e893f	Merge branch 'master' into develop	2016-09-02 17:14:24 +01:00
Matthew Hodgson	6de2e8bda5	update changelog	2016-09-02 17:13:52 +01:00
Kegan Dougal	45ada1887d	Implement starter link support ... This involves modal dialogs because browsers are *terrible*.	2016-09-02 16:36:43 +01:00
Kegan Dougal	6ec7e5df28	Move scalar auth stuff to ScalarAuthClient from RoomSettings	2016-09-02 16:03:24 +01:00
wmwragg	4c05edb71b	Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari	2016-09-02 15:47:40 +01:00
Matthew Hodgson	f9d8829ba2	let you join confs either as voice or video	2016-09-02 15:38:28 +01:00
Richard van der Hoff	584c7ed56d	Merge branch 'rav/show_session_load_errors' into develop	2016-09-02 11:03:39 +01:00
Richard van der Hoff	b4521bc44c	review feedback	2016-09-01 22:45:09 +01:00
wmwragg	e7d4ef74d0	Placeholder for one to one chat dialog and functionality	2016-09-01 16:45:24 +01:00
Matthew Hodgson	031daf7b3c	Merge pull request #434 from matrix-org/matthew/uninterrupted-audio ... use a top-level audio tag for playing all VoIP audio.	2016-09-01 16:12:37 +01:00
Matthew Hodgson	f0d5f42921	whine loudly if remoteAudio element is missing	2016-09-01 13:58:26 +01:00
Richard van der Hoff	ba341c11fb	Show session restore errors on the login screen ... If we are unable to load the matrix session on startup, don't just get stuck at a spinner; instead, show the error on the login screen.	2016-09-01 11:08:40 +01:00
Matthew Hodgson	4829ac0c4d	comment	2016-09-01 11:07:46 +01:00
Matthew Hodgson	a23d8e313d	show ongoing audio call in LeftPanel	2016-09-01 00:13:32 +01:00
Matthew Hodgson	6c4ad49b78	use a top-level audio tag for playing all VoIP audio.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621	2016-08-31 21:50:46 +01:00
Matthew Hodgson	5543c126e6	fix tests	2016-08-30 15:22:52 +01:00
wmwragg	c30ff57c62	Better comments	2016-08-30 12:29:25 +01:00
wmwragg	8061a2f279	Fixed historical scetion not scrolling up when clicked if not hidden and stuck	2016-08-30 11:55:51 +01:00
wmwragg	769e7d3b2e	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-30 11:19:54 +01:00
wmwragg	83c4fd4b2f	Code clean up, and better comments	2016-08-30 10:45:17 +01:00
wmwragg	2b1ed707c4	Better comments, and correct bottom header sticky calc to allow clicking	2016-08-28 19:18:41 +01:00
wmwragg	123d9b56c8	calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars	2016-08-28 16:25:20 +01:00
Matthew Hodgson	5e105e1be6	make /user URLs work	2016-08-28 14:04:11 +01:00
wmwragg	8f7d3394e6	Always setup stickies, even if we aren't going to use them so that the following map can fire	2016-08-28 12:02:20 +01:00
wmwragg	7631539584	Fixed incorrect init calculation of originalPosition attribute	2016-08-28 11:39:47 +01:00
Matthew Hodgson	de82ac3bc0	don't change URL bar when clicking on linkified rooms or users. ... be aware of /user paths.	2016-08-28 02:05:31 +01:00
Matthew Hodgson	ad873c2b60	handle matrix.to links correctly. add partial support for #/user URLs	2016-08-28 01:55:42 +01:00
Matthew Hodgson	50d09f73f5	add leave/forget button to RoomSettings	2016-08-28 00:00:22 +01:00
Matthew Hodgson	fb5f8294c8	switch to namespaced CSS	2016-08-28 00:00:10 +01:00
Matthew Hodgson	5df98d70f4	add debugging to MemberAvatar to try to kick jenkins...	2016-08-27 01:18:48 +01:00
wmwragg	73dd05b01d	Corrected incorrect offset from top of window for the scrollArea	2016-08-26 18:31:02 +01:00
wmwragg	8ccb1d482a	Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck	2016-08-26 15:52:57 +01:00
wmwragg	5f9c794f0c	Tweaking autoscroll to only adjust if header stuck at top and not at bottom	2016-08-26 15:36:16 +01:00
wmwragg	b9e95865af	Click on stuck header scrolls to that header, collapses expands for none stuck header	2016-08-26 15:09:13 +01:00
wmwragg	71e829fd32	Getting click to not collapse expand when header is stuck	2016-08-26 14:36:39 +01:00
wmwragg	774e24a3b4	Added some logic to turn off sticky headers when the scroll area isn't large enough to support them	2016-08-26 11:01:04 +01:00
wmwragg	c8c2f733e2	Re-calculate sticky header positions when sublist header is clicked	2016-08-26 09:56:07 +01:00
wmwragg	7fcdd0f77a	Initial pass at sticky headers for the LHS panel section labels	2016-08-25 19:46:01 +01:00
Richard van der Hoff	c8b2d5106f	Merge pull request #430 from matrix-org/rav/fix_search_regression ... Fix NPE when we don't know the sender of an event	2016-08-25 19:31:16 +01:00
Richard van der Hoff	96567dad0d	Fix NPE when we don't know the sender of an event ... Fixes a bug introduced in https://github.com/matrix-org/matrix-react-sdk/pull/426. Particularly when we are showing search results, we may not recognise the sender of an event; attempting to create a MemberAvatar for it will lead to null-reference errors. Also a bit of untangling of the logic of needsSenderProfile. Since https://github.com/matrix-org/matrix-react-sdk/pull/422, EventTileType.needsSenderProfile was only being called on MessageEvents, and therefore only returned true. It's a shame to see all this logic going into EventTile rather than the individual EventTileTypes, but since it's there, let's not leave the unused logic lying around in the EventTileType implementations.	2016-08-25 16:55:09 +01:00
Matthew Hodgson	36d8fa9786	fix avatar clicking in memberinfo	2016-08-25 16:20:38 +01:00
Richard van der Hoff	c1db6fb42d	Merge pull request #429 from matrix-org/rav/timelinepanel_test ... Update annoying TimelinePanel test	2016-08-25 15:40:03 +01:00