element-web

mirror of https://github.com/element-hq/element-web.git synced 2024-12-21 18:34:25 +03:00

Author	SHA1	Message	Date
David Baker	276c7a9c4d	Fix blank sticker picker Let the battle of z-indexes commence https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29	2018-06-18 15:24:34 +01:00
David Baker	94125fb566	Fix widgets re-appearing after being deleted Widgets would sometimes briefly re-appear after having been deleted. This was because of the following race: * User presses delete, send POST req, we set `deleting`. Widget hides. * POST request completes, we unset `deleting` so widget unhides. * State event comes down sync so widget hides again. This fixes this by introducing `waitForRoomWidget` and using it to wait until the state event comes down the sync until clearing the `deleting` flag. Since we now have `waitForRoomWidget`, this also uses it when adding a widget so the 'widget saved' appears at the same time the widget does.	2018-06-13 15:50:19 +01:00
Michael Telatynski	ffec32c7d9	Merge pull request #1943 from akihikodaki/react Import react as React in src/components/views/elements/DNDTagTile.js	2018-06-06 10:08:52 +01:00
Akihiko Odaki	bf0d03bce3	Import react as React in src/components/views/elements/DNDTagTile.js Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>	2018-06-06 17:59:50 +09:00
Travis Ralston	254e8c358a	Remove unused imports Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-28 11:38:09 -06:00
Travis Ralston	98613748b6	Move Scalar Widget URL check to WidgetUtils Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-27 11:12:55 -06:00
Travis Ralston	23162c8625	Support third party integration managers in AppPermission Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL). Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-27 10:56:50 -06:00
Matthew Hodgson	3bf28a08ec	experiments in dharma	2018-05-25 03:17:29 +01:00
Richard Lewis	b2c26e6984	Merge pull request #1920 from matrix-org/rxl881/refreshWidget Add a "reload widget" button.	2018-05-24 18:11:22 +01:00
Richard Lewis	9753ee8d82	Better check of jitsi widget message origin.	2018-05-24 16:14:18 +01:00
Richard Lewis	a13d58f6c2	More thorough check of IM URL validity.	2018-05-24 14:58:59 +01:00
Luke Barnard	ef686a966d	Add cookie warning to widget warning (AppPermission)	2018-05-23 10:46:32 +01:00
Richard Lewis	6df3371c6c	Add a "reload widget" button.	2018-05-22 19:14:54 +01:00
Luke Barnard	31dcd85c08	Add customisable cancel button to QuestionDialog	2018-05-22 15:45:58 +01:00
Matthew Hodgson	4972a234c4	Merge branch 'develop' into matthew/slate	2018-05-19 12:58:43 +01:00
Matthew Hodgson	b60ccad29b	Merge branch 'develop' into matthew/slate	2018-05-15 01:00:07 +01:00
Luke Barnard	e596924074	Merge branch 'develop' into release-v0.12.4	2018-05-14 17:43:40 +01:00
Luke Barnard	ff0254d346	Fix ContextualMenu imports for TagTile and code block copy button	2018-05-14 17:36:57 +01:00
Luke Barnard	49a3770e92	Merge branch 'release-v0.12.4' into develop	2018-05-14 14:31:18 +01:00
Luke Barnard	cf8077e605	Set loading: false when iFrame finishes loading	2018-05-14 11:42:38 +01:00
Luke Barnard	6345e474f5	Remove unused conditional	2018-05-14 11:38:17 +01:00
Matthew Hodgson	c1000a7cd5	emojioneify the composer and also fix up the selectedness CSS for pills and emoji	2018-05-14 03:02:12 +01:00
Travis Ralston	9e11720191	Add setting to enable widget screenshots (if widgets declare support) Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-12 14:30:59 -06:00
Matthew Hodgson	f8fd90c559	Merge pull request #1889 from matrix-org/t3chguy/replies-html-tag T3chguy/replies html tag	2018-05-12 20:22:54 +01:00
Michael Telatynski	dbbcabfed8	switch from asymmetrical fallback form to a cleaner one `mx-reply` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-12 15:58:25 +01:00
Luke Barnard	9c5c5e282b	Send visibility only when changed, and messaging is available	2018-05-11 18:20:23 +01:00
Luke Barnard	a419056040	Delinting	2018-05-11 18:20:14 +01:00
Luke Barnard	06919e22d6	When stickerpicker made visible, send visibility over postMessage	2018-05-11 18:20:00 +01:00
Luke Barnard	bd0301c666	Add API to send visibiliy actions to widgets	2018-05-11 18:17:55 +01:00
Luke Barnard	42c59b5923	Make AppTile in Stickerpicker persistent using PersistedElement	2018-05-11 18:17:48 +01:00
Luke Barnard	06898394eb	Send visibility only when changed, and messaging is available	2018-05-11 18:06:58 +01:00
Luke Barnard	1f2f3474ed	Delinting	2018-05-11 17:28:12 +01:00
Luke Barnard	8b049b2182	When stickerpicker made visible, send visibility over postMessage	2018-05-11 16:51:03 +01:00
Luke Barnard	4b6378a80d	Add API to send visibiliy actions to widgets	2018-05-11 16:22:54 +01:00
Luke Barnard	746eeee33c	Make AppTile in Stickerpicker persistent using PersistedElement	2018-05-11 15:07:51 +01:00
Luke Barnard	770e2d400e	Improve appearance of short-lived app loading spinner by hiding it for 500ms - thereby only showing it if the loading is taking a long time.	2018-05-09 17:28:41 +01:00
Luke Barnard	97b9316ec7	Fix issue incorrect positioning with widget loading indicator by making sure to apply the correct CSS class to the parent	2018-05-09 17:28:18 +01:00
Luke Barnard	0c1846630c	Improve appearance of short-lived app loading spinner by hiding it for 500ms - thereby only showing it if the loading is taking a long time.	2018-05-09 16:54:01 +01:00
Luke Barnard	bcf003757c	Merge pull request #1884 from matrix-org/luke/fix-glitchy-widget-spinner Fix issue incorrect positioning with widget loading indicator	2018-05-09 16:52:11 +01:00
Luke Barnard	59cbaf67bb	Fix issue incorrect positioning with widget loading indicator by making sure to apply the correct CSS class to the parent	2018-05-09 15:48:53 +01:00
Richard Lewis	8e1ba6d139	Always allow users to edit their user widgets.	2018-05-08 22:44:49 +01:00
Michael Telatynski	97d344483e	fix thinko when changing from ClientPeg to context in static method (DUH Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-03 14:32:13 +01:00
Michael Telatynski	4892694e77	use more explicit reply fallback closing tag construct to fix 6657 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-03 11:24:10 +01:00
Michael Telatynski	f2102e283c	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-05-02 13:08:38 +01:00
Michael Telatynski	11ae0805b0	re-order ReplyThread methods for readability Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-01 17:42:58 +01:00
Luke Barnard	56ec7713bb	Refresh group rooms and members when selecting a tag	2018-05-01 16:54:14 +01:00
Michael Telatynski	bbce6eea5b	update comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-30 23:28:55 +01:00
Michael Telatynski	4021fc049c	re-arrange method order to group statics before instance methods Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-29 00:54:54 +01:00
Michael Telatynski	c00c52e537	added another comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-29 00:53:35 +01:00
Michael Telatynski	407be88c92	add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-29 00:51:39 +01:00
Michael Telatynski	5bb15b1002	simplify logic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-29 00:48:44 +01:00
David Baker	74651b93ab	Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog	2018-04-27 15:57:15 +01:00
David Baker	27b18c457e	Lint	2018-04-27 15:56:28 +01:00
David Baker	efd29193b7	Fix UX issues with bug report dialog * Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' & escape to cancel works) * Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous about submitting logs. * Continued campaign against 'Click here' links. Fixes https://github.com/vector-im/riot-web/issues/6622	2018-04-27 15:23:35 +01:00
David Baker	6d9e07580b	UI fixes in SessionRestoreErrorDialog * Make the 'delete my data' button not the default * Make it red * Give it a confirmation dialog * Remove the 'cancel' button: what does it mean to cancel an error? In this case, it tried again and almost certainly got the same error. * Remove the top-right 'x' and don't cancel on esc for the same reason. * Move 'send bug report' to a button rather than a 'click here' link * Add a 'refresh' button which, even if it's no more likely to work, will at least look like it's doing something (it's mostly so if you don't have a bug report endpoint, there's still a button other than the one that deletes all your data).	2018-04-27 12:38:49 +01:00
Michael Telatynski	2e29a0857b	improve stripPlainReply comment and fix leading NewLine Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 12:12:01 +01:00
Michael Telatynski	68dd57f56e	rename two methods Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:47:18 +01:00
Michael Telatynski	3050553fc2	rename and change getInReplyTo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:44:14 +01:00
Michael Telatynski	ca766df598	call onWidgetLoad on componentDidUpdate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:32:04 +01:00
Michael Telatynski	fdf63fd440	replace concat on comment from review Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:31:04 +01:00
Michael Telatynski	3ba9f560d4	get MatrixClient from context Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:30:47 +01:00
Michael Telatynski	88f48914b4	improve comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:28:17 +01:00
David Baker	f70096b8fa	Fix error handling on session restore Fix a number of failures that meant the excellent error handling we had for failing to restore a session didn't work. 1. .catch on the promise rather than try/catch: it's async 2. Explicit cancel method in SessionRestoreErrorDialog that invokes onFinished with `false` because even with the catch fixed, this was getting the event as its first arg which is truthy, so clicking cancel still deleted your data. 3. DialogButtons: Don't pass onCancel straight into the button event handler as this leaks the MouseEvent through as an argument. Nothing is using it and it exacerbates failures like this because there are surprise arguments. Fixes https://github.com/vector-im/riot-web/issues/6616	2018-04-26 17:07:58 +01:00
Richard Lewis	b2d6dd8f6e	Optionally hide widget popout button.	2018-04-25 16:28:27 +01:00
Richard Lewis	0f0e89d394	Add a button to 'pop out' widgets in to their own tab.	2018-04-25 12:49:30 +01:00
Michael Telatynski	941bb94234	fix reply fallback blunder Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 10:15:15 +01:00
Michael Telatynski	58cd585e86	start of BigMerge fixup Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:12:02 +01:00
Michael Telatynski	a90bd6cd4f	Allow collapsing ReplyThread from MessageContextMenu Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-13 12:28:58 +01:00
Matthew Hodgson	40a67ca8fe	point imports at the new locations	2018-04-13 00:43:44 +01:00
Michael Telatynski	c77807bd22	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/i18n/strings/en_EN.json # src/i18n/strings/eu.json # src/i18n/strings/fr.json # src/i18n/strings/lv.json # src/i18n/strings/ru.json # src/i18n/strings/zh_Hant.json	2018-04-12 09:48:06 +01:00
Matthew Hodgson	8ab8f76254	move non-Riot-specific components over from riot-web	2018-04-11 23:58:04 +01:00
Matthew Hodgson	2d8880ec5f	patch NPE on Pill when lazyloading members	2018-04-09 23:02:15 +01:00
David Baker	28bf76b319	Merge pull request #1824 from matrix-org/luke/fix-wrappedRef-warning Fix warning "Unknown prop `wrappedRef` on <div> tag..."	2018-04-05 17:49:35 +01:00
Luke Barnard	e20f223e78	Fix warning "Unknown prop `wrappedRef` on <div> tag..." GeminiScrollbar should not receive wrappedRef as a property, so remove it using object destructuring.	2018-04-05 17:39:25 +01:00
Richard Lewis	a41384a994	Fix function binding.	2018-04-04 23:45:47 +01:00
Michael Telatynski	1d90835de0	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/RoomView.js	2018-04-04 11:08:34 +01:00
Richard Lewis	f8f8bc469e	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot	2018-04-03 11:34:14 +01:00
Richard Lewis	aefccb134c	Ensure deleting is set to false.	2018-03-29 16:56:25 +01:00
Richard Lewis	4ac9653ab9	Refactor widget postMessage API.	2018-03-28 12:22:06 +01:00
Michael Telatynski	fac89d9c58	Merge branch 'develop' into t3chguy/m.relates_to	2018-03-28 08:38:33 +00:00
Luke Barnard	944940057e	Remember that React needs React	2018-03-27 13:04:26 +01:00
Luke Barnard	2ffcad0981	Convert GeminiScrollbarWrapper to stateless component	2018-03-27 13:04:26 +01:00
Luke Barnard	39e9d52c04	Make sure to proxy special prop `ref`	2018-03-27 13:04:26 +01:00
Luke Barnard	b80568b1c5	Wrap GeminiScrollbar in a component, enabled forceGemini Fixes https://github.com/vector-im/riot-web/issues/6294	2018-03-27 13:04:26 +01:00
Michael Telatynski	b5ed08eba2	Merge Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-24 17:52:49 +00:00
David Baker	580b68a1b6	Merge pull request #1652 from pvagner/dialog-a11y Dialog a11y	2018-03-20 11:35:57 +00:00
Michael Telatynski	661073493b	implement desired m.room.message->m.text fallbacks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-16 18:31:17 +01:00
Richard Lewis	4d8f5072f7	Allow react performance profiling on widget iframes.	2018-03-16 10:20:14 +00:00
Richard Lewis	66ea78de65	Clean up whitelisted permission addition / logging.	2018-03-13 11:59:15 +00:00
Richard Lewis	8b311c706c	Null guard widget listener	2018-03-13 11:58:47 +00:00
Richard Lewis	f820374f9f	Logging.	2018-03-13 11:01:51 +00:00
Richard Lewis	de33294000	Center loading spinner.	2018-03-13 10:07:49 +00:00
Richard Lewis	b2d23b6999	Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.	2018-03-12 13:56:02 +00:00
Michael Telatynski	14f29e4740	fix the bugs Tulir found - THANKS Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-09 23:37:42 +00:00
Richard Lewis	fdec4b36c9	Hide padding if last control.	2018-03-08 17:25:28 +00:00
Richard Lewis	3ab8b1f866	Hide sticker picker delete button and show minimise button.	2018-03-08 17:20:42 +00:00
Michael Telatynski	ed8f087eb6	fix access of element [0] of array even though it sometimes does not exist Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-06 15:17:57 +00:00
Richard Lewis	e2cedbe9d7	Pull in changes from develop	2018-03-05 16:43:59 +00:00
Michael Telatynski	df56a67fda	Add reply fallback and run gen-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-04 12:39:34 +00:00
David Baker	9a7a7ea2d6	Merge pull request #1784 from matrix-org/luke/fix-group-avatar-default-colour Fix varying default group avatar colour for given group	2018-03-01 15:56:33 +00:00
Luke Barnard	94c1baa25d	Fix varying default group avatar colour for given group	2018-03-01 15:42:22 +00:00
Luke Barnard	4037a22492	Fix bug where avatar change not reflected in LLP Fixes vector-im/riot-web#6189	2018-03-01 14:40:03 +00:00
Luke Barnard	567d83ba52	Update PowerSelector to support powerLevelKey prop As a key to send as second argument to onChange. This is useful when passing the same callback to multiple PowerSelectors.	2018-02-28 16:15:20 +00:00
Richard Lewis	2b0790b32b	Fix PropTypes.	2018-02-25 22:36:59 +00:00
Richard Lewis	b2bf4d4709	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot	2018-02-23 15:37:33 +00:00
Richard Lewis	d755b8284c	Remove logging and cleanup.	2018-02-23 15:22:56 +00:00
Richard Lewis	13bebd69c9	Made comment "react-style".	2018-02-21 23:35:57 +00:00
Richard Lewis	ecde099146	Fix typo.	2018-02-21 23:24:53 +00:00
Richard Lewis	7e8660cd37	Add comment for "is" attribute.	2018-02-21 23:23:44 +00:00
Richard Lewis	ffb524b6a5	Allow widget iframes to request camera and microphone permissions.	2018-02-21 23:10:08 +00:00
Michael Telatynski	90f9badbf3	s/Reply/ReplyThread/ Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-20 15:40:19 +00:00
Michael Telatynski	7048d85246	attach message_sent and replies to file uploads Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-19 23:42:04 +00:00
Michael Telatynski	6510989ac6	move unmounted init to willMount Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-19 14:28:31 +00:00
Michael Telatynski	8fa56f8c9a	update and improve comments Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-19 14:27:10 +00:00
Michael Telatynski	4c08c51044	Reply; delay call to onWidgetLoad until after async setState completes Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-16 21:24:42 +00:00
Michael Telatynski	0d6fc9bd3a	fix Composer focus after twiddling with Replies Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-16 21:17:41 +00:00
Michael Telatynski	f1a3592eff	fix 12/24h in Reply/ReplyPreview Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-16 21:14:03 +00:00
Michael Telatynski	2e3cbb309e	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-02-16 14:35:04 +00:00
Luke Barnard	a34fea8af8	Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu	2018-02-13 16:51:00 +00:00
Luke Barnard	db0ea9eb0e	Merge branch 'develop' into luke/room-list-flux	2018-02-13 10:18:24 +00:00
Luke Barnard	e3f68f12c8	Add context menu to TagTile With two options: View Community and Remove, which removes the tag from the panel.	2018-02-12 18:01:08 +00:00
Michael Telatynski	aeedf48d84	fix weird `in` op behaviour with null Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-11 11:45:13 +00:00
Michael Telatynski	7bf05b0715	add unmounted guard Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 16:01:19 +00:00
Michael Telatynski	25bc9cfbe7	make spinner size more appropriate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 15:47:32 +00:00
Michael Telatynski	7425d01b21	tidy, improve error handling and improve Replies, run gen-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 15:45:42 +00:00
Michael Telatynski	23c0daa83a	pass onWidgetLoad to fix console err for e2e Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:41:31 +00:00
Michael Telatynski	fbb950e064	mass s/Quote/Reply Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:38:25 +00:00
Michael Telatynski	18145460b2	fix Replies for e2e Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:31:22 +00:00
Michael Telatynski	1c3d8cbe6e	initial refactor of Replies to use `B` explicit over-the-wire format Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 11:19:43 +00:00
Richard Lewis	9e3c1fbc7a	Pass room name.	2018-02-09 11:44:27 +00:00
Richard Lewis	5e30468a00	Linting	2018-02-07 14:48:43 +00:00
Richard Lewis	7b75dbbd15	Use default AppTile menu bar.	2018-02-07 14:44:01 +00:00
Peter Vágner	14991afbe5	Merge branch 'develop' into dialog-a11y	2018-02-06 23:04:15 +01:00
Luke Barnard	cf4ae681f4	Offline mode (#1723 ) * Allow the client to run without connection to HS (i.e. using indexeddb) Allows running without having pushRules (it's safe not to have these when running from indexeddb sync.) This means rooms will be displayed with "unknown" notifcation state. This assumes anything that uses the push rules will get pushRule state again when the client starts syncing again. For recovering from being disconnected, * If an avatar has fallen back, try again on reconnection * If a thumbnail image failed to load, retry on reconnect * Load joined groups when reconnecting Update tests to give MELS a context.matrixClient	2018-02-06 17:50:53 +00:00
Luke Barnard	ff8fcb3139	Merge branch 'develop' into luke/room-list-flux	2018-02-05 11:39:39 +00:00
Michael Telatynski	6dd63ae644	Null guard against falsey (non-null) props.node, to make react happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-29 19:17:46 +00:00
lukebarnard	73e3a594ac	Prevent TagTiles from being dragged into other droppables for the time being at least.	2018-01-25 22:52:19 +01:00
Michael Telatynski	e3e3535072	delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 17:02:20 +00:00
Michael Telatynski	4490715b60	Merge branch 'develop' into t3chguy/rich_quoting_linear	2018-01-22 16:46:20 +00:00
Michael Telatynski	a6cefb83f8	basic error handling for malformed quotes Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 16:41:32 +00:00
Michael Telatynski	3b1d69edbb	Change Quotes to be linearly rendered rather than recursively nested Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 16:34:47 +00:00
lukebarnard	75a1922731	Fix linting	2018-01-19 14:07:13 +00:00
Matthew Hodgson	6c15bd8599	fix NPE when getGroupProfiles returns null	2018-01-19 10:39:38 +00:00
Richard Lewis	23bef68a8f	Fix duplicate message listeners	2018-01-18 13:16:06 +00:00
Richard Lewis	1293c53c4b	Cleanup	2018-01-18 12:02:45 +00:00
Richard Lewis	3331c8af27	Use dispatcher ref for unregister call.	2018-01-17 15:40:04 +00:00
lukebarnard	16c13fb079	Replace TagPanel react-dnd with react-beautiful-dnd This new library handles the simple case of an ordered vertical (or horizontal) list of items that can be reordered. It provides animations, handles positioning of items mid-drag and exposes a much simpler API to react-dnd (with a slight loss of potential function, but we don't need this flexibility here anyway). Apart from this, TagOrderStore had to be changed in a highly coupled way, but arguably for the better. Instead of being updated incrementally every time an item is dragged over another and having a separate "commit" action, the asyncronous action `moveTag` is used to reposition the tag in the list and both dispatch an optimistic update and carry out the request as before. (The MatrixActions.accountData is still used to indicate a successful reordering of tags). The view is updated instantly, in an animated way, and this is handled at the layer "above" React by the DND library.	2018-01-15 18:12:27 +00:00
Richard Lewis	5e6da4d758	* Fix key error * Remove redundant logging * Catch error	2018-01-15 14:22:41 +00:00
Richard Lewis	1ab71f6f50	Load stickers in AppTile	2018-01-11 13:20:58 +00:00
Richard Lewis	4f3670941d	Bind functions	2018-01-11 12:33:02 +00:00
Richard Lewis	d0c16fa7a1	Convert to ES6 class.	2018-01-11 11:49:46 +00:00
David Baker	292a6c5767	Merge pull request #1674 from aidalgol/rebase-dialogs Normalise dialogs	2018-01-11 10:49:40 +00:00
Michael Telatynski	1a7dc22a8d	make wantsDateSeparator generic and throw into DateUtils Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:06:24 +00:00
Michael Telatynski	1bc9d344ae	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/messages/TextualBody.js	2018-01-10 11:54:58 +00:00
Michael Telatynski	a977ab9be4	change handler name to suit convention Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 11:51:23 +00:00
Aidan Gauland	9365860075	Update copyright line	2018-01-09 18:40:12 +13:00
Richard Lewis	0577316c86	Fix duplicate event registration.	2018-01-08 13:40:33 +00:00
Richard Lewis	dc1423052f	De-register listener.	2018-01-08 11:32:23 +00:00
David Baker	5aed77c752	Merge pull request #1677 from aidalgol/PropTypes Remove use of deprecated React.PropTypes	2018-01-05 11:53:55 +00:00
Peter Vágner	cf472c791d	Consume all combinations of space / enter, keyDown / keyUp presses and try to explain this key handling inconsistency with some additional comments as per the review discussion.	2018-01-05 11:45:45 +01:00
Richard Lewis	54d128658e	Comment logging.	2018-01-04 23:00:10 +00:00
Richard Lewis	d20aebfbd7	Correctly handle sticker message events.	2018-01-04 18:58:55 +00:00
Richard Lewis	eb4053bc99	Handle sticker message payloads	2018-01-04 18:41:47 +00:00
lukebarnard	55bfff24c4	Fix forgotten rename during `d5e2a73d99`	2018-01-04 17:46:44 +00:00
lukebarnard	d495519986	Fix shift-ctrl-click isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys	2018-01-03 11:39:15 +00:00
lukebarnard	133837cdbe	Document initial state	2018-01-02 15:59:10 +00:00
lukebarnard	833cd321f3	Log warning in case of failed group profile fetch	2018-01-02 15:58:24 +00:00
lukebarnard	31855f18f8	Initialise profile state	2018-01-02 15:56:32 +00:00
lukebarnard	2cb4c897ce	Move `getInitialState` before `componentWillMount`	2018-01-02 13:45:19 +00:00
lukebarnard	3cb128094d	Add more comments to TagTile to explain what it is	2018-01-02 13:44:22 +00:00
lukebarnard	80f11e5c77	Comment tag PropType	2018-01-02 13:34:47 +00:00
Richard Lewis	a408b98504	Set widget ID on WidgetMessaging instance.	2017-12-29 14:34:52 +00:00
Richard Lewis	7660176079	Fix comment linting errors. Stop listening and cleanup endpoints correctly.	2017-12-28 22:27:12 +00:00
Aidan Gauland	35780f5ae0	Remove use of deprecated React.PropTypes Replace all uses of React.PropTypes with PropTypes and importing PropTypes from 'prop-types'.	2017-12-26 14:03:18 +13:00
Aidan Gauland	e4b86f0730	Fix use of deprecated module Use PropTypes from "prop-types" instead of the deprecated React.PropTypes submodule.	2017-12-26 11:55:15 +13:00
Aidan Gauland	45d86ea7ca	Add DialogButton component A component to normalise the buttons in dialogs.	2017-12-23 17:02:19 +13:00
Richard Lewis	baf472b4a3	Only show snapshot button when apps are maximised.	2017-12-19 17:16:38 +00:00
Richard Lewis	08bcfc5c4e	Make sure that capabilities array is initialised.	2017-12-19 17:15:06 +00:00
Michael Telatynski	47d4e5f8d1	nest quotes, but only when people want to click through them loads pre-emptively Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-18 19:28:01 +00:00
Michael Telatynski	9603b21199	s/Quote/Reply/ and ES6 tweaks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-17 20:20:45 +00:00
Richard Lewis	83f9a4162b	Request capabilities (e.g. ability to take snapshots) from widgets.	2017-12-16 09:16:24 +00:00
Richard Lewis	e63f5696a6	Screenshot handlers	2017-12-15 21:36:02 +00:00
Michael Telatynski	0ad0c0e9f7	finish i18n, and add a Date Sep to quote if it needs it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-15 18:39:01 +00:00
Luke Barnard	6f896098e3	Get Group profile from TagTile instead of TagPanel So that instead of getting all group profiles everytime the tags change order, get them when the TagTile mounts for a group tag.	2017-12-15 17:18:46 +00:00
Richard Lewis	f2ad7be3f3	Add event handlers and comments.	2017-12-15 16:56:02 +00:00
Richard Lewis	f410112983	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot	2017-12-15 10:18:56 +00:00
Luke Barnard	9975941f3c	Merge pull request #1653 from matrix-org/luke/feature-ordered-tag-panel DnD Ordered TagPanel	2017-12-14 10:36:16 +00:00
Peter Vágner	9f5857a7cc	Merge branch 'develop' into dialog-a11y	2017-12-14 11:04:59 +01:00
Richard Lewis	c739269777	Update widget title on edit.	2017-12-13 10:14:26 +00:00
Michael Telatynski	38e8488c2a	we don't actually use state.room Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-12 23:25:38 +00:00
Richard Lewis	c93266b6af	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar	2017-12-11 13:08:49 +00:00
Michael Telatynski	b6182f7e6c	Tidy Quote class, removing comments etc Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-10 12:54:19 +00:00
Michael Telatynski	0f85391587	Implement Rich Quoting/Replies Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-10 12:50:41 +00:00
Richard Lewis	24db57bfb6	Fix api prefix.	2017-12-08 18:47:00 +00:00
Matthew Hodgson	f2d68e4601	Merge pull request #1649 from matrix-org/rxl881/titleBar Add maximize / minimize apps drawer icons.	2017-12-08 19:18:45 +01:00
Richard Lewis	20917e1a07	Set page title from widget data, if available.	2017-12-08 15:12:48 +00:00
Luke Barnard	72550961e5	Move 'commit_tags' to action creator	2017-12-08 10:52:20 +00:00
Luke Barnard	4603d593de	Merge pull request #1588 from pvagner/develop Add some missing translatable strings	2017-12-07 09:41:39 +00:00
Peter Vágner	839f938c91	Argh! Reworked AccessibleButton key handling again. It turned out by fixing behaviour when pressing the enter key breaks behaviour when pressing space to activate the buttons. So we are now handling enter onKeyDown and space onKeyUp. Also briefly explained the situation with comments.	2017-12-07 10:20:27 +01:00
Richard Lewis	ed675fe791	Allow bypass of widget loading screen on hide / show.	2017-12-06 22:54:32 +00:00
Luke Barnard	65d88334a9	Fix linting React DnD specifies functions with upper-case first letters	2017-12-06 16:48:18 +00:00
Richard Lewis	e20db416f2	Add field to bypass riot widget loading screen.	2017-12-06 16:44:41 +00:00
Luke Barnard	a8a650c24a	Move TagTile to separate file, and make it dragable	2017-12-06 11:25:46 +00:00
Peter Vágner	f9b0243c8e	Merge branch 'develop' into dialog-a11y	2017-12-06 11:10:18 +01:00
Peter Vágner	802abe7091	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop	2017-12-06 11:07:01 +01:00
Peter Vágner	eda453bbe5	Fixed an issue where pressing enter key to activate the AccessibleButton was also activating normal button that might just have received the system focus as a result of the key press and the other way round. The most obvious occurence of this issue is that dialogs were reappearing when dismissed by pressing the enter key.	2017-12-05 23:23:40 +01:00
Richard Lewis	3206527d73	Remove logging.	2017-12-05 21:59:44 +00:00
Richard Lewis	7f86ed35a3	Only show custom title if different from app name.	2017-12-05 21:49:11 +00:00
Richard Lewis	1415a83a61	Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle	2017-12-05 21:42:47 +00:00
Richard Lewis	d5d5397959	Set custom widget title.	2017-12-05 21:41:44 +00:00
Richard Lewis	9fd8deb16d	Add maximize / minimize apps drawer icons.	2017-12-05 18:18:51 +00:00
Richard Lewis	49a2985515	Register message endpoints. Store endpoint origins only.	2017-12-05 00:08:17 +00:00
Richard Lewis	c9b8aab0e0	Workings for future posterity - Can't access iframe content from parent. iframe needs to initiate. Postmessage data up the stack.	2017-12-03 19:44:59 +00:00
Richard Lewis	3a89b90e57	Add stub handler for image snapshot	2017-12-03 11:25:15 +00:00
Richard Lewis	5ff5ca4705	Remove logging and broken title fetching functions.	2017-11-30 14:50:30 +00:00
Richard Lewis	2cfbbb000e	Refactor messaging listerners.	2017-11-30 10:20:29 +00:00
Richard Lewis	4f5f44ff38	Add widget postmessage API stub.	2017-11-29 22:16:22 +00:00
Luke Barnard	3addb924b1	Replace (IRC) with flair If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.	2017-11-28 13:50:05 +00:00
Peter Vágner	093f110199	Make the toggle button on the memberEventListSummary translatable	2017-11-18 17:48:57 +01:00
Peter Vágner	184b29daf8	Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547 " This reverts commit `681f43913a`.	2017-11-18 16:58:36 +01:00
Stefan Parviainen	8090aadb0e	Add aria-labels to ActionButtons Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-17 14:33:39 +01:00
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +00:00
Richard Lewis	750e64deee	Pass required props to TintableSvg.	2017-11-15 15:17:21 +00:00
Richard Lewis	7bab7813bb	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 13:26:29 +00:00
Richard Lewis	59d405d4fa	Use TintableSvgButtons for widget menubar icons.	2017-11-15 13:24:38 +00:00
Richard Lewis	6c2e9096cd	Tintable SVGs that behave like normal image buttons / links.	2017-11-15 13:08:24 +00:00
Matthew Hodgson	96a3eff5d3	lint hell	2017-11-15 11:25:56 +00:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Richard Lewis	58966c5c3d	Make edit icon green by default	2017-11-14 19:53:59 +00:00
Richard Lewis	e87940f63c	Make app tile title stronger	2017-11-14 19:53:32 +00:00
Luke Barnard	3fa1bece0a	Simplify further Also fix not-i18n-friendly "of" to be "=".	2017-11-14 13:06:54 +00:00
Luke Barnard	c3492634bd	Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options	2017-11-14 12:41:36 +00:00
Luke Barnard	d2ef6bffa8	Remove reverseRoles This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.	2017-11-14 12:02:37 +00:00
Travis Ralston	c5c346f0b7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:18:41 -07:00
Luke Barnard	52af7a7659	Attempt to clarify the affect that the users_default has on power levels This modifies displayed power levels such that: - If users_default is !== 0: - the power level 0 is displayed as "Restricted (0)" - the power level users_default is displayed as "Default ({users_default})" - Otherwise: - the power level 0 is displayed as "Default (0)" When changing users_default, to say, 10, when the textual powers are rendered again, they will take users_default into account. So those previously at 10 and which would have previously have been rendered "Custom of 10" will now read "Default (10)". Conversely, those that were "Default (0)" will now read "Restricted (0)".	2017-11-13 17:03:48 +00:00
Luke Barnard	88010fa26c	Determine whether power level is custom once Roles have been determined Instead of potentially inspecting an empty {} before mounting. This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294	2017-11-13 11:57:34 +00:00
Luke Barnard	a96bfee9f2	Remove unused UserSettingsStore import	2017-11-10 16:12:27 +00:00
Luke Barnard	ceda5939f9	Remember to import React	2017-11-10 15:55:55 +00:00
Luke Barnard	853d33a93a	Make groups a fully-fleged baked-in feature	2017-11-10 15:42:11 +00:00
Luke Barnard	6e1cf6ce17	Merge pull request #1548 from matrix-org/rxl881/widgetrendering Improve widget rendering on prop updates	2017-11-10 12:41:20 +00:00
Richard Lewis	ba8a9f2a43	Comment length	2017-11-10 11:50:14 +00:00
Luke Barnard	6deeaf94d6	group name not required	2017-11-10 11:43:05 +00:00
Richard Lewis	d2070a08d8	Replace 'qs' dep. with 'querystring'	2017-11-10 11:42:56 +00:00
Peter Vágner	681f43913a	Make the disabled PowerSelector element showing custom value translatable. Fixes #5547	2017-11-10 11:26:53 +01:00
Richard Lewis	bd6b5c4498	Improve function name.	2017-11-10 10:17:55 +00:00
Richard Lewis	98ac3dd19b	Explicitly set initialisation state.	2017-11-10 09:44:58 +00:00
Richard Lewis	da8b1ff1cd	Ensure that loading state is reset when showing app panel.	2017-11-09 14:28:24 +00:00
Richard Lewis	f796bc79c3	Fix addition of scalar token to widget URL. Add error logging.	2017-11-09 14:07:29 +00:00
Luke Barnard	9027780215	Show group name in flair tooltip if one is set e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver" Fixes https://github.com/vector-im/riot-web/issues/5341	2017-11-09 12:38:43 +00:00
Richard Lewis	8016fb82d7	Fix broken commit.	2017-11-08 20:38:54 +00:00
Richard Lewis	56581ef408	Fix various loadingElement related issues.	2017-11-08 20:38:31 +00:00
Richard Lewis	b2b07d9370	Formatting	2017-11-08 20:17:28 +00:00
Richard Lewis	be0a76dbd6	Update variable name and JSdoc for improved clarity.	2017-11-08 17:44:54 +00:00
Travis Ralston	289b0c2b6a	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
Luke Barnard	646cabf324	Add missing whitespace	2017-11-07 15:15:10 +00:00
Luke Barnard	ddc1ff2f23	Name things in a sane way	2017-11-07 15:13:26 +00:00
Luke Barnard	62305a1ccd	Implement tooltip for group rooms	2017-11-07 14:07:31 +00:00
Richard Lewis	96de72ab44	Switch to using existing dep "qs" and record in package.json	2017-11-07 12:45:12 +00:00
Richard Lewis	d3784b4925	Fix URL parameter encoding.	2017-11-07 12:33:38 +00:00
Richard Lewis	eb8c15075a	Fix url params parsing.	2017-11-07 11:58:38 +00:00
Richard Lewis	70c4100350	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-07 11:04:05 +00:00
Travis Ralston	781b94c8f4	Appease the linter Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 15:37:06 -07:00
Travis Ralston	45140cab69	Don't assume `false` means "use state" Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:42 -07:00
Travis Ralston	cb17c0a379	Migrate blacklistUnverifiedDevicesPerRoom This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:15:55 -07:00
Travis Ralston	c7eee36990	Fix lanugage detection Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:38:26 -06:00
Travis Ralston	4f1ad974fc	Delay URL preview saving until the save button is pressed Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:32:13 -06:00
Matthew Hodgson	3fd5937687	Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing Fixes React warning	2017-11-04 15:41:57 +00:00
Travis Ralston	893c39bfbe	Merge branch 'develop' into travis/granular-settings	2017-11-03 22:00:07 -06:00
Michael Telatynski	b2cd65e182	Fixes React warning Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-03 12:30:58 +00:00
Richard Lewis	853ada027d	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-02 18:34:46 +00:00
Richard Lewis	0e854ee356	Fix loading and initialisation spinners.	2017-11-02 18:33:11 +00:00
Richard Lewis	a52bb9d603	Pass URL to check.	2017-11-02 17:27:59 +00:00
David Baker	8895ab7e5b	Merge pull request #1564 from matrix-org/dbkr/pillify_at_room Pillify room notifs in the timeline	2017-11-02 14:22:58 +00:00
David Baker	4f8d6d8fbe	Pillify room notifs in the timeline This scans text nodes in the DOM for room notifications and turns them into pills. Changes the pillification code around a bit so it works with text nodes. Uses the push processor directly to test the event against the room notifiation rule so we know whether this event would actually trigger a room notification (needs to hook into push at a lower level because otherwise our own room notifications would not pillify since our own events never generate notifications). Requires https://github.com/matrix-org/matrix-js-sdk/pull/565	2017-11-01 19:42:47 +00:00
Richard Lewis	17c0405862	Restructure to pass props from componentWillRecieveProps.	2017-10-31 16:31:46 +00:00
Richard Lewis	758df29b23	Fix onLoad on wrong element.	2017-10-31 10:43:17 +00:00
Richard Lewis	35b33263ea	Use querystring lib	2017-10-31 10:37:40 +00:00
Richard Lewis	1cb878bb57	Formatting	2017-10-31 10:04:37 +00:00
Richard Lewis	648b295971	Removed comment	2017-10-31 10:04:02 +00:00
Travis Ralston	f070604350	Rename SettingsCheckbox to be a bit more generic Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 20:08:27 -06:00
Travis Ralston	9c846e4dd9	Fix URL preview options Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:49:44 -06:00
Travis Ralston	72517f95bb	Don't explode if the SdkConfig isn't available This can happen prior to logging in, for some reason. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:53:59 -06:00
Travis Ralston	c056f4faa6	Make URL preview checkboxes pretty again Works for all other settings too! Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:17:15 -06:00
Travis Ralston	b139c8d01c	Generate unique IDs for SettingsCheckbox Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:16:46 -06:00
Travis Ralston	786bd87fec	Support URL previews (with bugs) Known issues at this point: * The room-level setting accepts the current user's default, which is wrong * The checkboxes on RoomSettings are not independent * The checkboxes in RoomSettings need some layout fixes Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:48:29 -06:00
Travis Ralston	b5d5c81f32	Add a new component to back various settings Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:43:27 -06:00
Travis Ralston	0d3f0eaf98	Convert local settings to granular settings This breaks language selection. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:53:00 -06:00
Travis Ralston	bf815f4be9	Support labs features Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 20:21:50 -06:00
Richard Lewis	3756ce606d	Check URL prop updates and ensure that widgets are refreshed.	2017-10-27 17:49:14 +01:00
Richard Lewis	7662b5ac8f	Unfinished, non-working changes to try and handle URL changes gracefully	2017-10-27 13:47:51 +01:00
Stefan Parviainen	53e983f9c7	Fix merge conflict Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-25 18:19:27 +02:00
David Baker	8ed3474b64	Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists Only show editing UI for aliases/related_groups for users /w power	2017-10-25 15:52:51 +01:00
Richard Lewis	fd85c74bc5	Merge pull request #1520 from matrix-org/rxl881/deleteWidget Add a delete confirmation dialog for widgets	2017-10-25 10:45:52 +01:00
Richard Lewis	2e3bdfd55d	Fix string indentation.	2017-10-25 10:45:17 +01:00
Stefan Parviainen	88fd60066f	Fix typo Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 20:07:57 +02:00
Stefan Parviainen	b5024cca75	Further simplify MemberEventListSummary a bit Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 19:34:08 +02:00
Luke Barnard	640d88f25d	Typo	2017-10-24 16:21:18 +01:00
Luke Barnard	ee7ebc425c	Only show editing UI for aliases/related_groups for users /w power	2017-10-24 16:19:09 +01:00
Richard Lewis	11d4a63a32	Update text and split across multiple lines.	2017-10-23 23:59:36 +01:00
Richard Lewis	8b7f737c97	Remove logging. Return early.	2017-10-23 23:47:37 +01:00
Richard Lewis	54bd916862	Split string across multiple lines.	2017-10-23 20:08:52 +01:00
Stefan Parviainen	115772d526	Fix merge conflict Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:57:52 +02:00
Stefan Parviainen	ef30ba889b	Make MemberEventListSummary more translatable Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:55:40 +02:00
Richard Lewis	3c4c986aca	Update button text	2017-10-23 18:42:43 +01:00
Luke Barnard	2f418976aa	Only show flair for groups with avatars set Fix vector-im/riot-web#5377	2017-10-23 17:06:47 +01:00
Richard Lewis	ee60155846	Add delete widget confirmation dialog.	2017-10-23 17:05:44 +01:00
Matthew Hodgson	440b8e0e31	16px for flair please	2017-10-23 14:56:24 +01:00
Luke Barnard	fd65cb1396	Merge pull request #1501 from matrix-org/luke/groups-are-communities Groups -> Communities	2017-10-19 12:16:15 +01:00
Luke Barnard	71443e9b94	Remove logs comments	2017-10-19 10:34:24 +01:00
Luke Barnard	5f3c06b38a	Factor out Flair cache into FlairStore This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).	2017-10-19 10:28:59 +01:00
Luke Barnard	a40704f085	Merge branch 'develop' into luke/groups-are-communities	2017-10-18 15:57:37 +01:00
Stefan Parviainen	7eeed3e093	Simplify MemberEventListSummary by using pluralization provided by the i18n library Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 23:46:23 +02:00
Luke Barnard	1b8c5b50db	Don't show room IDs when picking rooms	2017-10-17 18:02:35 +01:00
Luke Barnard	eaa5dd5f22	Groups -> Communities in the UI Translation files still need updating, and this would be much simpler with a script that could automate the tedium	2017-10-16 13:18:39 +01:00
Luke Barnard	d3f9a3aeb5	Run eslint --fix Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.	2017-10-11 17:56:17 +01:00
Luke Barnard	060bf3bdf6	Remove inline CSS	2017-10-11 16:02:01 +01:00
David Baker	0f84216a9f	Grey out login form when no valid HS	2017-10-11 14:05:34 +01:00
David Baker	92be3af990	Make it clearer which HS you're logging into Otherwise there's no indication without clicking 'custom server'	2017-10-10 19:16:42 +01:00
Luke Barnard	8d46b19916	Restrict Flair in the timeline to related groups of the room	2017-10-04 14:06:49 +01:00
Luke Barnard	9e3954865a	Fix a couple of bugs with EditableItemList - fix entering the same thing twice (which had the bug of not emptying the "new" field) - fix editing items in the list (which would stack overflow because of typo)	2017-10-04 13:15:38 +01:00
Luke Barnard	28b8582bd6	Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings	2017-10-04 10:37:45 +01:00
Luke Barnard	4e9694be6d	Maintain "blur to add" function to match previous UX	2017-10-04 10:28:26 +01:00
Luke Barnard	d25ebfb844	Remove cruft from EIL	2017-10-04 10:15:44 +01:00
Luke Barnard	8243c39d83	Factor out EditableItemList from AliasSettings Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).	2017-10-04 10:00:01 +01:00
Stefan Parviainen	a96169e80e	Fix merge conflict	2017-10-02 17:57:22 +02:00
Luke Barnard	c8b2158156	Lint	2017-09-29 10:42:23 +01:00
Luke Barnard	18e0d8da86	Rename Flair feature to Groups	2017-09-29 10:27:40 +01:00
Luke Barnard	739ddb8410	Merge branch 'develop' into luke/groups-button	2017-09-28 12:11:26 +01:00
Luke Barnard	6b9a2909df	Add rule to enforce spacing in curly brackets in JSX children This required an updated in version of eslint-plugin-react to 7.4.0.	2017-09-28 11:21:06 +01:00
Luke Barnard	929c8627d3	Add button to get to MyGroups (view_my_groups or path #/groups)	2017-09-27 17:45:49 +01:00
Luke Barnard	d52355f80e	Implement adding rooms to a group (or group summary) by room ID	2017-09-27 15:30:58 +01:00
Luke Barnard	f528e147e3	Give flair avatars a tooltip = the group ID	2017-09-27 14:36:22 +01:00
Stefan Parviainen	35cb52febc	Fix merge conflict	2017-09-27 08:41:37 +02:00
Robert Swain	24de01e21d	AppTile: Test if widgetUrl startsWith instead of has a substring The event origin should be at the beginning of the URL.	2017-09-25 17:14:25 +02:00
Robert Swain	6e49926228	AppTile: Do not test for electron platform The method platform method is instead stubbed on all other platforms.	2017-09-25 17:13:18 +02:00
Robert Swain	b047f1caaa	Merge branch 'develop' into rob/electron-screensharing	2017-09-25 17:02:30 +02:00
Luke Barnard	20c731f627	Bust the flair caches after 30mins Group profile data and the groups a user has publicised will be removed from the cache 30mins after retrieval. There may be some benefits to caching the group profiles for longer than the group memberships but for now they're naively busted after the same 30mins.	2017-09-25 15:21:56 +01:00
Stefan Parviainen	d4929b558e	Add dummy translation function to mark translatable strings Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-22 21:43:27 +02:00
David Baker	621a108b5e	Use flow style function definition for doc	2017-09-22 15:15:10 +01:00
David Baker	dba48e2f8f	use start, end rather than min, max	2017-09-22 15:07:45 +01:00
David Baker	f1a2b6d327	lint	2017-09-22 13:35:49 +01:00
David Baker	16398fbfc2	Allow TruncatedList to get children via a callback And update MemberList to use it as such. This means that the parent only needs to make react elements for the elements that will actually be rendered, rather than all of them. In practive this doesn't make a huge difference as making React elements is fairly fast, but experimentally (with all profiling turned on), MemberList went from 25ms in the constructor and 81ms in render to 38ms in constructor but sub 1ms render for Matrix HQ.	2017-09-22 13:15:02 +01:00
David Baker	29d8df2c9e	De-lint TruncatedList	2017-09-22 10:00:46 +01:00
David Baker	5940b11fd2	Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group Implement `view_group` dispatch when clicking flair	2017-09-21 15:18:28 +01:00
Luke Barnard	41a9ff22fb	Rename profile object properties to camelCase Also, add correct PropTypes for FlairAvatar	2017-09-21 14:22:43 +01:00
Luke Barnard	e64cc3b666	Implement `view_group` dispatch when clicking flair	2017-09-21 13:25:36 +01:00
Luke Barnard	515222c25f	Track action button click event	2017-09-20 17:16:49 +01:00
Luke Barnard	979b580e1f	Merge branch 'develop' into luke/fix-ugly-integ-button	2017-09-19 17:04:06 +01:00
David Baker	80e0205b78	Fix promise error in flair Import bluebird other wise it gets a native promise on my dev box which does not have a finally method	2017-09-19 15:53:54 +01:00
Luke Barnard	61a0f1ef67	Fix ugly integration button, use hover to show error This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).	2017-09-19 11:57:23 +01:00
Luke Barnard	241d442284	Fail gracefully for non-supporting servers	2017-09-18 15:12:38 +01:00
Luke Barnard	6add06db44	Fix big with rejecting promises upon error	2017-09-18 15:11:49 +01:00
Luke Barnard	26941e994f	Merge branch 'develop' into luke/feature-flair	2017-09-18 14:46:50 +01:00
Luke Barnard	3476cfca79	getPublicGroups->getPublicisedGroups To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542	2017-09-18 14:44:35 +01:00
Luke Barnard	548e5f516c	Put flair into labs	2017-09-18 14:38:41 +01:00
Luke Barnard	caaf5cca14	Only show the integ management button if user is joined	2017-09-18 13:34:33 +01:00
Michael Telatynski	f612b1933b	start MELS expanded if it contains a highlighted/permalinked event. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-14 17:53:47 +01:00
David Baker	5087da9247	Merge remote-tracking branch 'origin/develop' into luke/feature-flair	2017-09-13 16:52:12 +01:00
Robert Swain	aa82be1fb1	Merge branch 'develop' into rob/electron-screensharing	2017-09-12 10:54:20 +02:00
David Baker	ea5726aa4e	Copyright	2017-09-08 23:14:06 +01:00
David Baker	ec3ff529e7	Fast path for emojifying strings Emojione's regex for detecting emoji is enourmous and we were running it on every display name, room name, message etc every time those components mounted. Add a much simpler regex to rule out the majority of strings that contain no emoji and fast-path them. Makes room switching about 10% faster (in my tests with all the profiling turned on).	2017-09-08 23:05:27 +01:00
Robert Swain	53574541c3	AppTile: Add Jitsi electron screensharing support	2017-09-04 09:31:25 +02:00
Luke Barnard	0ded4acba0	Mark TODO for https://github.com/vector-im/riot-web/issues/4951	2017-08-31 17:52:53 +01:00
Luke Barnard	d84190f58d	Explain Flair debounce	2017-08-31 17:49:19 +01:00
Luke Barnard	e89d52ccbf	Do not get avatars when no groups were/could be retrieved	2017-08-31 16:46:39 +01:00
Luke Barnard	86e8a4c7e2	Make componentWillMount not async This was left over from a previous refactor	2017-08-31 16:44:14 +01:00
Luke Barnard	ebc1993530	Implement Flair Add 14x14 group avatars next to sender profiles.	2017-08-30 11:10:49 +01:00
Richard Lewis	2ff1888054	Make staging widgets work with live and vice versa.	2017-08-30 10:36:22 +01:00
Michael Telatynski	ec6867dc8b	Fix React crying on machines without internet due to return undefined	2017-08-24 12:32:37 +01:00
Richard Lewis	502a0480a0	Merge pull request #1327 from matrix-org/matthew/multiple-widgets Matthew/multiple widgets	2017-08-22 10:53:51 +01:00
Richard Lewis	a69cc9169f	lint fix.	2017-08-22 10:04:57 +01:00
Richard Lewis	6c8391e3ea	Remove beta tag.	2017-08-21 11:39:06 +01:00
Robert Swain	2eac869e27	Merge branch 'develop' into rob/apps-not-e2ee	2017-08-21 10:30:38 +02:00
Robert Swain	70824960ee	AppPermission: Make strings translatable	2017-08-21 10:23:55 +02:00
Matthew Hodgson	d7f5295949	untested WIP for supporting multiple widgets properly	2017-08-18 18:40:00 +01:00
Richard Lewis	1862057695	Only render appTile body (including warnings) if drawer shown.	2017-08-18 18:33:56 +01:00
Luke Barnard	b678c2cf0f	Don't bind Pill function, React does this for us	2017-08-18 17:15:27 +01:00
Robert Swain	2e00968bcd	AppPermission: Note that apps are not E2E encrypted in E2E rooms	2017-08-18 17:44:33 +02:00
Richard Lewis	b7d46d91ed	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-18 15:35:01 +01:00
Luke Barnard	5e0a7212d9	Don't apply case logic to app names As they should have the Correct Case in integrations land now	2017-08-18 14:57:28 +01:00
Richard Lewis	857a8c9519	Remove empty defaultProps.	2017-08-18 13:28:47 +01:00
Richard Lewis	84f5e5aad2	REmove unused onCancelClick	2017-08-18 12:21:48 +01:00
Luke Barnard	1a1a80b633	Merge branch 'develop' into luke/feature-app-tile-ux	2017-08-18 12:12:00 +01:00
Richard Lewis	96900e76a0	Move error logging to where it is first caught.	2017-08-18 11:51:32 +01:00
Richard Lewis	4b5cdac032	Don't show widget security warning to the person who added it to the room.	2017-08-18 11:41:27 +01:00
Luke Barnard	57505c3a61	Add behaviour to toggle app draw on app tile header click	2017-08-18 10:56:35 +01:00
Richard Lewis	0907fff080	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-17 17:47:46 +01:00
Richard Lewis	d1ee257b5a	Pass roomId rather than whole room object.	2017-08-17 12:15:01 +01:00
Richard Lewis	eb77dcc8e3	Camel case variable name	2017-08-17 11:24:25 +01:00
Richard Lewis	2c25639a61	Fix copyright header	2017-08-17 11:22:42 +01:00
David Baker	252ab208e4	Merge pull request #1300 from matrix-org/dbkr/userpicker Refactor ChatInviteDialog to be UserPickerDialog	2017-08-16 14:29:07 +01:00
David Baker	81273ec855	Move non-invite specific stuff to UserAddress	2017-08-15 13:42:23 +01:00
David Baker	fa660c8211	PR feedback	2017-08-15 10:57:24 +01:00
David Baker	1b66e88b6e	ChatInviteDialog -> UserPickerDialog pt 2 The other changes I forgot to add	2017-08-14 17:43:00 +01:00
Luke Barnard	bb229d33a4	Add onClick to user pills instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.	2017-08-14 14:44:08 +01:00
Richard Lewis	454ec40b00	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-11 10:35:20 +01:00
Michael Telatynski	b19c1010aa	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/Analytics.js	2017-08-10 13:54:55 +01:00
Richard Lewis	185379b037	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-09 14:07:45 +01:00
Richard Lewis	4bc25f12cb	Move manage integrations button in to stand-alone component	2017-08-09 11:44:24 +01:00
Luke Barnard	b08d32371d	Add optional setting for hiding avatars in <Pill>s As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445	2017-08-08 11:13:29 +01:00
Richard Lewis	5752345b80	Merge pull request #1263 from matrix-org/rxl881/warnings Display warning if widget is mixed content	2017-08-02 17:30:46 +01:00
Richard Lewis	7599bde1f6	Fix logging line length.	2017-08-02 17:05:46 +01:00
Kegan Dougal	c914f1607b	scalar-develop is a scalar URL	2017-08-02 14:35:14 +01:00
Richard Lewis	48faf72fdc	Disable eslint rule	2017-08-01 21:00:18 +01:00
Richard Lewis	2ab6bc84a7	Improve clarity	2017-08-01 17:49:41 +01:00
Richard Lewis	f0224460d2	Fix comparison and handle case where app has permission to load but content is mixed protocol.	2017-08-01 17:48:02 +01:00
Richard Lewis	d29610bdd2	Fix boolean comparison.	2017-08-01 17:45:06 +01:00
Richard Lewis	f57b0d4cc7	Fix invalid translation	2017-08-01 17:43:38 +01:00
Richard Lewis	bc4d979d1e	Display warning if widget is mixed content	2017-08-01 17:29:29 +01:00
Luke Barnard	a40a86669a	Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating Use componentWillReceiveProps to update pill state when props change	2017-08-01 16:30:25 +01:00
Luke Barnard	630c2968eb	Use componentWillReceiveProps	2017-08-01 16:20:32 +01:00
Richard Lewis	546173d246	Fix scalar token	2017-08-01 15:53:42 +01:00
Richard Lewis	abae43b65e	Merge pull request #1257 from matrix-org/rxl881/widgetPermissions Widget permissions	2017-08-01 12:13:09 +01:00
Richard Lewis	5f8e86197f	Check that wurl is scalar, before checking for curl	2017-08-01 12:00:03 +01:00
Richard Lewis	596efb6062	Fix missing comma	2017-08-01 11:42:50 +01:00
Richard Lewis	15f39040a0	Simplify canUserModifyWidgets API	2017-08-01 11:39:17 +01:00
Richard Lewis	a310ff3bab	Add ToDo item.	2017-07-28 18:21:23 +01:00
Richard Lewis	6aa1d923ce	Add comment	2017-07-28 16:48:13 +01:00
Richard Lewis	9935dd0051	Add comment to explain "fullWidth" component porperty.	2017-07-28 16:46:21 +01:00
Richard Lewis	8529a21f5c	Translate "Allow"	2017-07-28 16:42:07 +01:00
Richard Lewis	700ef34e95	Translate warning	2017-07-28 16:39:18 +01:00
Richard Lewis	4308d2c635	Inline setState.	2017-07-28 16:36:06 +01:00
Richard Lewis	50ad80ad86	Use ES6 style import	2017-07-28 16:24:32 +01:00
Richard Lewis	2e6fb1f956	Fix license header	2017-07-28 16:23:49 +01:00
Richard Lewis	6238c1d704	Fix default prop initialisation	2017-07-28 16:23:38 +01:00
Richard Lewis	aff1cd9469	Add allow-presentation permission to iframe sandbox permissions	2017-07-28 11:14:04 +01:00
Richard Lewis	11335b1488	Rename variable to curlBase, for clarity	2017-07-28 10:18:06 +01:00
Richard Lewis	e1d9301eb4	Strip query parameters from content URLs	2017-07-28 10:01:58 +01:00
Richard Lewis	d69c9a36b3	Factor out check permissions code.	2017-07-27 23:38:26 +01:00
Richard Lewis	5e23d676b4	Remove comments.	2017-07-27 23:05:43 +01:00
Richard Lewis	51d160e7d6	Hide edit button when user does not have permission to edit.	2017-07-27 20:18:31 +01:00
Richard Lewis	ab7fcbb5e7	Add function to determine if a user can modify widgets and style UI components as a result.	2017-07-27 18:10:28 +01:00
Michael Telatynski	bf98c0da7c	un-i18n Modal Analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:19:18 +01:00
Richard Lewis	9ee1f3962d	Set display URL from wurl if curl not specified.	2017-07-27 16:42:29 +01:00
Richard Lewis	8e4f1f0989	Add message spinner.	2017-07-27 16:41:52 +01:00
Richard Lewis	f2058e0a6c	Add message spinner component.	2017-07-27 16:41:20 +01:00
Luke Barnard	dff79c4688	Only apply room pills to matrix.to room links, exclude event links This fixes https://github.com/vector-im/riot-web/issues/4680 and fixes https://github.com/vector-im/riot-web/issues/4670	2017-07-27 13:01:40 +01:00
Luke Barnard	4d4078be7e	Remove disambiguation from pills	2017-07-27 10:54:23 +01:00
Luke Barnard	f19fade448	Strip " (IRC)" from display names inserted into the timeline	2017-07-27 10:50:41 +01:00
Richard Lewis	9f52c13bea	Grant permission to load app widget.	2017-07-26 16:47:58 +01:00
Richard Lewis	76f4f88fcd	App tile permissions -- broken	2017-07-26 11:28:43 +01:00
Luke Barnard	143994e44f	Use `data-offset-key` in RTE decorators This makes sure the selection state is correct when moving the cursor through an entity in the composer but only in rich text mode. https://github.com/vector-im/riot-web/issues/4666 still persists despite this, probably because the text content inserted during a completion in markdown mode has a different length to the text node within the entity. fixes vector-im/riot-web#4654	2017-07-25 11:25:33 +01:00
Luke Barnard	11f3a1db72	Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills	2017-07-25 09:37:47 +01:00
Luke Barnard	ac597996e0	Remove outdated comment	2017-07-25 09:37:18 +01:00
Luke Barnard	026582bcf7	Add unmounted guard	2017-07-25 09:22:08 +01:00
Luke Barnard	5efd5bf927	done -> then, style	2017-07-25 09:20:14 +01:00
Luke Barnard	d13c4b510c	Merge branch 'develop' into luke/feature-async-pills	2017-07-24 17:39:35 +01:00
Luke Barnard	61c16569cb	Get user pill profile remote data Instead of relying on the local avatar/displayname of a user, request the data from the server and update the pill if it shows up. This required a slight refactor which means we're not doing everything in `render` now. Also I noticed unknown rooms weren't being rendered _at all_! So now you get something that looks like a normal link but with the room alias/ID in it.	2017-07-24 17:18:29 +01:00
Luke Barnard	727b1ca545	Remove disambiguation from user mentions, add tooltip for mxid Also add a tooltip for room pills = room alias/ID Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513	2017-07-24 15:08:22 +01:00
Luke Barnard	eb0575d9c1	Merge pull request #1241 from matrix-org/luke/refactor-pills Factor out shared logic in two code-paths for pill rendering	2017-07-21 17:54:20 +01:00
Luke Barnard	feaafc7a1a	Remove logging	2017-07-21 17:18:48 +01:00
Luke Barnard	7db7192701	Factor out shared logic in two code-paths for pill rendering This isn't an entirely side-effect-free refactoring: - the text of the timeline pills is now either the room ID/alias or user ID/ display name of the linked resource (which means that until we do a roundtrip to get user displaynames, mentions for users not in the current room will have their user IDs shown instead of what was in the link body). - timeline links to rooms without avatars are now rendered as links - fixed issue that would throw an error whilst rendering (i.e. unusable client) a room link to a room that the client doesn't know about	2017-07-21 14:07:48 +01:00
Richard Lewis	b589fcc3b0	Merge pull request #1240 from matrix-org/rxl881/deleteWidgets Hide widget panel while it is being deleted.	2017-07-21 11:14:42 +01:00
Richard Lewis	6aa0f68ee9	Show beta testing icon and help message for widgets tile.	2017-07-14 23:31:57 +01:00
Kegsay	5274cf59a0	Hook up the edit widget button (#1218 ) * Hook up the edit widget button * Review comments	2017-07-14 11:17:59 +01:00
Richard Lewis	9a1e7ad170	Hide widget panel while it is being deleted.	2017-07-13 00:27:03 +01:00
Richard van der Hoff	0254d2b3a2	q(...) -> Promise.resolve ``` find src test -name '*.js' \| xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/' ```	2017-07-12 18:05:08 +01:00
Richard van der Hoff	a06bd84213	replace imports of `q` with bluebird update `package.json` ``` find src test -name '.js' \| xargs perl -i -pe 'if (/require$.[qQ].$/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' find src test -name '.js' \| xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' ```	2017-07-12 18:05:08 +01:00
David Baker	a48c7d2364	Only allow http and https widget URLs	2017-07-12 14:16:47 +01:00
David Baker	918f5abe81	Lint correctly	2017-07-12 10:34:50 +01:00
David Baker	53316a76f4	Sandbox app iframes	2017-07-12 10:22:14 +01:00
Kegsay	cf158530f5	Implement new widget API (#1201 ) * Implement new widget API This allows clients to see who provisioned which widgets. * Update to make state_key the wid * Update to latest API * Only show widgets which have required fields * Don't constantly show apps dialog * Fix example to include data key	2017-07-11 12:15:27 +01:00
Kegan Dougal	42ba3ff410	Linting	2017-07-06 10:44:32 +01:00
Kegsay	e0e321783b	Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182 )	2017-07-06 09:28:48 +01:00
Richard Lewis	ea83d7eee2	Add missing import and fix apps reference.	2017-06-28 15:53:18 +01:00
Richard Lewis	93bdfc99df	i18n "Cancel" alt text.	2017-06-28 12:25:36 +01:00
Richard Lewis	ddea1f35d2	Fix header.	2017-06-28 12:23:33 +01:00
Richard Lewis	ad2517bd8b	Uppercase the first letter of the app tile name.	2017-06-28 10:27:06 +01:00
Richard Lewis	e343e99355	Cleaned up unused files and removed commented code	2017-06-27 11:28:38 +01:00
Robert Swain	03ba3bd431	Merge branch 'rxl881/apps' into rob/apps	2017-06-13 15:41:52 +02:00
Robert Swain	91eabbba60	MessageComposer: Trigger Jitsi app from call buttons	2017-06-13 15:35:13 +02:00
Robert Swain	b63edcb390	AppTile: Support deletion of apps from room state	2017-06-13 15:33:17 +02:00
Robert Swain	bcb2f8408b	AppTile: Fix typo in property name	2017-06-13 15:32:40 +02:00
Robert Swain	2aa0aa61e3	AddAppDialog: Support adding apps to room state	2017-06-13 15:31:37 +02:00
Richard Lewis	876899948f	Merge in upstream changes	2017-06-13 11:44:23 +01:00
Matthew Hodgson	6133186583	fullstop fails	2017-06-12 15:36:24 +01:00
Richard Lewis	f9f924bbd6	Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps	2017-06-12 14:50:25 +01:00
Robert Swain	9e0b476b72	Merge branch 'develop' into rob/apps	2017-06-09 12:06:44 +02:00
Matthew Hodgson	f26aeef2bf	Merge pull request #1056 from matrix-org/kegan/translation-tamarin Add remaining translations	2017-06-08 15:06:26 +01:00
Matthew Hodgson	29e792b642	make mels emoji capable	2017-06-08 14:21:14 +01:00
Kegan Dougal	c57823a31d	Merge branch 'develop' into kegan/translation-tamarin	2017-06-08 14:19:56 +01:00
Kegan Dougal	1c58a9cd5e	Everything but src/components/views/rooms	2017-06-08 12:33:29 +01:00
Matthew Hodgson	bc0eb4294c	rename welcome page to home	2017-06-08 10:27:35 +01:00
Richard Lewis	a09001933a	git status	2017-06-07 15:39:27 +01:00
Luke Barnard	53ea41e8a5	Merge branch 'develop' into new-guest-access	2017-06-07 12:08:37 +01:00
Richard Lewis	c552f7f336	App icon styling	2017-06-07 10:55:49 +01:00
Richard Lewis	f6f660fa9a	Initial app icon tiles	2017-06-06 23:45:17 +01:00
Richard Lewis	e8353edb06	Disable test postmessag	2017-06-06 15:57:40 +01:00
Luke Barnard	4ab6dc9ddd	Merge branch 'new-guest-access' into luke/ilag-i18n	2017-06-05 20:28:51 +01:00
Richard Lewis	dc4f321707	Pass room and user id to apps draw	2017-06-05 18:21:31 +01:00
David Baker	ad87e9bd50	Apply `9cae667c06` to ilag branch	2017-06-05 17:28:36 +01:00
Luke Barnard	619830617a	Merge branch 'develop' into luke/ilag-i18n In order to get ILAG internationalised Conflicts: src/components/structures/LoggedInView.js src/components/structures/MatrixChat.js src/components/views/dialogs/ChatCreateOrReuseDialog.js src/components/views/dialogs/SetDisplayNameDialog.js src/createRoom.js src/i18n/strings/en_EN.json	2017-06-05 16:08:03 +01:00
Richard Lewis	c6991fd33c	Periodically pass messages to embedded iframe	2017-06-04 23:00:52 +01:00
Michael Telatynski	464863acd6	remove unused imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:35:55 +01:00
Kegan Dougal	d2e766e4f0	First round	2017-06-02 10:18:31 +01:00
Matthew Hodgson	8e34b59d32	Revert "Revert "add labels to language picker""	2017-06-01 19:46:25 +01:00
Richard van der Hoff	b3e9716126	Revert "add labels to language picker"	2017-06-01 17:52:25 +01:00
Matthew Hodgson	ecbc724a3f	Merge pull request #988 from matrix-org/matthew/room-avatar-event Matthew/room avatar event	2017-06-01 14:43:29 +01:00
daniel tygel	b8e26ddf3d	add labels to language picker	2017-06-01 09:48:36 -03:00
Matthew Hodgson	00750b4686	quick and dirty RoomAvatarEvent	2017-06-01 13:31:24 +01:00
Richard Lewis	dac154f828	Add full width widgets	2017-05-31 10:08:39 +01:00
Matthew Hodgson	e30e45a82c	Merge branch 'develop' into new-guest-access	2017-05-30 21:05:07 +01:00
Marcel	70e7d81093	More i18n strings (#963 ) * Add i18n for E2E import and Export Dialogs Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add various previous missing i18n strings Signed-off-by: MTRNord <mtrnord1@gmail.com> * Translate CreateRoomButton Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ChatInviteDialog and fix missing to. Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ConfitmRedactDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeactivateAccountDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeviceVerifyDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add SessionRestoreErrorDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add SetDisplayNameDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UnknownDeviceDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add AddressTile translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeviceVerifyButtons translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add Dropdown translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UserSelector translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CaptchaForm translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CasLogin translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CustomServerDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add InteractiveAuthEntryComponents translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add LoginFooter translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add RegistrationForm translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ServerConfig translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MAudioBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MImageBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MVideoBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add TextualBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UnknownBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UrlPreviewSettings translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add AuxPanel translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add PresenceLabel translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * fix syntax error * weird space :P * missing ',' * fix missing value * fix json fail * remove acidential added file * fix another json fail	2017-05-30 15:09:57 +01:00
Richard Lewis	ec03cf4de3	disable iframe sandboxing. Remove BBC news iframe	2017-05-30 10:46:51 +01:00
Matthew Hodgson	1efc5c2b25	speed up SetMxIdDialog user check to 250ms as it was driving me MAD i18nize new bottomleftmenu buttons	2017-05-28 23:28:40 +01:00
Matthew Hodgson	5c885922d9	Merge branch 'develop' into new-guest-access	2017-05-28 22:58:18 +01:00
David Baker	e44f3cc709	Fix tests * Serve translation files from the karma server * Port UserSettingsStore to ES6 exports because the test runner gets confused by ES6 importing a commonjs module * Remove extra spaces in translations strings for MELS * Fix 'his/her' back to be 'their' * Change test to expect singular 'invitation' for a single person (there may be multiple invitations, but IMO this should be 'rejected n invitations' and we can play with the wording later, I don't think the singular is any worse than the plural). * set language in the MELS tests (and wait for it to complete) * Don't bother setting lang in other tests for now	2017-05-26 11:58:45 +01:00
Luke Barnard	3185d3ed41	Re-add bouncing/callout animation to action buttons	2017-05-25 13:54:59 +01:00
David Baker	5e855e6fee	Size is a string, import react React gets put in by the JSX transpile	2017-05-25 12:09:01 +01:00
David Baker	9337158a47	Separate classes for the different buttons Also rename RoleButton to ActionButton because it's not being given a Role any more. Conflicts: src/component-index.js cherry-picking commit `4a5821e`.	2017-05-25 12:08:42 +01:00
David Baker	a996f52ea3	Make bottom left menu buttons use RoleButton too	2017-05-25 12:04:22 +01:00
David Baker	54af06e8e1	What year is it? Who's the president?	2017-05-25 12:04:14 +01:00
David Baker	9fa6e8b1e2	Add us to copyright As I've now added code to this file	2017-05-25 12:02:05 +01:00
David Baker	bff0577cb6	Add buttons to room sub list headers Conflicts: src/component-index.js src/components/views/rooms/RoomList.js cherry-picking commit `ce119a6`.	2017-05-25 11:49:45 +01:00
David Baker	5c359e63ab	Bulk change counterpart imports to use languageHandler wrapper func	2017-05-25 11:39:08 +01:00
David Baker	c2df23395d	Fix up language dropdown * Read languages from the available ones rather than the config * Make the search work (add searchEnabled=true) * Move variables to the class since they were populated there	2017-05-24 11:25:06 +01:00
David Baker	a95f3252b8	s/tabs/spaces/	2017-05-24 10:48:10 +01:00
David Baker	f412552c2c	Fix imports/exports	2017-05-23 18:32:45 +01:00
David Baker	cc0924f1c7	Fix imports	2017-05-23 18:16:02 +01:00
David Baker	d419c42a4f	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
David Baker	6d30bc7182	Merge pull request #911 from matrix-org/t3chguy/autofocus_directorysearchbox autoFocus input box	2017-05-23 09:57:20 +01:00
Richard Lewis	b111579aed	App tile events	2017-05-22 18:00:17 +01:00
Richard Lewis	e8837d28ef	App tile and app dialog styling	2017-05-22 12:34:27 +01:00
Richard van der Hoff	574b820d11	Factor out DeviceVerifyDialog	2017-05-22 11:12:36 +01:00
Michael Telatynski	02a1c1868c	autoFocus input box Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-20 00:08:53 +01:00
Luke Barnard	32818aff4f	Simplify expression	2017-05-18 17:08:26 +01:00
Luke Barnard	a425909b76	Get rid of react key warning when no results	2017-05-18 17:01:01 +01:00
Luke Barnard	f99fa3ac1a	Fixed pressing space or clicking dd input closes dd	2017-05-18 16:58:57 +01:00
David Baker	387529d130	Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" This reverts commit `3366d3bbae`, reversing changes made to `ceb71a4ef6`.	2017-05-16 14:49:55 +01:00
David Baker	d06bd3cf9d	Revert "Fix Create Room button" This reverts commit `9cae667c06`.	2017-05-16 14:30:02 +01:00
David Baker	f8d1a6d240	Revert "Fix 'start chat' button" This reverts commit `c841eb641b`.	2017-05-16 14:26:46 +01:00
Matthew Hodgson	82092dc2d8	onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899	2017-05-15 02:15:00 +01:00
David Baker	9cae667c06	Fix Create Room button Opened the DM dialog rather than the new room dialog	2017-05-08 16:03:52 +01:00
David Baker	cafbe14589	Fix keys for AddressSelector Was using a property which just did not exist.	2017-05-08 11:59:06 +01:00
David Baker	c841eb641b	Fix 'start chat' button	2017-05-08 11:26:25 +01:00
David Baker	4fc4ae1e99	Size is a string, import react React gets put in by the JSX transpile	2017-05-05 14:56:26 +01:00
David Baker	4a5821e199	Separate classes for the different buttons Also rename RoleButton to ActionButton because it's not being given a Role any more.	2017-05-05 14:25:18 +01:00
David Baker	6a1d0fbab5	Make bottom left menu buttons use RoleButton too	2017-05-04 15:38:09 +01:00
David Baker	0998adb366	What year is it? Who's the president?	2017-05-04 15:02:21 +01:00
David Baker	e1c99430cb	Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2	2017-05-04 14:04:22 +01:00
David Baker	ce119a6364	Add buttons to room sub list headers	2017-05-04 13:55:52 +01:00
Luke Barnard	bfa3123f9b	Combine data-scroll-token and -contained-scroll-tokens - Instead of using one attribute, use one that might just contain one token - Use the first token when tracking a child - Mandate that no commas can be in individual tokens	2017-05-04 10:00:13 +01:00
Luke Barnard	3f25928380	Fix jumping to an unread event when in MELS This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child. MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).	2017-05-02 16:34:39 +01:00
David Baker	c1336f09fe	Merge remote-tracking branch 'origin/develop' into luke/improve-country-dd	2017-04-25 18:06:04 +01:00
Luke Barnard	71a119376c	Guard against no children	2017-04-25 17:05:54 +01:00
Luke Barnard	0d4ab07250	Fix not autoSelecting first item in dropdown Fixes https://github.com/vector-im/riot-web/issues/3686	2017-04-25 11:53:14 +01:00
Matthew Hodgson	63dac026a8	remove spammy log	2017-04-25 00:17:46 +01:00
Matthew Hodgson	24f2aed45f	summarise profile changes in MELS fixes https://github.com/vector-im/riot-web/issues/3463	2017-04-23 04:05:50 +01:00
Luke Barnard	9cd7914ea5	Finishing off the first iteration on login UI This makes the following changes: - Improve CountryDropdown by allowing all countries to be displayed at once and using PNGs for performance (trading of quality - the pngs are scaled down from 32px to 25px) - "I want to sign in with" dropdown to select login method - MXID login field that suffixes HS domain (whether custom or matrix.org) and prefixes "@" - Email field which is secretly the same as the username field but with a different placeholder - No more login flickering when changing ServerConfig (!) fixes https://github.com/vector-im/riot-web/issues/1517 This implements most of the design in https://github.com/vector-im/riot-web/issues/3524 but neglects the phone number login: ![login_with_msisdn](https://cloud.githubusercontent.com/assets/1922197/24864469/30a921fc-1dfc-11e7-95d1-76f619da1402.png) This will be updated in another PR to implement desired things: - Country code visible once a country has been selected (propbably but as a prefix to the phone number input box. - Use square flags - Move CountryDropdown above phone input and make it show the full country name when not expanded - Auto-select country based on IP	2017-04-21 11:37:08 +01:00
Luke Barnard	566a315242	Initial commit on riot-web#3524 (login UI update)	2017-04-19 10:08:04 +01:00
Matthew Hodgson	1189368aab	add a class to remove evil blue outlines	2017-04-15 00:30:48 +01:00
Luke Barnard	8b4836b60e	Refactor roles into Roles.js So that the mapping between a numerical power level and a "role" are done in one place. PowerSelector.js has been modified to use the same mapping.	2017-04-10 10:09:26 +01:00
Luke Barnard	98a0b804c7	Only join a room when enter is hit when the join button is shown	2017-03-28 13:02:13 +01:00
David Baker	878413f6a4	Support msisdn signin Changes from https://github.com/matrix-org/matrix-react-sdk/pull/742	2017-03-14 11:50:13 +00:00
Richard van der Hoff	2786fb0f46	Revert "Support registration & login with phone number (#742 )" This reverts commit `0269562383`. This breaks against the current synapse release. We need to think more carefully about backwards compatibility.	2017-03-09 18:32:44 +00:00
David Baker	0269562383	Support registration & login with phone number (#742 ) * WIP msisdn sign in * A mostly working country picker * Fix bug where you'dbe logged out after registering Stop the guest sync, otherwise it gets 401ed for using a guest access token for a non-guest, causing us to beliebe we've been logged out. * Use InteractiveAuth component for registration * Fix tests * Remove old signup code * Signup -> Login Now that Signup contains no code whatsoever related to signing up, rename it to Login. Get rid of the Signup class. * Stray newline * Fix more merge failing * Get phone country & number to the right place * More-or-less working msisdn auth component * Send the bind_msisdn param on registration * Refinements to country dropdown Rendering the whole lot when the component was rendered just makes the page load really slow, so just show 2 at a time and rely on type-to-search. Make type-to-search always display an exact iso2 match first * Propagate initial inputs to the phone input * Support msisdn login * semicolon * Fix PropTypes * Oops, use the 1qst element of the array Not the array of object keys which has no particular order * Make dropdown/countrydropdown controlled * Unused line * Add note on DOM layout * onOptionChange is required * More docs * Add missing propTypes * Don't resume promise on error * Use React.Children to manipulate children * Make catch less weird * Fix null dereference Assuming [0] of an empty list == undefined doesn't work if you're then taking a property of it.	2017-03-09 10:59:22 +00:00
Luke Barnard	ab9aaa9174	Merge pull request #732 from matrix-org/luke/fuse-test Test to see how fuse feels	2017-03-03 10:46:41 +00:00
Luke Barnard	7be55ce65c	Merge pull request #733 from matrix-org/luke/display-name-blur-to-submit Submit a new display name on blur of input field	2017-03-03 10:03:21 +00:00
Luke Barnard	1d5e47cd70	On cancel, blur. Only onValueChanged when the value has changed...	2017-03-02 18:07:24 +00:00
Luke Barnard	7a092e4ac7	Submit a new display name on blur of input field	2017-03-02 17:29:06 +00:00
Luke Barnard	e75c21e9f9	Merge pull request #683 from matrix-org/luke/mels-xor MELS: either expanded or summary, not both	2017-03-02 14:08:06 +00:00
Luke Barnard	439bde309e	General ChatInviteDialog optimisations - Use avatar initial instead of "R" or "?" - Use Fuse.js to do case-insensitive fuzzy search. This allows for better sorting of results as well as search based on weighted keys (so userId has a high weight when the input starts with "@"). - Added debounce of 200ms to prevent analysis on every key stroke. Fuse seems to degrade performance vs. simple, non-fuzzy, unsorted matching, but the debounce should prevent too much computation. - Move the selection to the top when the query is changed. There's no point in staying mid-way through the items at that point.	2017-02-23 12:12:25 +00:00
Luke Barnard	6fead66f89	MELS: check scroll on load + use mels-1,-2,... key To fix https://github.com/vector-im/riot-web/issues/2916, force the checking of scroll position by calling _onWidgetLoad (might need renaming...) when a MELS is expanded/contracted. Also use an keying scheme for MELS that doesn't depend on the events contained, but rather a simple incrementing index based on the order of the MELS as it appears amongst all MELS.	2017-02-20 10:59:11 +00:00
David Baker	b18473ccb2	Handle there being no member event when banned Here, and also in MemberEventListSummary where this also broke.	2017-02-17 16:35:18 +00:00
Luke Barnard	8d3876c7d0	MELS: either expanded or summary, not both Fixes vector-im/riot-web#3097	2017-02-09 15:14:16 +00:00
Matthew Hodgson	8fea4c27cb	fix NPE	2017-02-07 22:00:56 +00:00
Richard van der Hoff	827b5a6811	Fix deviceverifybuttons Use DeviceInfo from deviceVerificationChanged event rather than calling non-existent getStoredDevice	2017-02-03 14:34:19 +00:00
Matthew Hodgson	28d28b55d1	correctly reflect verify/blacklist state in UI	2017-02-03 01:49:22 +00:00
Matthew Hodgson	be41462f3a	merge	2017-02-02 22:05:44 +00:00
Richard van der Hoff	67bd2cf9dd	Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified	2017-01-26 14:09:25 +00:00
David Baker	e1e87807b5	Look up email addresses in ChatInviteDialog So email addresses known to the IS get a display name & avatar	2017-01-25 18:51:28 +00:00
David Baker	a3b938427d	Merge pull request #625 from matrix-org/dbkr/user_search_feedback Better feedback in invite dialog	2017-01-25 15:59:47 +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
David Baker	fd8d5af63a	Fix import of InviteAddressType and rewrite to import while we're at it	2017-01-25 14:54:21 +00:00
Luke Barnard	f9ca2a8e59	Fix _renderCommaSeparatedList	2017-01-25 11:28:12 +00:00
Luke Barnard	b887d5b823	Much linting	2017-01-25 11:05:45 +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	770820e6fa	Fix a bunch of lint complaints	2017-01-24 22:41:52 +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
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	506d37bbad	Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users	2017-01-23 11:34:44 +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
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	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
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
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
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
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
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
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	041196d729	Added quick search functionality	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
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
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	7475056bb4	MELS component should update if there are fewEvents, effectively expanding the summary	2016-12-15 18:33:13 +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
Luke Barnard	86739e7d1e	Simplify handling of only one member event	2016-12-15 13:15:00 +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
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
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
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	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
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
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	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	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	2f02c4b84e	WIP nicer join/part folding	2016-11-09 16:03:35 +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
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
David Baker	b9576754e6	Nomenclature	2016-09-27 14:50:18 +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	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	61b48a5b1a	Add component for the directory search box	2016-09-23 13:48:24 +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	31753fc3f3	Rebrand	2016-09-19 13:26:59 +01:00
Matthew Hodgson	2b9258d377	use new rawDisplayName in AddressTile	2016-09-16 03:19:33 +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
wmwragg	7fa102998c	Added valid but unknown mx user	2016-09-13 17:09:40 +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	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
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	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
wmwragg	ca3910f5a8	Mouse actions on the queryList added, as well as better queryListElement styling	2016-09-07 16:18:50 +01:00
wmwragg	7e60012bd4	Added justification for the AddressTile, when requested	2016-09-07 10:55:44 +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	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
Aviral Dasgupta	09e8a45cde	Add EmojiText component for emoji replacement.	2016-08-10 00:31:51 +05:30
Richard van der Hoff	9333793a7c	Fix code style	2016-08-01 10:49:51 +01:00
Richard van der Hoff	3194c5c61d	Factor EditableTextContainer out of ChangeDisplayName Take the non-displayname-specific bits out of ChangeDisplayName into a new EditableTextContainer, so that we can reuse the logic elsewhere.	2016-07-29 17:40:13 +01:00
Richard van der Hoff	7a7d7c0e02	Fix a pair of warnings from RoomSettings - initialise the 'publish' checkbox correctly so react doesn't grumble about it turning from uncontrolled into controlled - PowerSelector's 'controlled' property isn't really required, so mark it as such.	2016-06-23 11:15:55 +01:00
Richard van der Hoff	716eb1eb1b	Drop workaround for object.onLoad https://github.com/facebook/react/pull/5781 has been fixed in React 15.0, so drop our workaroud for it.	2016-04-17 21:46:27 +01:00
Matthew Hodgson	f4573bae49	remove premie optimisation of tintablesvg shouldComponentUpdate	2016-04-17 00:28:20 +01:00
Matthew Hodgson	8db14bde60	switch Tinter from using dispatch to a synchronous update when changing the colourscheme, to avoid CSS getting out of sync with SVG colours	2016-04-16 01:00:10 +01:00
Matthew Hodgson	a06b420942	wire up searchbox filtering	2016-04-15 17:55:00 +01:00
Matthew Hodgson	26f135c7b0	fix 'undefined' class bug on TintableSvg	2016-04-14 21:44:05 +01:00
Matthew Hodgson	e23f496dfe	fix PowerSelector to support both controlled & uncontrolled variants	2016-03-22 17:17:46 +00:00
Matthew Hodgson	59f599af5c	prompt before giving equal ops	2016-03-21 00:49:18 +00:00
Matthew Hodgson	1abd7f45ce	fix setting custom power levels	2016-03-15 01:34:49 +00:00
Matthew Hodgson	5e5fdb9b96	fix vector-im/vector-web#921	2016-02-14 13:38:12 +02:00
Kegan Dougal	38d5c7d5c5	Filter out undefined/null children which won't render	2016-01-22 15:57:42 +00:00
Kegan Dougal	d72ab641d0	Expand the list when the overflow element is clicked Negative truncateAt values means "do not truncate".	2016-01-21 15:57:59 +00:00
Kegan Dougal	eed83f982e	Add a suitable overflow tile for the member list	2016-01-21 11:41:28 +00:00
Kegan Dougal	9f362e488c	Add a TruncatedList component, which truncates children passed to it.	2016-01-21 11:30:37 +00:00
Matthew Hodgson	51648b9bf0	merge develop	2016-01-18 14:02:19 +00:00
Matthew Hodgson	17fdfa0c8f	incorporate kegan PR feedback	2016-01-18 14:00:47 +00:00
Matthew Hodgson	8e1ab8e6b4	vaguely skin MemberInfo correctly	2016-01-18 01:18:02 +00:00
Matthew Hodgson	430c90f4a4	oops ,forgot PowerSelector	2016-01-18 00:42:20 +00:00
Matthew Hodgson	0553551d92	oops ,forgot PowerSelector	2016-01-17 23:58:38 +00:00
Matthew Hodgson	5b5bd9aef1	remove create_room for now. lots of stupid bugfixes across the board.	2016-01-17 03:59:31 +00:00
Matthew Hodgson	82a159d651	make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board	2016-01-17 02:48:55 +00:00
Matthew Hodgson	8e9e33fa2a	fix NPE and make enter work again	2016-01-15 12:34:53 +00:00
Matthew Hodgson	2899082cba	deselect editabletext when tabbing away	2016-01-14 17:24:52 +00:00
Matthew Hodgson	c9c496f0e5	WIP all new roomsettings	2016-01-13 13:15:13 +00:00
Matthew Hodgson	d39a9a0f18	bring back select-all-on-click	2016-01-10 13:14:12 +00:00
Matthew Hodgson	684255044a	switch EditableText to be built on contentEditable rather than switching divs and inputs, so that it can be used for managing multiline content like topics and room names, and use it in RoomHeader/RoomSettings	2016-01-10 12:56:45 +00:00
Matthew Hodgson	8170288acb	Merge pull request #77 from matrix-org/matthew/dynamic-svg Make SVGs and CSS dynamically recolourable	2016-01-07 11:42:30 +00:00
Matthew Hodgson	fd32362aa6	oops, initialise fixups per-object, not per-prototype	2016-01-07 10:18:18 +00:00
Matthew Hodgson	0772f50fab	update copyright for 2016	2016-01-07 04:06:52 +00:00
Matthew Hodgson	296b626ed9	oops, we actually need to cache the fixups in TintableSvg	2016-01-07 03:59:09 +00:00
Matthew Hodgson	0f52c0a514	make TintableSvgs responsible for updating their own tints, and stop storing SVG DOM fragments in Tinter to avoid leaking them	2016-01-07 03:39:00 +00:00
Matthew Hodgson	f499c60b12	sundry PR feedback	2016-01-06 02:29:08 +00:00
Matthew Hodgson	509ea7c4f3	factor out tintable SVGs into their own component, and use plain DOM onload rather than react synthetic events	2016-01-06 02:11:07 +00:00
Kegan Dougal	19bd39b066	More random tweaks - Make onBlur reset the EditText to show that it hasn't submitted it. - Add the user ID of the logged in user to Advanced. - Remove remnants of the Save/Cancel buttons.	2015-12-23 16:02:18 +00:00
Kegan Dougal	6e9e314f24	Move and merge UserSelector	2015-11-26 17:37:40 +00:00
Kegan Dougal	75afc3a7de	Move and merge ProgressBar	2015-11-26 17:21:08 +00:00
Kegan Dougal	4fda0ce0c9	Fix typo	2015-11-26 15:17:34 +00:00
Kegan Dougal	17d789eb97	Merge EditableText component	2015-11-26 15:16:50 +00:00

... 19 20 21 22 23 ...

1707 commits