Commit Graph

57 Commits (706981688a723a3e5b9404ba863e92c48ed40bbe)

Author SHA1 Message Date
Andrew (anoa) b4868a6846
showWidget->hideWidgetDrawer and remove logs
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-26 11:27:58 -07:00
Andrew (anoa) 9821f0d459
Fix linting
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:42:06 -07:00
Andrew (anoa) f032284eff
Remember whether widget drawer was hidden per-room
Fixes #4850

Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:28:10 -07: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
David Baker c11432c3e3 Catch the promise rejection if scalar fails
Otherwise this is incredibly annoying when developing if you don't
have a scalar that will allow you to register (ie. if you're
testing against an HS on your dev box)
2017-08-23 19:35:33 +01:00
Robert Swain 385205471b AppsDrawer: Remove unnecessary bind 2017-08-21 15:34:13 +02:00
Richard Lewis e93a1fac3d Position add app widget link 2017-08-21 11:29:42 +01:00
Richard Lewis 1c36e47403 Fix add widget link 2017-08-18 15:59:12 +01: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 36fffa1696 Stop integ manager opening on every room switch
This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle.

This was introduced in matrix-org/matrix-react-sdk#1312.

Known issue with this fix: deleting the last app doesn't hide the app drawer.
2017-08-18 14:48:58 +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
Richard Lewis 9111cb421e Merge pull request #1291 from matrix-org/rxl881/maxWidgets
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-17 10:03:42 +01:00
Richard Lewis 0323151bee Show a dialog if the maximum number of widgets allowed has been reached. 2017-08-10 23:53:43 +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 20a1693c71 Only display add app link if user has permission to add widgets in the room. 2017-07-27 23:38:02 +01:00
Richard Lewis 27923e300c Add JSX wrapper. 2017-07-27 17:47:04 +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
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
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
Richard Lewis d091550ccb Use app ID for element key and pass screen parameter to scalar. 2017-07-06 15:59:59 +01:00
Kegan Dougal b8941f76d3 Fix bug which breaks the close button on scalar 2017-06-30 15:42:36 +01:00
Richard Lewis ea83d7eee2 Add missing import and fix apps reference. 2017-06-28 15:53:18 +01:00
Richard Lewis 3a10cda2ca Add translations. 2017-06-28 13:55:18 +01:00
Richard Lewis f8c064ec25 REmove redundant call to _getApps 2017-06-28 13:45:29 +01:00
Richard Lewis e70eca0b0c Comment unused code and add TODO to handle scalar errors. 2017-06-28 12:58:09 +01:00
Richard Lewis d06d066050 Move getInitialState to top of file. 2017-06-28 12:54:47 +01:00
Richard Lewis e752cc8557 Use 'this' in preference to local reference. 2017-06-28 12:32:38 +01:00
Richard Lewis 481a66ef3c Fix header. 2017-06-28 12:26:05 +01:00
Richard Lewis aab4c097e6 Make query parameters generic. 2017-06-27 12:26:13 +01:00
Richard Lewis 18ea76b864 Removed commented code 2017-06-27 11:31:00 +01:00
Richard Lewis e343e99355 Cleaned up unused files and removed commented code 2017-06-27 11:28:38 +01:00
Richard Lewis 2cb2c44bd8 Remove unused logging 2017-06-20 17:57:48 +01:00
Richard Lewis 68473e118f Ensure that Scalar Messaging is started and stopped on component mount / unmount 2017-06-20 17:56:45 +01:00
Richard Lewis a449588c1c Replace add app dialog with scalar interface 2017-06-20 10:54:41 +01:00
Robert Swain edb11d805e AppsDrawer: Open add app widget if opening empty drawer
This felt much better than having to also click the add app widget
button.
2017-06-14 15:05:29 +02:00
Robert Swain 2d3c886646 AppsDrawer: Generate room alias for vrdemo 2017-06-14 13:27:15 +02:00
Robert Swain 9c8ab2691b AppsDrawer: Only append queryParams once 2017-06-14 13:26:43 +02:00
Robert Swain 880e7149f3 ModularWidgets: Add a quick VR demo widget 2017-06-14 13:05:43 +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
Robert Swain a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02: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
Richard Lewis e9f110a4c5 Don't show add widget if there are more than one existing widgets 2017-06-06 14:50:43 +01:00
Richard Lewis dc4f321707 Pass room and user id to apps draw 2017-06-05 18:21:31 +01:00
Richard Lewis dac154f828 Add full width widgets 2017-05-31 10:08:39 +01:00
Richard Lewis ae1753bce6 Add tipping widgets 2017-05-30 18:39:51 +01:00