85b609608e
v0.10.1-rc.1
2017-08-22 18:53:11 +01:00
f4fb502fc3
Prepare changelog for v0.10.1-rc.1
2017-08-22 18:53:11 +01:00
8312cf6ab2
Temporarily bump version
...
so we compare to 0.10.0-rc.2 rather than 0.9.7
2017-08-22 18:50:33 +01:00
3939d948bf
js-sdk v0.10.1-rc.1
2017-08-22 18:43:33 +01:00
502a0480a0
Merge pull request #1327 from matrix-org/matthew/multiple-widgets
...
Matthew/multiple widgets
2017-08-22 10:53:51 +01:00
a69cc9169f
lint fix.
2017-08-22 10:04:57 +01:00
74ab7c9bb3
Fix encoding
2017-08-22 09:59:27 +01:00
a0fe3d1cb0
Merge pull request #1326 from matrix-org/rav/userpicker_proptypes
...
Fix proptypes on UserPickerDialog
2017-08-21 16:43:15 +01:00
764d5891ad
Fix proptypes on UserPickerDialog
...
... so that it doesn't log an error
2017-08-21 16:30:49 +01:00
b7569a9831
Revert auxPanel changes (this should already have been fixed in a separate PR).
2017-08-21 15:29:11 +01:00
bfb6f8f273
Merge pull request #1325 from matrix-org/rob/appdrawer-bind
...
AppsDrawer: Remove unnecessary bind
2017-08-21 15:59:47 +02:00
385205471b
AppsDrawer: Remove unnecessary bind
2017-08-21 15:34:13 +02:00
c0f0425907
Merge pull request #1322 from matrix-org/rxl881/styling
...
Position add app widget link
2017-08-21 14:03:27 +01:00
e8e3117099
Merge pull request #1323 from matrix-org/rxl881/beta
...
Remove app tile beta tag.
2017-08-21 14:03:15 +01:00
97485366bc
Merge pull request #1324 from matrix-org/rxl881/strings
...
Add missing translation.
2017-08-21 12:16:08 +01:00
866f6f1dd3
Add missing translation.
2017-08-21 12:11:21 +01:00
6c8391e3ea
Remove beta tag.
2017-08-21 11:39:06 +01:00
e93a1fac3d
Position add app widget link
2017-08-21 11:29:42 +01:00
fde6314e0f
Merge pull request #1319 from matrix-org/rob/apps-not-e2ee
...
Note that apps are not E2EE
2017-08-21 11:45:47 +02:00
38720e6216
Add internationlisation.
2017-08-21 10:05:16 +01:00
2eac869e27
Merge branch 'develop' into rob/apps-not-e2ee
2017-08-21 10:30:38 +02:00
70824960ee
AppPermission: Make strings translatable
2017-08-21 10:23:55 +02:00
388d8141ae
Merge pull request #1321 from matrix-org/rxl881/warnings
...
Only render appTile body (including warnings) if drawer shown.
2017-08-18 18:43:21 +01:00
d7f5295949
untested WIP for supporting multiple widgets properly
2017-08-18 18:40:00 +01:00
1862057695
Only render appTile body (including warnings) if drawer shown.
2017-08-18 18:33:56 +01:00
e32c499298
Merge pull request #1320 from matrix-org/rxl881/timeline
...
Timeline improvements
2017-08-18 18:11:47 +01:00
7395f96b77
Rearrange timeline update wording for better internationalisation. Fix widget name values.
2017-08-18 18:02:50 +01:00
b678c2cf0f
Don't bind Pill function, React does this for us
2017-08-18 17:15:27 +01:00
2e00968bcd
AppPermission: Note that apps are not E2E encrypted in E2E rooms
2017-08-18 17:44:33 +02:00
273abd9327
Merge pull request #1318 from matrix-org/luke/fix-widget-event-name
...
Add a space between widget name and "widget" in widget event tiles
2017-08-18 16:09:20 +01:00
942656d947
Merge pull request #1286 from matrix-org/rxl881/appFixes
...
Move manage integrations button from settings page to room header as a stand-alone component
2017-08-18 16:09:08 +01:00
1c36e47403
Fix add widget link
2017-08-18 15:59:12 +01:00
7a277bff3a
Add a space between widget name and "widget" in widget event tiles
2017-08-18 15:45:02 +01:00
b7d46d91ed
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-18 15:35:01 +01:00
bf07333915
Merge pull request #1316 from matrix-org/luke/fix-app-name-case
...
Don't apply case logic to app names
2017-08-18 15:08:40 +01:00
3c7eec711b
Merge pull request #1315 from matrix-org/luke/fix-apps-auto-integs
...
Stop integ manager opening on every room switch
2017-08-18 15:07:35 +01:00
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
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
857a8c9519
Remove empty defaultProps.
2017-08-18 13:28:47 +01:00
3a7aa926c3
Merge pull request #1313 from matrix-org/luke/feature-app-tile-ux
...
Add behaviour to toggle app draw on app tile header click
2017-08-18 13:08:57 +01:00
caff761df7
Merge pull request #1308 from matrix-org/t3chguy/mels_fix
...
Change OOO so that MELS generation will continue over hidden events
2017-08-18 13:08:35 +01:00
84f5e5aad2
REmove unused onCancelClick
2017-08-18 12:21:48 +01:00
1a1a80b633
Merge branch 'develop' into luke/feature-app-tile-ux
2017-08-18 12:12:00 +01:00
cab3123bd8
Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events
...
Implement TextualEvent tiles for im.vector.modular.widgets
2017-08-18 12:10:22 +01:00
0c99abc89b
Merge pull request #1314 from matrix-org/rxl881/securityWarning
...
Don't show widget security warning to the person that added it to the room
2017-08-18 12:08:23 +01:00
1bba1f0fa6
Add comment
2017-08-18 12:04:34 +01:00
6c37a9a3af
Simplify getting of content, prev content for widget event
2017-08-18 12:03:29 +01:00
615d96a065
catch hidden event being RM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-18 11:53:52 +01:00
96900e76a0
Move error logging to where it is first caught.
2017-08-18 11:51:32 +01:00
4b5cdac032
Don't show widget security warning to the person who added it to the room.
2017-08-18 11:41:27 +01:00
David Baker