Ubuntu File Manager App

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

  1. fix-1490146-chdoctypes
  2. Merge into trunk
Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Carlos Jose Mazieri
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 Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:459
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/538/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/160

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/538/rebuild

review: Approve (continuous-integration)
Revision history for this message
Carlos Jose Mazieri (carlos-mazieri) wrote :

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
1=== modified file 'AUTHORS'
2--- AUTHORS 2015-07-06 16:41:06 +0000
3+++ AUTHORS 2015-08-29 12:43:31 +0000
4@@ -32,4 +32,5 @@
5 Robert Schroll <rschroll@gmail.com>
6 Sam Hewitt <snwh@ubuntu.com>
7 Sergio Schvezov <sergio.schvezov@canonical.com>
8+Stefano Verzegnassi <verzegnassi.stefano@gmail.com>
9 Victor Thompson <victor.thompson@gmail.com>
10
11=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
12--- src/app/qml/content-hub/contenttyperesolver.js 2015-02-03 20:19:00 +0000
13+++ src/app/qml/content-hub/contenttyperesolver.js 2015-08-29 12:43:31 +0000
14@@ -45,10 +45,15 @@
15 'wmv': CH.ContentType.Videos,
16
17 'txt': CH.ContentType.Documents,
18+ 'odt': CH.ContentType.Documents,
19 'doc': CH.ContentType.Documents,
20 'docx': CH.ContentType.Documents,
21+ 'ods': CH.ContentType.Documents,
22 'xls': CH.ContentType.Documents,
23 'xlsx': CH.ContentType.Documents,
24+ 'odp': CH.ContentType.Documents,
25+ 'ppt': CH.ContentType.Documents,
26+ 'pptx': CH.ContentType.Documents,
27 'pdf': CH.ContentType.Documents,
28 }
29

Subscribers

People subscribed via source and target branches