Commit Graph

5518 Commits

Author SHA1 Message Date
Nicolas Delaby
f701ecceb7 Add DurationField 2015-06-01 18:20:53 +02:00
Tom Christie
a0f66ffc69 Merge pull request #2849 from d0ugal/master
Migrate from Google search to MkDocs.
2015-06-01 09:31:44 +01:00
Dougal Matthews
daad630aa0 Update MkDocs version 2015-05-31 18:32:47 +01:00
Dougal Matthews
f5aa163aac Added a missing semicolon 2015-05-31 18:30:30 +01:00
Dougal Matthews
e6c7468055 Use the new pages structure.
This is optional, but will be required by MkDocs 1.0
2015-05-31 18:30:29 +01:00
Dougal Matthews
8ace80c287 Only load the search results when the search form is submitted for the
first time
2015-05-31 18:30:29 +01:00
Dougal Matthews
33666c459b Remove Google search and replace it with Mkdocs
This change updates the modal to use MkDocs for search.
2015-05-31 18:30:29 +01:00
Dougal Matthews
eae9390f1b Update <title> to match MkDocs changes
The {{ page_title }} and {{ site_name }} variables are now separated to
add flexibility th themes.
2015-05-31 18:30:29 +01:00
Dougal Matthews
d118cee7dd As of MkDocs 0.12 the Home link was added back to the navigation 2015-05-31 18:30:29 +01:00
Dougal Matthews
64523f1edc Update the Documentation 404.html template to subclass base.html
This allows us to delete lots of code and avoid hard-coding the
navigation. This does mean that {{ current_page }} isn't always
available and needs to be conditionally used.
2015-05-31 18:30:29 +01:00
Xavier Ordoquy
24855f70ac Merge pull request #2987 from cosmith/patch-1
Fix minor typo
2015-05-30 23:17:07 +01:00
Corentin Smith
fa29f7dd1f Fix minor typo 2015-05-30 17:57:35 +02:00
Tom Christie
512a6db21e Merge pull request #2984 from marctc/patch-2
Update validators.md
2015-05-29 16:41:58 +01:00
Marc
9d624d5b6b Update validators.md
Missing colon.
2015-05-29 16:57:13 +02:00
Xavier Ordoquy
ecb3ba5e1f Merge pull request #2948 from bimusiek/master
Added test ensuring DecimalField accepts `2E+2` as 200 and validates decimal place correctly.
2015-05-29 11:52:33 +02:00
Xavier Ordoquy
6634ce0da5 Merge pull request #2977 from arnaudlimbourg/patch-1
THe DRF Any Permission is not maintained anymore
2015-05-28 17:05:21 +02:00
Arnaud Limbourg
5550f1534c removing section since package is not maintained 2015-05-28 15:52:37 +02:00
Arnaud Limbourg
2bfef08d3a THe DRF Any Permission is not maintained anymore 2015-05-28 15:12:18 +02:00
Tom Christie
ab7cb44bc5 Merge pull request #2974 from jpadilla/master
Use shields.io instead of pypip.in
2015-05-27 16:18:30 +01:00
José Padilla
7eeb0e81c0 Use shields.io instead of pypip.in 2015-05-27 10:47:44 -04:00
Tom Christie
95a27a108d Merge pull request #2933 from cancan101/overide_method_action
Set the action on a view when override_method regardless of its None-ness
2015-05-27 09:10:58 +01:00
José Padilla
ad3bb05a87 Merge pull request #2971 from aschn/master
Add drf-tracking to third-party-resources.md
2015-05-26 21:37:29 -04:00
Anna Schneider
9903392053 Merge pull request #1 from aschn/aschn-patch-2968
Add drf-tracking to third-party-resources.md
2015-05-26 17:01:24 -07:00
Anna Schneider
6553e253f3 Add drf-tracking to third-party-resources.md 2015-05-26 16:58:08 -07:00
Tom Christie
eeef85373c Merge pull request #2962 from aericson/fix-dependency-of-mkdoc
Update mkdocs version to 0.12.2
2015-05-26 09:18:27 +01:00
Carlton Gibson
578c8de4c2 Merge pull request #2965 from tinchodipalma/patch-1
Fix markdown link references in release notes
2015-05-25 10:14:55 +02:00
Martin Di Palma
7449e29cf7 Links issues
The following items had a wrong href value:

