1.6 Compat #843
Merged
1.6 Compat #843
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: pip_requirements.txt readthedocs/projects/models.py readthedocs/restapi/urls.py readthedocs/settings/base.py readthedocs/templates/core/project_bar.html readthedocs/templates/projects/project_edit_base.html
Conflicts: pip_requirements.txt readthedocs/templates/core/header.html readthedocs/templates/core/home-header.html readthedocs/templates/registration/activate.html readthedocs/templates/registration/activation_complete.html readthedocs/templates/registration/activation_email.txt readthedocs/templates/registration/logout.html readthedocs/templates/registration/password_reset_email.html readthedocs/templates/registration/registration_closed.html readthedocs/urls.py
* markup tags * Upgrade packages * Fix up API
| git+https://github.com/ericflo/django-pagination.git@e5f669036c#egg=django_pagination-dev | ||
| git+https://github.com/nathanborror/django-basic-apps.git@171fdbe21a0dbbb38919a383cc265cb3cbc73771#egg=django_basic_apps-dev |
There was a problem hiding this comment.
Not needed anymore I take it?
There was a problem hiding this comment.
Yea, were just using it for flagging, but that hasn't been in the UI for a while.
|
+1, though let's be sure to revisit the vendored django-profile and consider a patching a fork up if it's not going to be maintained. |
ericholscher
added a commit
that referenced
this pull request
Jul 31, 2014
This reverts commit 3545214.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch upgrades the codebase to be compatible with Django 1.6.
There are a large number of changes here, so look per-commit to see the specifics.