Skip to content

Merge upstream #2

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 127 commits into from
Dec 2, 2014
Merged

Merge upstream #2

merged 127 commits into from
Dec 2, 2014

Conversation

@BrickXu
Copy link
Owner

@BrickXu BrickXu commented Dec 2, 2014

No description provided.

xordoquy and others added 30 commits October 8, 2014 08:33
@xordoquy
Reverted 59d0a03 and fixed the tests
311d315
@beck
Ensure _resolve_model does not return None
6773568
@maryokhin
Streamlined tox config with 1.8 features
585054f
@maryokhin
Updated travis config
1fcb495
@maryokhin
Added python 3.2 to test against django master . Related to #2075.
b6de266
@lovelydinosaur
Fix shoddy test case
9c58dfe
@lovelydinosaur
Documentation in 'many_init' docstring. Refs #2120.
fd980be
@lovelydinosaur
Merge pull request #2123 from NextHub/master
85f5e79 
Remove boilerplate code from tox config
@maryokhin
Removed dots in Django versions in tox. Refs #2124.
c559ec6
@lovelydinosaur
Merge pull request #2126 from NextHub/master
17c7431 
Removed dots in Django versions in tox. Refs #2124.
@lovelydinosaur
Don't use default_empty_html value for partial updates. Closes #2118.
06fd63d
@marctc
Missing quotes on validate_score example
83e556b
@lovelydinosaur
request.DATA, request.FILES -> request.data
2e726e2
@lovelydinosaur
Merge pull request #2127 from marctc/patch-1
b39bd7c 
Missing quotes on validate_score example
@lovelydinosaur
Add missing period.
a3c0c8f
@lovelydinosaur
Docs on ValidationError
c4dff54
@lovelydinosaur
Hypenate 'un-coerced'
8328125
@lovelydinosaur
Drop 0.x release notes
3b40f8c
@d0ugal
Migrate documentation to MkDocs proper
3a648b9
@d0ugal
Fixed typos in the config and updated Google analytics
b2762cb
@d0ugal
Remove redundant requirements file
261c4ce
@d0ugal
Add the kickstarter annoucement to the TOC
ae36a25
@d0ugal
Add a docs build to the Tox run
04abe98
@d0ugal
Change site_dir to html to match mkdocs.py
84d9c4b
@d0ugal
Remove the site ignore which isn't needed as we will use the html output
792c0c2 
directory as before
@d0ugal
Drop simply from the mkdocs install lines
2ddef2d 
It is still simple tho', honest ;)
@jpadilla @d0ugal
Use page_title instead of title in docs theme
d6b203f
@d0ugal
Fix the Navigation style
18712a5
@d0ugal
Bring back the promo section
49a493f
@d0ugal
Add next and previous page.
3c49b9f
lovelydinosaur and others added 27 commits November 28, 2014 09:56
@lovelydinosaur
Moar docs. Amazing.
34ca8cd
@lovelydinosaur
Merge branch '3.0-docs'
d4b8e35
@lovelydinosaur
Docs on nested creates/updates and suchlike
276a2a5
@maryokhin
Update token auth view. Closes #2151.
0539b1b
@maryokhin
Removed unused import
d9a09f7
@lovelydinosaur
Docs. Minor tweaks.
05a86e3
@lovelydinosaur
Drop google_analytics config since it's in the base template anyways.
9e03b08
@lovelydinosaur
Add 'built with MkDocs' footer
d84582f
@lovelydinosaur
Drop defunct tests
c8764de
@lovelydinosaur
Docs. Sponsor call-out.
66b3dae
Merge pull request #2153 from maryokhin/patch-1
a741418 
Update token auth view. Closes #2151.
@lovelydinosaur
Add 2.x notes and links
8e549a7
@lovelydinosaur
Finalizing 3.0 release notes
9ba29a8
@lovelydinosaur
Merge pull request #2143 from linovia/bugfix/1850
8d989bb 
Bugfix for #1850
@lovelydinosaur
Merge pull request #2086 from beck/doug/blow-up-with-bad-models
6fbd23a 
Ensure _resolve_model does not return None
@lovelydinosaur
Use ImproperlyConfigured when model meta lookup fails
3a5b377
@lovelydinosaur
@api_view defaults to allowing GET
08c727a
@lovelydinosaur
Minor tweaks to contributing docs
caf1de3
@lovelydinosaur
Add 3.0 announcement
72c4ec4
@lovelydinosaur
Support Django's core ValidationError for backwards compat. Refs #2145.
b9503cd
@lovelydinosaur
More descriptive docstring on ModelSerializer
22c5b86
@lovelydinosaur
Minor validtors tweak
270c7ac
@lovelydinosaur
Minor 3.0 announcment tweaks
1caa14d
@lovelydinosaur
Add missing 'validators.py' link. Closes #2166.
555c450
@jpadilla
Change allow_none to allow_null
080fa4f
@xordoquy
Merge pull request #2167 from jpadilla/patch-1
7b8699a 
Change allow_none to allow_null in 3.0 announcement
@lovelydinosaur
Fix requirements. Closes #2170.
d1fe61c
BrickXu added a commit that referenced this pull request Dec 2, 2014
@BrickXu
Merge pull request #2 from tomchristie/master
81870b6 
Merge upstream
@BrickXu BrickXu merged commit 81870b6 into BrickXu:master Dec 2, 2014
BrickXu pushed a commit that referenced this pull request Feb 10, 2015
@mmarvick
tutorial #2 incorrectly showed /item.json instead of /item/.json for …
2a6937f 
…format suffixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.