- Dont require pk strictly for related fields. (#2745, #2754)
- Restrict integer field to integers and strings. (#2835, #2836)
2015-05-25 02:24:11 -03:00
Xavier Ordoquy
c6d94fb6d2 Merge pull request #2963 from aericson/add-cdrf-to-docs
Add Classy Django REST Framework(cdrf.co) to Third Party Resources
2015-05-22 22:47:32 +02:00
André Ericson
e6e5a27836 Add Classy Django REST Framework(cdrf.co) to Third Party Resources 2015-05-22 17:18:59 -03:00
André Ericson
021644b913 Update mkdocs version to 0.12.2
The old version of mkdocs required 'Markdown>=2.3.1,<2.5' and
requirements-optionals.txt lists markdown==2.5.2 causing mkdocs
to fail.
2015-05-22 16:39:49 -03:00
Tom Christie
010f2ee9bd Merge pull request #2952 from Ernest0x/patch-3
Support basic authentication with custom user models that change username field
2015-05-20 09:56:38 +01:00
Petros Moisiadis
192719eed0 Improve coding style
On Tom's suggestion, improve coding style by using a single-line call to getattr() with a default value instead of a multi-line if/else clause.
2015-05-19 20:00:19 +03:00
Petros Moisiadis
a96ebd74b1 Fix flake8 error
Fix flake8 error
2015-05-19 19:48:53 +03:00
Petros Moisiadis
c63ea01f4f Support User model in Django 1.4 that has not a USERNAME_FIELD attribute
Support User model in Django 1.4 that has not a USERNAME_FIELD attribute.
2015-05-19 19:05:50 +03:00
Petros Moisiadis
43b4ae752d Import get_user_model from compat module
Import get_user_model from compat module to be compatible with older django versions (e.g. 1.4).
2015-05-19 18:00:17 +03:00
Petros Moisiadis
a13075486d Compatibility code for getting user model
Compatibility code for getting user model
2015-05-19 17:57:27 +03:00
Petros Moisiadis
bb002262ac Support basic authentication with custom user models that change username field
Support basic authentication with custom user models with a username field that is not named 'username'.
2015-05-19 17:42:44 +03:00
Michał Hernas
e8c226c2db Fixed lint problems 2015-05-18 16:55:40 +02:00
Michał Hernas
069ea31cfb Added test ensuring DecimalField accepts 2E+2 as 200 and validates
decimal place correctly.
2015-05-18 16:42:24 +02:00
Tom Christie
e33fed70d6 Merge pull request #2940 from rapilabs/master
Allow unexpected values for ChoiceField/MultipleChoiceField representations
2015-05-15 16:54:55 +01:00
David Sanders
b7edd46313 Use simpler dict.get() rather than try/except 2015-05-16 01:01:27 +10:00
David Sanders
8e84a9f6d0 Allow invalid outputs to pass through to_representation() for ChoiceField & MultipleChoiceField 2015-05-15 18:59:10 +10:00
Xavier Ordoquy
6add1acc4e Add a few cosmetic changes to the release notes. 2015-05-14 11:18:18 +02:00
Xavier Ordoquy
475e431055 Fix the broken links. 2015-05-14 11:15:26 +02:00
Xavier Ordoquy
1a8c0b4bfc Merge pull request #2930 from linovia/release/3.1.2
Release 3.1.2
2015-05-14 10:57:33 +02:00
Alex Rothberg
a804d0bd75 set the action when override_method regardless of its None-ness 2015-05-13 22:53:32 -04:00
Xavier Ordoquy
47d36f150b Add last minute PR. 2015-05-13 18:24:06 +02:00
Tom Christie
ea1145c5aa Merge pull request #2905 from ticosax/django-object-perm-get_queryset
Allow DjangoObjectPermissions to use views that define get_queryset
2015-05-13 13:39:59 +01:00
Nicolas Delaby
031ac2a292 Allow DjangoObjectPermissions to use views that define get_queryset 2015-05-13 14:26:44 +02:00
Xavier Ordoquy
fb4ba3ad3c Bump version to 3.1.2 2015-05-13 09:44:15 +02:00