Luke Barnard
7a277bff3a
Add a space between widget name and "widget" in widget event tiles
2017-08-18 15:45:02 +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
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
Luke Barnard
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
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
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
Richard Lewis
857a8c9519
Remove empty defaultProps.
2017-08-18 13:28:47 +01:00
Luke Barnard
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
Luke Barnard
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
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
Luke Barnard
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
Matthew Hodgson
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
Luke Barnard
1bba1f0fa6
Add comment
2017-08-18 12:04:34 +01:00
Luke Barnard
6c37a9a3af
Simplify getting of content, prev content for widget event
2017-08-18 12:03:29 +01:00
Michael Telatynski
615d96a065
catch hidden event being RM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-18 11:53:52 +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
David Baker
55998028b4
Show group invites in 'invites' section
2017-08-18 11:22:50 +01:00
Luke Barnard
0adc043884
Merge branch 'luke/feature-app-tile-ux' of github.com:matrix-org/matrix-react-sdk into luke/feature-app-tile-ux
2017-08-18 11:01:02 +01:00
Luke Barnard
57505c3a61
Add behaviour to toggle app draw on app tile header click
2017-08-18 10:56:35 +01:00
Luke Barnard
9382689675
Merge branch 'develop' into luke/feature-widget-timeline-events
2017-08-18 10:47:25 +01:00
Luke Barnard
20a0ec35af
Use short form to get event URL
2017-08-18 10:45:43 +01:00
Luke Barnard
f2172a1a86
Merge branch 'luke/feature-widget-timeline-events' of github.com:matrix-org/matrix-react-sdk into luke/feature-widget-timeline-events
2017-08-18 10:44:25 +01:00
Luke Barnard
acc54b97f1
Implement TextualEvent tiles for im.vector.modular.widgets
...
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
2017-08-18 10:35:33 +01:00
Matthew Hodgson
ee383e0570
Merge pull request #1311 from krombel/string_cleanup_translation_change
...
remove unused strings introduced by string change
2017-08-17 20:02:19 +01:00
Krombel
42d9e3bc8a
remove unused strings introduced by string change in bb084595
2017-08-17 20:26:34 +02:00
Matthew Hodgson
bb0845954d
improve wording for directory listings
2017-08-17 19:10:45 +01:00
Matthew Hodgson
7c04a6671d
expand auxPanel when showing apps
2017-08-17 19:06:19 +01:00
Richard Lewis
95d1c3746e
Kick travis
2017-08-17 18:22:52 +01:00
Jan Kudrik
b0d088dfd0
Added translation using Weblate (Czech)
2017-08-17 17:11:38 +00:00
Richard Lewis
120a4f4f44
Check for valid roomId before renering manageIntegsButton.
2017-08-17 18:10:50 +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
David Baker
91fe308f06
Merge pull request #1310 from matrix-org/t3chguy/hotfix1
...
hotfix bad fn signature regression
2017-08-17 17:31:55 +01:00
Michael Telatynski
766c188a1e
hotfix bad fn signature regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-17 17:15:18 +01:00
Michael Telatynski
bdb2d6b475
Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings
...
# Conflicts:
# src/components/structures/MatrixChat.js
2017-08-17 13:39:19 +01:00
Michael Telatynski
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler
2017-08-17 13:33:07 +01:00
Richard Lewis
02edadbd15
Don't bubble cancel click to room header.
2017-08-17 12:21:44 +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
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
Matthew Hodgson
e80ddc2513
Merge pull request #1309 from MTRNord/fixRobotTranslation
...
Fix Robot translation
2017-08-17 00:03:12 +01:00
MTRNord
59815359f8
Add misiing _tJsx import
2017-08-16 23:55:43 +02:00
MTRNord
fceccfc503
Add missing Robot string to translation
2017-08-16 23:54:36 +02:00
Luke Barnard
38f45bc40d
[WIP] app tile click to hide app bodies
2017-08-16 18:19:12 +01:00
Luke Barnard
7c336cd00a
Implement TextualEvent tiles for im.vector.modular.widgets
...
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
2017-08-16 17:46:20 +01:00
Luke Barnard
0935f26cf3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-08-16 16:04:47 +01:00
Luke Barnard
0844beac79
Enable matrix-apps by default
2017-08-16 16:04:39 +01:00
David Baker
ddf1017799
Make group invites work
2017-08-16 14:58:30 +01:00
