Merge lp:~verzegnassi-stefano/ubuntu-filemanager-app/fix-1490146-chdoctypes into lp:ubuntu-filemanager-app

Proposed by Stefano Verzegnassi on 2015-08-29
Status: Merged
Approved by: Carlos Jose Mazieri on 2015-09-06
Approved revision: 459
Merged at revision: 462
Proposed branch: lp:~verzegnassi-stefano/ubuntu-filemanager-app/fix-1490146-chdoctypes
Merge into: lp:ubuntu-filemanager-app
Diff against target: 28 lines (+6/-0)
2 files modified
AUTHORS (+1/-0)
src/app/qml/content-hub/contenttyperesolver.js (+5/-0)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-filemanager-app/fix-1490146-chdoctypes
Reviewer Review Type Date Requested Status
Carlos Jose Mazieri 2015-08-29 Approve on 2015-09-03
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-08-29
Review via email: mp+269565@code.launchpad.net

Commit message

Added content hub support to following document types:
- OpenDocument Text (.odt)
- OpenDocument Spreadsheet (.ods)
- OpenDocument Presentation (.odp)
- Microsoft Office Powerpoint (.ppt)
- Office Open XML Presentation (.pptx)

Description of the change

Added content hub support to following document types:
- OpenDocument Text (.odt)
- OpenDocument Spreadsheet (.ods)
- OpenDocument Presentation (.odp)
- Microsoft Office Powerpoint (.ppt)
- Office Open XML Presentation (.pptx)

To post a comment you must log in.
review: Approve (continuous-integration)

This is OK to me.

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2015-07-06 16:41:06 +0000
+++ AUTHORS 2015-08-29 12:43:31 +0000
@@ -32,4 +32,5 @@
32Robert Schroll <rschroll@gmail.com>32Robert Schroll <rschroll@gmail.com>
33Sam Hewitt <snwh@ubuntu.com>33Sam Hewitt <snwh@ubuntu.com>
34Sergio Schvezov <sergio.schvezov@canonical.com>34Sergio Schvezov <sergio.schvezov@canonical.com>
35Stefano Verzegnassi <verzegnassi.stefano@gmail.com>
35Victor Thompson <victor.thompson@gmail.com>36Victor Thompson <victor.thompson@gmail.com>
3637
=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
--- src/app/qml/content-hub/contenttyperesolver.js 2015-02-03 20:19:00 +0000
+++ src/app/qml/content-hub/contenttyperesolver.js 2015-08-29 12:43:31 +0000
@@ -45,10 +45,15 @@
45 'wmv': CH.ContentType.Videos,45 'wmv': CH.ContentType.Videos,
4646
47 'txt': CH.ContentType.Documents,47 'txt': CH.ContentType.Documents,
48 'odt': CH.ContentType.Documents,
48 'doc': CH.ContentType.Documents,49 'doc': CH.ContentType.Documents,
49 'docx': CH.ContentType.Documents,50 'docx': CH.ContentType.Documents,
51 'ods': CH.ContentType.Documents,
50 'xls': CH.ContentType.Documents,52 'xls': CH.ContentType.Documents,
51 'xlsx': CH.ContentType.Documents,53 'xlsx': CH.ContentType.Documents,
54 'odp': CH.ContentType.Documents,
55 'ppt': CH.ContentType.Documents,
56 'pptx': CH.ContentType.Documents,
52 'pdf': CH.ContentType.Documents,57 'pdf': CH.ContentType.Documents,
53}58}
5459

Subscribers

People subscribed via source and target branches