search

tangentlabs / django-fancypages

A Content Enhancement System for Django
https://django-fancypages.readthedocs.org
BSD 3-Clause "New" or "Revised" License
34 stars 11 forks source link

Add support for Django 1.7 including AppConfig and new migrations #47

Closed roadsideseb closed 10 years ago

roadsideseb commented 10 years ago

This PR provides support for Django 1.7 in the standalone part of fancypages. Currently, the support for the Oscar integration is not available until Oscar is supporting Django 1.7.

fmr commented 10 years ago

What? Only 83 files changed? :trollface:

fmr commented 10 years ago

Seems there are still conflicts - maybe rebase against master then we can merge this PR

roadsideseb commented 10 years ago

Just did a rebase...let's wait for the test to complete...

roadsideseb commented 10 years ago

Alright, all seems good now, feel free to merge when you are ready. And thanks for going through this epic PR :beers: