MrMC / mrmc

MrMC Main Repository - By using this code you agree to follow the GPLv2 license.
http://forum.mrmc.tv
Other
186 stars 68 forks source link

Pm3.hd changes #26

Closed BAGAsss closed 6 years ago

BAGAsss commented 7 years ago

This is pm3.hd advance development

amet commented 7 years ago

phase 1 of the review id done, now squash it all in into one commit and I'll look it over again

remove https://github.com/MrMC/mrmc/pull/26/commits/cb8a224a8b0c9f66be52f5abbf4a586c3e948564 please

BAGAsss commented 7 years ago

Hi!

Sorry but i cannot understood what u asked me to do - i new one in github

in my branch i already made all changes more than month ago.

PS - all questions in your later e-mails - it add possibility use 4 smart-playlists on homescreen cause tv-shows shows all series as movies and cartoons as movies section too

here u can make up to 4 smart-playlist as u want and put it on homescreen for quick call.

Other changes - corrections for better use.

On 18.5.17 23:23, Zeljko Ametovic wrote:

Hi,

I would like to have this all in one commit please, just use -> http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git and remove cb8a224 https://github.com/MrMC/mrmc/commit/cb8a224a8b0c9f66be52f5abbf4a586c3e948564 from the commits

then force push into your own branch and changes will reflect here.. once cleaned up, I will pull it in

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302530582, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kThkltVexS7vFnCbwc7u9-pFbt5wks5r7KipgaJpZM4Ne93h.

amet commented 7 years ago

changes in your branch work for you as you are not interested in unifont-9.0.06.ttf for example, what I have asked is for whitelines and unnecessary changes to be removed and that functionality not be changed for some items, like quit button has to stay hidden on tvos and ios and <visible> tags to include HasServices, unifont to not be removed ... etc

BAGAsss commented 7 years ago

I tried do not remove additional lines and comment it for future using.

On 19.5.17 10:56, Zeljko Ametovic wrote:

changes in your branch work for you as you are not interested in unifont-9.0.06.ttf for example, what I have asked is for whitelines and unnecessary changes to be removed and that functionality not be changed for some items, like quit button has to stay hidden on tvos and ios and tags to include HasServices, unifont to not be removed ... etc

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302635783, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kSofvVKJQONaO0gEC8l4PbYR-Xxlks5r7Us5gaJpZM4Ne93h.

amet commented 7 years ago

that doesnt make sense... show me which line? <!-- --> is just a ugly line that does nothing ... anything between <!-- and -->is commented out, but there is nothing between that in your lines https://github.com/MrMC/mrmc/pull/26/files/cb8a224a8b0c9f66be52f5abbf4a586c3e948564#diff-f1d2876f079b17fe5192adc95d59dce6R376

amet commented 7 years ago

please understand that we will not include code just because you asked for it, you are pushing for your changes to go in and we will gladly accept it but only under strict coding guidelines, we have to make sure that code is readable and understandable in future. this can only go in as one commit, so I suggest you start reading up on how to squash all these changes into one commit and force push back into your branch

BAGAsss commented 7 years ago

I understand u spend your time to explain me all of this. If your colleague did it early we can put off a lot of questions this moment. i`ll go to read docs how to squash and ......

On 19.5.17 11:06, Zeljko Ametovic wrote:

please understand that we will not include code just because you asked for it, you are pushing for your changes to go in and we will gladly accept it but only under strict coding guidelines, we have to make sure that code is readable and understandable in future. this can only go in as one commit, so I suggest you start reading up on how to squash all these changes into one commit and force push back into your branch

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302637848, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kabifLb38slKCP5Mwaz-A1cNnuFqks5r7U2egaJpZM4Ne93h.

amet commented 7 years ago

unfortunately we had and still have more important issues than a skin that very few people use, we appreciate that you are trying to help and that these changes will be useful to others. point is that video playback and bugs always take priority over a skin enhancements

BAGAsss commented 7 years ago

I understood - but u find a little time to explain

On 19.5.17 11:22, Zeljko Ametovic wrote:

unfortunately we had and still have more important issues than a skin that very few people use, we appreciate that you are trying to help and that these changes will be useful to others. point is that video playback and bugs always take priority over a skin enhancements

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302641089, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kWvhaPBTYop5oHrittTFnPjcO-Qgks5r7VFcgaJpZM4Ne93h.

amet commented 7 years ago

I dont understand what you mean, there is tons of information on how git(and github) works, should not be difficult to google it. I have accepted to review this and accepted that your changes will go in once code guidelines are followed

BAGAsss commented 7 years ago

i made:

  1. installed git
  2. clone https://github.com/BAGAsss/mrmc.git
  3. git rebase -i HEAD~10 and delete all exclude my changes and replace pick to squash
  4. git push --force
  5. git reset --hard cb8a224a8b0c9f66be52f5abbf4a586c3e948564
  6. git push --force Is it right? is it enough to get corrected pm3hd in 3.0.5? Thanks in advance

On 19.5.17 11:30, Zeljko Ametovic wrote:

I dont understand what you mean, there is tons of information on how git(and github) works, should not be difficult to google it. I have accepted to review this and accepted that your changes will go in once code guidelines are followed

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302642643, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kUYZPH5tOOmSVyFEqqYcwleNjuHdks5r7VMugaJpZM4Ne93h.

amet commented 7 years ago

This pr is still showing 26 commits... did you push into your github?

BAGAsss commented 7 years ago

git push --force it request login and password and.....

Username for 'https://github.com': BAGAsss Password for 'https://BAGAsss@github.com': Counting objects: 25, done. Delta compression using up to 4 threads. Compressing objects: 100% (15/15), done. Writing objects: 100% (25/25), 1.95 MiB | 661.00 KiB/s, done. Total 25 (delta 17), reused 15 (delta 8) remote: Resolving deltas: 100% (17/17), completed with 17 local objects. To https://github.com/BAGAsss/mrmc.git

On 19.5.17 17:25, Zeljko Ametovic wrote:

This pr is still showing 26 commits... did you push into your github?

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302717088, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kcRGEAETllR-Z0APk_6Aqz-rdpmxks5r7aZQgaJpZM4Ne93h.

amet commented 7 years ago

It's not working, https://github.com/BAGAsss/mrmc/commit/cb8a224a8b0c9f66be52f5abbf4a586c3e948564

BAGAsss commented 7 years ago

what i should do?

On 19.5.17 17:34, Zeljko Ametovic wrote:

It's not working, BAGAsss/mrmc@cb8a224 https://github.com/BAGAsss/mrmc/commit/cb8a224a8b0c9f66be52f5abbf4a586c3e948564

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302719724, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kT6-q65iXOwtTedZkBiASTPJ7Ktoks5r7aiPgaJpZM4Ne93h.

amet commented 7 years ago

You should clean it up, it can't go in like this

BAGAsss commented 7 years ago

i can drop repo (i think) and fork new one.

On 19.5.17 17:42, Zeljko Ametovic wrote:

You should clean it up, it can't go in like this

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/MrMC/mrmc/pull/26#issuecomment-302721564, or mute the thread https://github.com/notifications/unsubscribe-auth/AYl1kXsaQVurOhGVEVuQxfkZYK2ERjTuks5r7ao_gaJpZM4Ne93h.