276 commits

Author	SHA1	Message	Date
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
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
Richard Lewis	2e3bdfd55d	Fix string indentation.	2017-10-25 10:45:17 +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
Richard Lewis	3c4c986aca	Update button text	2017-10-23 18:42:43 +01:00
Richard Lewis	ee60155846	Add delete widget confirmation dialog.	2017-10-23 17:05:44 +01:00
Stefan Parviainen	a96169e80e	Fix merge conflict	2017-10-02 17:57:22 +02: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
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
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
Robert Swain	53574541c3	AppTile: Add Jitsi electron screensharing support	2017-09-04 09:31:25 +02:00
Richard Lewis	2ff1888054	Make staging widgets work with live and vice versa.	2017-08-30 10:36:22 +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
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
Robert Swain	2e00968bcd	AppPermission: Note that apps are not E2E encrypted in E2E rooms	2017-08-18 17:44:33 +02: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
Luke Barnard	1a1a80b633	Merge branch 'develop' into luke/feature-app-tile-ux	2017-08-18 12:12:00 +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
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	7599bde1f6	Fix logging line length.	2017-08-02 17:05:46 +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	bc4d979d1e	Display warning if widget is mixed content	2017-08-01 17:29:29 +01:00
Richard Lewis	546173d246	Fix scalar token	2017-08-01 15:53:42 +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	aff1cd9469	Add allow-presentation permission to iframe sandbox permissions	2017-07-28 11:14:04 +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	8e4f1f0989	Add message spinner.	2017-07-27 16:41:52 +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
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
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	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
Richard Lewis	e8353edb06	Disable test postmessag	2017-06-06 15:57:40 +01:00
Richard Lewis	dc4f321707	Pass room and user id to apps draw	2017-06-05 18:21:31 +01:00
Richard Lewis	c6991fd33c	Periodically pass messages to embedded iframe	2017-06-04 23:00:52 +01:00
Richard Lewis	dac154f828	Add full width widgets	2017-05-31 10:08:39 +01:00
Richard Lewis	ec03cf4de3	disable iframe sandboxing. Remove BBC news iframe	2017-05-30 10:46:51 +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