Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add text/org mimetype #24488

Merged
merged 2 commits into from
Dec 15, 2020
Merged

add text/org mimetype #24488

merged 2 commits into from
Dec 15, 2020

Conversation

zzkt
Copy link
Contributor

@zzkt zzkt commented Dec 1, 2020

The text app (or any future editor) should be able to edit .org files when text/org and text/plain MIME types are set and the webserver is correctly configured (based on comments from nextcloud/text#1205 )

Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also need to add this to the repair step as in 9708b00, otherwise existing files will not get the new mimetype.

@zzkt
Copy link
Contributor Author

zzkt commented Dec 2, 2020

sure. what would be a reasonable version number for the test (version_compare($ocVersionFromBeforeUpdate ...

@juliushaertl
Copy link
Member

The current one on master would be 21.0.0.7 https://github.com/nextcloud/server/blob/master/version.php#L32. So taking that makes sure that once 21 is released every instance upgraded from below will run the mimetype repair.

@zzkt
Copy link
Contributor Author

zzkt commented Dec 4, 2020

i've added another commit. let me know if anything else is needed...

@juliushaertl juliushaertl added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Dec 8, 2020
@juliushaertl
Copy link
Member

Looks good to me now 👍

There is only one thing missing - you need to add a sign-off message to the commits you made. Read more about this in https://github.com/nextcloud/server/blob/master/.github/CONTRIBUTING.md#sign-your-work

@zzkt
Copy link
Contributor Author

zzkt commented Dec 11, 2020

i've amended the commits (or branch?) and it looks ok with git log --show-signature but it's a bit messy...

@kesselb
Copy link
Contributor

kesselb commented Dec 11, 2020

git rebase HEAD~6 --signoff
git push --force-with-lease origin patch-1

https://github.com/nextcloud/server/pull/24488/checks?check_run_id=1536789034 for more details. You may squash the commits together. That's easier to sign off.

@zzkt
Copy link
Contributor Author

zzkt commented Dec 11, 2020

thanks for the pointer @kesselb

@kesselb
Copy link
Contributor

kesselb commented Dec 11, 2020

Mind to do another rebase? 3 out 5 commit seems unrelated.

Signed-off-by: nik gaffney <nik@fo.am>
Signed-off-by: nik gaffney <nik@fo.am>
@kesselb
Copy link
Contributor

kesselb commented Dec 11, 2020

@juliushaertl 🏓

@juliushaertl juliushaertl merged commit 2bedfbd into nextcloud:master Dec 15, 2020
@welcome
Copy link

welcome bot commented Dec 15, 2020

Thanks for your first pull request and welcome to the community! Feel free to keep them coming! If you are looking for issues to tackle then have a look at this selection: https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22

@zzkt zzkt deleted the patch-1 branch December 15, 2020 14:44
@rullzer rullzer mentioned this pull request Dec 16, 2020
59 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants