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

Patch to Nibbels 1.5.2 #1

Closed
wants to merge 23 commits into from
Closed

Patch to Nibbels 1.5.2 #1

wants to merge 23 commits into from

Conversation

Nibbels
Copy link
Contributor

@Nibbels Nibbels commented Aug 11, 2017

I downloaded your branch, changed it manually according to my changes and according to the changes of Loki3000/Djazz.
Then uploaded it as a new branch on my fork.

This new fork is now the main fork "e-alfred-master".
That is
#Nibbels | Moving to e-alfred/ocdownloader for further development …| ac33228
#Nibbels | dont need that file for this new branch …| e6c9171
Whatever history github keeps, it is because of my "Upload Files"-Action to the original master branch.

I dont relly know about those license-changes. I just left those out in the process.
If I have to undo all the fixes Loki3000 and DjassLab did to the branch tell me! Couldnt refork yours, because I didnt want to delete DjassLabs master. Tell me if I have to!

djazzlab and others added 20 commits August 14, 2015 23:35
Multibyte and strpos fixes
https://github.com/DjazzLab/ocdownloader/issues/44
Todo: Discuss where the rescan function has to be hooked in.
I just hooked it to a visit of "all files" and "completed files" for now.
I tested on 11 only.
Downloaded e-alfreds fork
Added my changes to Readme
Added my patch
Added Multibyte-Support like @djazzlab and @Loki3000 committed earlier
Reupload as second branch for a clean restart.
it was pulled because of the commit 1.5 over 1.51
@e-alfred
Copy link
Owner

Thanks for you effort. I will take a look into it and then merge it.

@e-alfred
Copy link
Owner

e-alfred commented Aug 20, 2017

I took a look into it and saw that you added a few of the commits back from after the license change to CC-BY-SA. Could you modify your PR to only contain your own changes in a single commit? That way I can do a clean merge without facing the license problem again, because the current one includes @djazzlab 's and @Loki3000 's changes from after the licence change.

@Nibbels
Copy link
Contributor Author

Nibbels commented Aug 21, 2017

The license should have been cleaned out now :)

@Nibbels
Copy link
Contributor Author

Nibbels commented Aug 25, 2017

I tested the HTTP-download with nextcloud 12.0.2
It works. But I was not able to enable the app because it was incompatible with "max version 11". I changed that to 12 now.

I did not test all the other download functions.

@e-alfred
Copy link
Owner

I incorporated your changes manually to preserve a clean commit history. Thanks for your work, I pushed it already mentioning you in the Readme file for helping out. Next step would be to push it to the Nextcloud store.

@e-alfred e-alfred closed this Aug 26, 2017
@Nibbels
Copy link
Contributor Author

Nibbels commented Aug 26, 2017

I guess it is now the time to clean up my repositories and to refork your branch :)

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.

4 participants