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

[plugin.video.disclose_tv] 0.1.6 #485

Merged
merged 1 commit into from
May 21, 2016
Merged

[plugin.video.disclose_tv] 0.1.6 #485

merged 1 commit into from
May 21, 2016

Conversation

Spinalcracker
Copy link

@Spinalcracker Spinalcracker commented May 19, 2016

Disclose.TV addon fixed and improved

fixed playback
defaults to HD streams
added setting to disable HD default
This PR as suggested by Martijn - see here: http://forum.kodi.tv/showthread.php?tid=147572&pid=2331972#pid2331972

.pyo files deleted and commits squashed

Thank you

@learningit
Copy link
Member

Sorry that's not squashed. Pls see https://github.com/ginatrapani/todo.txt-android/wiki/Squash-All-Commits-Related-to-a-Single-Issue-into-a-Single-Commit for how to squash to a single commit.

@Spinalcracker
Copy link
Author

Spinalcracker commented May 19, 2016

Hmm, that didn't seem to squash these commits even though I have that as the only option in the repo settings on github.

Am I best to close this, refork and resubmit?

edit - ok, I will give that a shot - sorry, new to github

@learningit
Copy link
Member

Did you do the force push?

@learningit
Copy link
Member

You can use the same PR, just follow the instructions on the link I gave previously.

@Spinalcracker
Copy link
Author

You can use the same PR, just follow the instructions on the link I gave previously.

Ok, I'll try that tonight. I was thinking you guys would just do the squash on the merge as per this documentation

https://github.com/blog/2141-squash-your-commits
https://help.github.com/articles/about-pull-request-merge-squashing/

I'm still learning all of this - thank you for your help.

@learningit
Copy link
Member

We prefer a squashed, single commit because review of the changes is less error prone. We also don't have to guess about how to resolve potential conflicts of multiple commits, so the easy answer is to have a single commit.

@Spinalcracker
Copy link
Author

I understand. Makes sense. I'll get it figured out tonight as there doesn't appear to be a way to do this from the website, and only have access from my phone atm.

@Spinalcracker
Copy link
Author

Success! A single commit.

@phil65
Copy link

phil65 commented May 19, 2016

One commit, but with a wrong title:)
Commit title should be: [plugin.video.disclose_tv] 0.1.6

@Spinalcracker
Copy link
Author

Ok.. I think I got it finally, lol. Thank you for your patience as I learn git.

<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.disclose_tv" name="Disclose.tv" version="0.1.6" provider-name="Sphere - patched by Spinalcracker :)">
<requires>
<import addon="xbmc.python" version="2.1.0"/>

This comment was marked as spam.

@phil65
Copy link

phil65 commented May 19, 2016

Please convert all strings.xml files to strings.po.

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.disclose_tv" name="Disclose.tv" version="0.1.6" provider-name="Sphere - patched by Spinalcracker :)">

This comment was marked as spam.

This comment was marked as spam.

@phil65
Copy link

phil65 commented May 19, 2016

Still missing:

Please convert all strings.xml files to strings.po.

After that it´s good to go I think.

Disclose.TV addon fixed and improved

fixed playback
defaults to HD streams
added setting to disable HD default
converted all translation xml to po
This PR as suggested by Martijn - see here:
http://forum.kodi.tv/showthread.php?tid=147572&pid=2331972#pid2331972
@Spinalcracker
Copy link
Author

After that it´s good to go I think.

Ok, all strings.xml converted to strings.po

Thank you

@phil65
Copy link

phil65 commented May 21, 2016

Well, thanks from our side for contributing and your patience.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants