S. Andrew Sheppard
8c7b5fc5c1
pop required extra_kwargs if read_only is set
2015-05-27 21:14:13 -05:00
S. Andrew Sheppard
805a915e7c
can't nest unique_together relations
2015-05-27 21:06:57 -05: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
Tom Christie
c916ad6315
Handle create and delete redirects
2015-05-19 16:30:45 +01: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
Tom Christie
ec8e7f27e7
Fixes for format preservation
2015-05-19 15:49:37 +01: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
Tom Christie
f32fff43f0
Reduce font weight
2015-05-19 11:55:13 +01: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
Omer Katz
67ff078388
Renamed the cached fields lists.
2015-05-17 09:54:33 +03: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
tony
0906bf2c08
fix empty and_query
2015-05-15 16:44:12 +03:00
tony
de95598a1e
removed using view.model.objects
2015-05-15 13:46:56 +03:00
David Sanders
8e84a9f6d0
Allow invalid outputs to pass through to_representation() for ChoiceField & MultipleChoiceField
2015-05-15 18:59:10 +10:00
Tom Christie
b4d82a0f55
Preserve format query param
2015-05-15 09:18:45 +01:00
tony
c47ec60ea2
no need to do distinct on every loop cycle & add analogue of distinct for oracle users
2015-05-14 17:04:22 +03:00
tony
7813d2fb35
fix DISTINCT for Oracle databases
2015-05-14 13:57:36 +03: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
Xavier Ordoquy
5c8df2c56b
Release notes for 3.1.2
2015-05-13 09:44:04 +02:00
Tom Christie
9424e59b9e
Styling of nested lists/objects in detail view
2015-05-12 16:28:49 +01:00
Tom Christie
a1421cd4a3
Basic formatting for dict and list values
2015-05-12 16:18:45 +01:00
Tom Christie
9a504efd26
Basic formatting for admin cells
2015-05-12 15:21:49 +01:00
Tom Christie
995aa47570
First pass templates for admin style
2015-05-12 14:49:09 +01:00
Marco Vellinga
478b1dbd06
Use get_queryset() for RelatedField choices property instead of self.queryset.all()
2015-05-11 15:28:10 +02:00
José Padilla
21cb808569
Merge pull request #2921 from donkirkby/patch-1
...
minor grammar fix
2015-05-10 18:44:21 -04:00
