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
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
57505c3a61
Add behaviour to toggle app draw on app tile header click
2017-08-18 10:56:35 +01:00
9382689675
Merge branch 'develop' into luke/feature-widget-timeline-events
2017-08-18 10:47:25 +01:00
20a0ec35af
Use short form to get event URL
2017-08-18 10:45:43 +01:00
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
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
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
42d9e3bc8a
remove unused strings introduced by string change in bb084595
2017-08-17 20:26:34 +02:00
bb0845954d
improve wording for directory listings
2017-08-17 19:10:45 +01:00
7c04a6671d
expand auxPanel when showing apps
2017-08-17 19:06:19 +01:00
95d1c3746e
Kick travis
2017-08-17 18:22:52 +01:00
b0d088dfd0
Added translation using Weblate (Czech)
2017-08-17 17:11:38 +00:00
120a4f4f44
Check for valid roomId before renering manageIntegsButton.
2017-08-17 18:10:50 +01:00
0907fff080
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-17 17:47:46 +01:00
91fe308f06
Merge pull request #1310 from matrix-org/t3chguy/hotfix1
...
hotfix bad fn signature regression
2017-08-17 17:31:55 +01:00
766c188a1e
hotfix bad fn signature regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-17 17:15:18 +01:00
02edadbd15
Don't bubble cancel click to room header.
2017-08-17 12:21:44 +01:00
d1ee257b5a
Pass roomId rather than whole room object.
2017-08-17 12:15:01 +01:00
eb77dcc8e3
Camel case variable name
2017-08-17 11:24:25 +01:00
2c25639a61
Fix copyright header
2017-08-17 11:22:42 +01:00
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
e80ddc2513
Merge pull request #1309 from MTRNord/fixRobotTranslation
...
Fix Robot translation
2017-08-17 00:03:12 +01:00
59815359f8
Add misiing _tJsx import
2017-08-16 23:55:43 +02:00
fceccfc503
Add missing Robot string to translation
2017-08-16 23:54:36 +02:00
38f45bc40d
[WIP] app tile click to hide app bodies
2017-08-16 18:19:12 +01:00
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
0935f26cf3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-08-16 16:04:47 +01:00
0844beac79
Enable matrix-apps by default
2017-08-16 16:04:39 +01:00
252ab208e4
Merge pull request #1300 from matrix-org/dbkr/userpicker
...
Refactor ChatInviteDialog to be UserPickerDialog
2017-08-16 14:29:07 +01:00
14903274c0
Change OOO so that MELS generation will continue over hidden events
...
this fixes the scenario of N Member events, then an invisible event
e.g. (m.room.aliases) then more Member events. Pre hide-join-parts
this is how it worked.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-16 13:20:32 +01:00
b5f959cbdc
Merge pull request #1302 from krombel/krombel-patch-translation-link
...
Update Link to Translation status
2017-08-16 11:56:58 +01:00
222aed896f
js-sdk #develop
2017-08-16 10:06:50 +01:00
8f21ba7f7a
js-sdk 0.8.0
2017-08-16 09:37:10 +01:00
a379f04ca8
Merge pull request #1306 from matrix-org/luke/fix-te-i18n-variables
...
Fix i18n variable names and `)s` syntax for TE.json (Tegulu)
2017-08-15 18:18:54 +01:00
eae5a45ec2
Fix variable case
2017-08-15 18:02:46 +01:00
063cbcfc73
Merge pull request #1303 from matrix-org/luke/fix-autocomplete-by-mxid
...
Allow autocompletion when typing user IDs
2017-08-15 17:32:03 +01:00
036fa0e944
Merge pull request #1305 from matrix-org/t3chguy/fix_async_modal
...
fix async modal create fn signature
2017-08-15 17:31:45 +01:00
9818007022
Fix i18n variable names and `)s` syntax for TE.json (Tegulu)
2017-08-15 17:29:55 +01:00
60c2532616
Merge pull request #1304 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-08-15 16:27:42 +01:00
Luke Barnard