Django 1.5 support, Admin interface & docs, backwards compat w/1.3. #46
+478
−403
Conversation
This file contains 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
Make django_nose optional, runtime generation of uri in example app request instead of hardcoded port 8000, sqlite directory location set depending on settings.py location, import absolute_http_url_re tries Django 1.5 location first if fails tries 1.3 location, use django's datetime field in models, remove KeyGenerator, use keygen helper and some pep8 formatting.
|
Duh, should I have done a pull request on the develop branch? If so can I nuke this request or just close it and make a new one? |
|
To tell you the truth, I don't even know any more. We've been a little overextended trying to get a big project out the door here, and I'm afraid some of our open source stuff has piled up a decent number of tickets and pull requests. Once we release, I'll do some triage, and if it would be more convenient to apply the pull request to another branch, I'll let you know then. |
|
Ok thanks! |
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.
Make django_nose optional, runtime generation of uri in example app
request instead of hardcoded port 8000, sqlite directory location
set depending on settings.py location, import absolute_http_url_re
tries Django 1.5 location first if fails tries 1.3 location, use
django's datetime field in models, remove KeyGenerator, use
keygen helper and some pep8 formatting.