Add some mimetypes #21766

Merged
merged 1 commit into from Feb 4, 2016

Projects

None yet

9 participants

@farukuzun
Member

For owncloud/richdocuments to work correctly with following file formats;

  • application/vnd.lotus-wordpro
  • application/vnd.visio
  • application/vnd.wordperfect
  • application/msonenote
@mention-bot

By analyzing the blame information on this pull request, we identified @Xenopathic, @rullzer and @LukasReschke to be potential reviewers

@PVince81
Collaborator
@nickvergessen nickvergessen and 1 other commented on an outdated diff Jan 18, 2016
core/js/mimetypelist.js
"image",
- "audio"
+ "folder-starred",
+ "folder-public",
+ "folder-drag-accept",
+ "text",
+ "video",
+ "audio",
+ "file",
+ "application-pdf",
+ "folder-external",
+ "application"
@nickvergessen
nickvergessen Jan 18, 2016 Contributor

if we toucht hte list like that, we should sort it alphabetically?

@farukuzun
farukuzun Jan 18, 2016 Member

@nickvergessen this file updated automatically by ./occ maintenance:mimetype:update-js command.

@nickvergessen
nickvergessen Jan 18, 2016 Contributor

Okay, fixed it in #21769

@farukuzun
farukuzun Jan 18, 2016 Member

Ah I didn't pay attention to this file since its automatically created, sorry for that :)

@nickvergessen
nickvergessen Jan 18, 2016 Contributor

Merged the sorting, now you need to rebase your branch on master:

This branch has conflicts that must be resolved

@DeepDiver1975 DeepDiver1975 added this to the 9.0-current milestone Jan 18, 2016
@farukuzun
Member

@nickvergessen Rebased

@rullzer
Contributor
rullzer commented Jan 19, 2016

We probabaly want a mimetype repair job for this as well. Else only new files have the proper mime types.

@farukuzun see https://github.com/owncloud/core/blob/master/lib/private/repair/repairmimetypes.php . The file is pretty self explaining. And of course unit tests in https://github.com/owncloud/core/blob/master/tests/lib/repair/repairmimetypes.php

@LukasReschke
Member

Missing unit tests, moving back to 2. @farukuzun let us know if you need any help on the unit tests and feel free to join us on #owncloud-dev in Freenode ๐Ÿ˜„ ๐Ÿš€

@farukuzun
Member

Thank you for your help and pardon my timing. I updated my commit. On CODE, richdocuments is working on ownCloud 8.2.2. Is it possible for me to backport this patch to next bugfix release for ownCloud 8? Thanks ^^

@nickvergessen nickvergessen and 1 other commented on an outdated diff Feb 2, 2016
lib/private/repair/repairmimetypes.php
@@ -356,5 +367,11 @@ public function run() {
$this->emit('\OC\Repair', 'info', array('Fixed rtf mime type'));
}
}
+
+ if (version_compare($ocVersionFromBeforeUpdate, '9.0.0.7', '<')) {
@nickvergessen
nickvergessen Feb 2, 2016 Contributor

Should use 9.0.0.9 and update the version in version.php

@farukuzun
farukuzun Feb 2, 2016 Member

Updated my commit.

@rullzer
Contributor
rullzer commented Feb 3, 2016

Looking good... one more thing... could you update https://github.com/farukuzun/core-1/blob/master/tests/lib/repair/repairmimetypes.php#L449 as well?

@rullzer
Contributor
rullzer commented Feb 3, 2016

Also @farukuzun did you sign the CLA?

@MorrisJobke
Member

Also @farukuzun did you sign the CLA?

Or as alternative simply state that this is MIT licensed ;)

@MorrisJobke
Member

Could I also ask you to rebase and change the version number to 10, because it was increased recently to 9.

Faruk Uzun Introduce some mimetypes for richdocuments
* application/vnd.lotus-wordpro
* application/vnd.visio
* application/vnd.wordperfect
* application/msonenote
6ffd8f3
@farukuzun
Member

Rebased, added changes @rullzer & @MorrisJobke asks, signed CLA and mailed it to @karlitschek

@karlitschek
Member

I can confirm that I got the agreement. ๐Ÿ‘

@nickvergessen
Contributor

๐Ÿ‘

@MorrisJobke
Member

Tested and works ๐Ÿ‘

@DeepDiver1975 DeepDiver1975 merged commit d8faeab into owncloud:master Feb 4, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@farukuzun farukuzun pushed a commit to farukuzun/owncloud-core that referenced this pull request Feb 8, 2016
Faruk Uzun Introduce some mimetypes for richdocuments
* application/vnd.lotus-wordpro
* application/vnd.visio
* application/vnd.wordperfect
* application/msonenote

Backport of #21766
0d3b333
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment