Tom Christie
|
cf33008571
|
Release notes etc
|
2015-10-22 14:05:52 +01:00 |
|
Tom Christie
|
c53c9eddfe
|
Merge pull request #3315 from tomchristie/filters
First pass at HTML rendering for filters
|
2015-10-22 11:42:35 +01:00 |
|
Tom Christie
|
0c6d46729c
|
Docs on the filter HTML interface
|
2015-10-22 11:37:27 +01:00 |
|
Tom Christie
|
6305ae8916
|
Merge pull request #3475 from tomchristie/forms-api
Forms API
|
2015-10-22 09:59:57 +01:00 |
|
Xavier Ordoquy
|
71338ddd3f
|
Merge pull request #3528 from peterdemin/patch-1
Fixed grammar in docs for "Writable nested serializers"
|
2015-10-21 15:35:23 +02:00 |
|
Peter Demin
|
423e0de358
|
Fixed grammar in docs for "Writable nested serializers"
|
2015-10-21 09:33:34 -04:00 |
|
Tom Christie
|
58faebcdb1
|
Merge pull request #3526 from likeon/fk-to_field
Added support for the to_field on ForeignKey fields
|
2015-10-21 14:00:32 +01:00 |
|
likeon
|
322bda8159
|
Added support for the to_field on ForeignKey fields
|
2015-10-21 15:33:18 +03:00 |
|
José Padilla
|
825e67454d
|
Merge pull request #3527 from potpath/patch-2
Fix broken link caused by case sensitivity
|
2015-10-21 08:03:07 -04:00 |
|
potpath
|
9634cea474
|
Fix broken link caused by case sensitivity
|
2015-10-21 18:43:07 +07:00 |
|
Dawn Pattison
|
8fa7c5c914
|
Exclude collections.Mapping from allowable data types in ListField
|
2015-10-20 08:56:39 -04:00 |
|
Tom Christie
|
c68d932ac9
|
Merge pull request #3525 from tomchristie/django-19-beta
Test against Django 1.9 beta
|
2015-10-20 11:02:30 +01:00 |
|
Tom Christie
|
5b5d6f1d4b
|
Test against Django 1.9 beta
|
2015-10-20 10:53:45 +01:00 |
|
Tom Christie
|
0d1637d666
|
Minor docs update
|
2015-10-20 10:49:39 +01:00 |
|
José Padilla
|
4e24374c14
|
Merge pull request #3521 from agconti/master
docs(third-party-resources): added `cookiecutter-django-rest` to misc third party resources
|
2015-10-19 21:35:31 -04:00 |
|
Tom Christie
|
34eb18b498
|
Merge branch 'master' into filters
Conflicts:
rest_framework/compat.py
rest_framework/filters.py
|
2015-10-19 13:14:42 +01:00 |
|
Tom Christie
|
86470b7813
|
Merge pull request #3517 from thedrow/feature/set-and-dict-literals
Replaced all dict and set conversions from lists to dict and set literals
|
2015-10-19 09:46:36 +01:00 |
|
agconti
|
6757da5aab
|
docs(third-party-resources): added cookiecutter-django-rest to misc third party resources
|
2015-10-18 20:13:09 -04:00 |
|
Omer Katz
|
2e178bc970
|
Replaced all dict and set conversions from lists to dict and set literals.
|
2015-10-17 12:00:11 +03:00 |
|
Dawn Pattison
|
dac1637bb3
|
Use set instead of Set
|
2015-10-16 16:06:18 -04:00 |
|
Dawn Pattison
|
b9316154b1
|
Add tuple and Set to allowed ListField data types
|
2015-10-16 16:02:13 -04:00 |
|
José Padilla
|
df025f3d98
|
Merge pull request #3515 from Photonomie/doc-typo
Missing the `source=` keyword for the URLField parameter
|
2015-10-16 15:41:12 -04:00 |
|
Dawn Pattison
|
f808f08a0d
|
Require that data is a list.
|
2015-10-16 14:43:43 -04:00 |
|
Pierre Dulac
|
dc72fb4746
|
Missing the source= keyword for the URLField parameter
|
2015-10-16 19:43:00 +02:00 |
|
Tom Christie
|
c94b354efa
|
Merge pull request #3509 from jpadilla/textfield-max-length
Map TextField max_length to CharField
|
2015-10-16 12:31:26 +01:00 |
|
José Padilla
|
a1dad503cf
|
Map TextField max_length to CharField
|
2015-10-16 07:17:33 -04:00 |
|
Xavier Ordoquy
|
1b4a41cb80
|
Merge pull request #3502 from auvipy/master
removed south migrations
|
2015-10-15 10:41:07 +02:00 |
|
auvipy
|
4db2501399
|
removed south_migrations directory
|
2015-10-15 14:17:56 +06:00 |
|
auvipy
|
392df94693
|
removed south migrations
|
2015-10-15 14:16:35 +06:00 |
|
Xavier Ordoquy
|
5570db402f
|
Merge pull request #3501 from ztanner/patch-1
Various typo/grammar fixes
|
2015-10-15 08:21:22 +02:00 |
|
Zack Tanner
|
6fe021eea7
|
Various typo fixes
|
2015-10-14 19:09:11 -07:00 |
|
Aider Ibragimov
|
4a6d27ccbb
|
update style of the note
|
2015-10-14 17:04:47 +03:00 |
|
José Padilla
|
ad001143c9
|
Merge pull request #3498 from Ins1ne/feature/admin_renderer_jquery
fix typo for adding jquery string in AdminRenderer
|
2015-10-14 09:06:52 -04:00 |
|
Aider Ibragimov
|
79008ea210
|
fix typo for adding jquery string in AdminRenderer
|
2015-10-14 15:56:26 +03:00 |
|
Aider Ibragimov
|
5342f22009
|
return typo back for new pr, update docs
|
2015-10-14 15:54:43 +03:00 |
|
Aider Ibragimov
|
b19865f88d
|
fix typo in adding jquery string, update docs about detail page link for AdminRenderer
|
2015-10-14 15:14:35 +03:00 |
|
Tom Christie
|
90247afe29
|
Docs on Forms API
|
2015-10-12 21:14:58 +01:00 |
|
Xavier Ordoquy
|
68312cb0bc
|
Merge pull request #3488 from demokrates/patch-1
Update versioning.md
|
2015-10-12 10:25:39 +02:00 |
|
demokrates
|
47c9d2a4d3
|
Update versioning.md
Changed settings attribute 'VERSION_PARAMETER' --> to 'VERSION_PARAM'.
|
2015-10-12 10:10:08 +02:00 |
|
Rense VanderHoek
|
c774a4c378
|
Merge branch 'master' of https://github.com/rense/django-rest-framework
|
2015-10-10 23:18:16 +02:00 |
|
Xavier Ordoquy
|
fa1cfae991
|
Merge pull request #3485 from dulmandakh/dulmandakh-guardian-check-installed-apps
Update compat.py
|
2015-10-09 08:13:42 +02:00 |
|
Dulmandakh
|
431ac45168
|
Update compat.py
try to import guardian if it's in INSTALLED_APPS
|
2015-10-09 11:03:19 +08:00 |
|
Tom Christie
|
85cd717ec0
|
Merge pull request #3481 from nryoung/fix-codecov
Fix codecov on Travis CI
|
2015-10-08 19:47:33 +01:00 |
|
Nic Young
|
739d3892c5
|
Fix codecov on Travis CI
The coverage report needs to be explicitly created with arguments passed
in to pytest-cov
|
2015-10-07 22:20:46 -07:00 |
|
Tom Christie
|
41182c6f06
|
Formns API
|
2015-10-06 10:58:20 +01:00 |
|
Xavier Ordoquy
|
6fb96e93ef
|
Merge pull request #3469 from PhilipGarnero/patch-1
Added django-rest-framework-social-oauth2 to list of third party packages
|
2015-10-03 07:48:50 +02:00 |
|
Philip Garnero
|
3cdd3c5f6e
|
Added django-rest-framework-social-oauth2 to list of third party packages
|
2015-10-02 14:30:27 -07:00 |
|
Tom Christie
|
63662e352d
|
Merge pull request #3461 from mcastle/patch-1
Use serializers.ValidationError in AuthTokenSerializer
|
2015-10-02 11:07:20 +01:00 |
|
Xavier Ordoquy
|
689afd83cc
|
Merge pull request #3462 from theengineear/patch-1
Small doc typo `throttles` --> `throttling`
|
2015-10-01 10:22:55 +02:00 |
|
Andrew
|
f60c0e99f6
|
Small doc typo throttles --> throttling
|
2015-10-01 14:25:04 +07:00 |
|