Robert Swain
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
Richard Lewis
38720e6216
Add internationlisation.
2017-08-21 10:05:16 +01:00
Robert Swain
2eac869e27
Merge branch 'develop' into rob/apps-not-e2ee
2017-08-21 10:30:38 +02:00
Robert Swain
70824960ee
AppPermission: Make strings translatable
2017-08-21 10:23:55 +02:00
Jean
c6a48cbda6
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-19 11:03:09 +00:00
kaiyou
345903514a
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-19 11:03:04 +00:00
Richard Lewis
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
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
Richard Lewis
e32c499298
Merge pull request #1320 from matrix-org/rxl881/timeline
...
Timeline improvements
2017-08-18 18:11:47 +01:00
Richard Lewis
7395f96b77
Rearrange timeline update wording for better internationalisation. Fix widget name values.
2017-08-18 18:02:50 +01:00
Luke Barnard
b678c2cf0f
Don't bind Pill function, React does this for us
2017-08-18 17:15:27 +01:00
Krombel
45e7f1c401
Translated using Weblate (German)
...
Currently translated at 100.0% (963 of 963 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-08-18 15:56:09 +00:00
Robert Swain
2e00968bcd
AppPermission: Note that apps are not E2E encrypted in E2E rooms
2017-08-18 17:44:33 +02:00
Bamstam
4a1106de2f
Translated using Weblate (German)
...
Currently translated at 94.9% (914 of 963 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-08-18 15:32:53 +00:00
Luke Barnard
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
Richard Lewis
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
Richard Lewis
1c36e47403
Fix add widget link
2017-08-18 15:59:12 +01:00
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
