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

Restructure folders #276

Merged
merged 8 commits into from
Dec 30, 2016
Merged

Restructure folders #276

merged 8 commits into from
Dec 30, 2016

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 21, 2016

DO NOT MERGE UNTIL ADAM SAYS "IT'S OK TO MERGE THIS", CAPICHE?

Internal. Assigning @dschaper and @jacobsalmela to sort out licensing. We're also going to need to change the name of the project.

@pi-hole/dashboard

@dschaper
Copy link
Member

Can we revisit this now that we've removed the SELinux section from Core? If we can at least get rid of the IcoFonts and just use the glyphs required, that would be good, and should reduce our footprint by a ton.

@AzureMarker
Copy link
Contributor

Yes, we should look a this again. I think the only conflict was with SELinux

@PromoFaux
Copy link
Member

Well, come to think of it, I don't think it really affected much with the SELinux stuff, considering that was broken already... I will redo this later on!

@PromoFaux
Copy link
Member

OK, this appears to be working. Ready for check and merge

@DL6ER
Copy link
Member Author

DL6ER commented Dec 30, 2016

Seems to be fine. Tested on DO droplet.

(I don't have to approve, my PR)

@AzureMarker
Copy link
Contributor

This will also require changing the path to the add.php script in the custom blocking page on the core repo.

@AzureMarker
Copy link
Contributor

AzureMarker commented Dec 30, 2016

Approved

Approved with PullApprove

@PromoFaux PromoFaux changed the title [WIP] Restructure folders Restructure folders Dec 30, 2016
@PromoFaux
Copy link
Member

Adam says "IT'S OK TO MERGE THIS"

@AzureMarker AzureMarker merged commit 72fcf54 into devel Dec 30, 2016
@AzureMarker AzureMarker deleted the restructureFolders branch December 30, 2016 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants