Carlton Gibson
d87bb67d11
Failing test case for #1488
2015-02-10 10:50:35 +01:00
Tom Christie
647d24a095
Merge pull request #2534 from JoarLeth/version-3.1
...
Fix typo in 3.1 announcement
2015-02-09 22:09:15 +00:00
Joar Leth
b18d773b51
Fix typo in 3.1 announcement
2015-02-09 22:51:49 +01:00
Tom Christie
fbb21caaaa
Merge master
2015-02-09 20:43:50 +00:00
Tom Christie
7b639c0cd0
Drop django master from the build matrix.
...
Currently always going to be a know failure case.
We can add it back when we start to consdier Django 1.9 support.
2015-02-09 17:57:08 +00:00
Tom Christie
873fb69395
Merge pull request #2530 from tomchristie/attribute-proxying-fix
...
Fix misleading `AttributeError` tracebacks on `Request` objects.
2015-02-09 17:56:25 +00:00
Tom Christie
1a087c8c5b
Fix .gitignore
2015-02-09 17:47:59 +00:00
Tom Christie
b2939c157d
Fixes for latest version of pep8
2015-02-09 17:43:20 +00:00
Tom Christie
0669f507b3
pep8 fix
2015-02-09 17:22:13 +00:00
Tom Christie
54d82f59ed
Py3 compat fix
2015-02-09 17:19:22 +00:00
Tom Christie
d13c807616
Fix misleading AttributeErrors
2015-02-09 17:02:54 +00:00
Tom Christie
407480b484
Minor docs work
2015-02-09 17:01:41 +00:00
Tom Christie
0240df1a38
Minor internal API cleanpu
2015-02-06 16:15:10 +00:00
Tom Christie
670723f021
Minor cleanups/improvements to ModelSerializer API
2015-02-06 15:45:02 +00:00
José Padilla
235b98e427
Merge pull request #2460 from mmarvick/master
...
Small fixes to the tutorial
2015-02-06 11:31:25 -04:00
Tom Christie
5d8c3abe72
Fix typo
2015-02-06 15:27:35 +00:00
Tom Christie
dec3493d7c
Minor cleanup
2015-02-06 14:43:43 +00:00
Tom Christie
a435b1b355
Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1
2015-02-06 14:39:31 +00:00
Tom Christie
1f99612845
Upgrade pending deprecations to deprecations
2015-02-06 13:21:35 +00:00
Tom Christie
0e4d202c58
Merge pull request #2527 from linovia/feature/secured_pypi_upload
...
Use twine to upload to pypi.
2015-02-06 13:10:48 +00:00
Tom Christie
1d4956f616
Pagination images
2015-02-06 13:08:04 +00:00
Xavier Ordoquy
750d0c9f2b
Add Twine to the requirements.
2015-02-06 13:57:08 +01:00
Xavier Ordoquy
238a3b507b
Add Twine to the requirements.
2015-02-06 13:50:40 +01:00
Tom Christie
53716f6152
Internationalization docs
2015-02-06 11:37:29 +00:00
Xavier Ordoquy
9dd97a0ee5
Fixed a typo.
2015-02-06 10:23:58 +01:00
Xavier Ordoquy
75ff754517
Use twine to upload to pypi.
2015-02-06 10:12:57 +01:00
José Padilla
7f801b9a01
Add trim_whitespace to CharField #2517
...
If set to `True` then leading and trailing
whitespace is trimmed. Defaults to `True`.
2015-02-06 01:09:19 -04:00
Michael Marvick
5bf803b6ed
Revert some of the changes made in 1-serialization.md
2015-02-05 19:42:36 -08:00
Tom Christie
09488ad4da
Link to ModelSerializer API
2015-02-06 00:25:03 +00:00
Tom Christie
1fdfea2758
Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1
2015-02-06 00:05:59 +00:00
Tom Christie
b11a98f1e7
Tweak gitignore
2015-02-06 00:05:42 +00:00
Tom Christie
6c63ef13cd
Drop 2.x announcements
2015-02-06 00:04:20 +00:00
Xavier Ordoquy
24372ec778
Merge pull request #2524 from Kaptian/patch-1
...
Allow non-standard User models with Throttling
2015-02-05 23:02:59 +01:00
Kaptian
fffde8a63b
Update throttling.py
...
Use pk pseudo attribute for identifying the user (in case the user model is not the default and has a different column name for the unique id)
2015-02-05 13:27:26 -08:00
Tom Christie
f1e7ce54a1
Merge pull request #2496 from jpadilla/version-3.1
...
Support for Django 1.8 ArrayField
2015-02-05 14:49:19 +00:00
José Padilla
c696b0ba0c
Fix possible nested array fields
2015-02-05 10:12:14 -04:00
José Padilla
720d154c83
Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
2015-02-04 23:34:20 -04:00
José Padilla
48fa77c09e
Add child to ListField when using ArrayField
2015-02-04 23:33:59 -04:00
Tom Christie
f98f842827
Minor bits of test cleanup
2015-02-05 01:24:55 +00:00
Tom Christie
65bbc4a159
Merge branch 'brandoncazander-version-3.1-2489' into version-3.1
2015-02-05 00:58:16 +00:00
Tom Christie
e1c4513312
Fix NamespaceVersioning with hyperlinked serializer fields
2015-02-05 00:58:09 +00:00
Tom Christie
83673e8f74
Merge branch 'version-3.1-2489' of git://github.com/brandoncazander/django-rest-framework into brandoncazander-version-3.1-2489
2015-02-04 23:32:48 +00:00
Tom Christie
41b213414d
Updating release notes
2015-02-04 23:32:25 +00:00
Tom Christie
3b00824560
Merge pull request #2518 from longhotsummer/patch-1
...
FIX: Don't default to list in method args
2015-02-04 14:30:53 +00:00
Greg Kempe
e13d2af137
Parens around if clause
2015-02-04 16:26:23 +02:00
Tom Christie
d21617ff3b
Merge pull request #2519 from Ofir-Purple/optimize-token-auth-queries
...
Prefetching the user object when getting the token in TokenAuthentication
2015-02-04 14:20:21 +00:00
Greg Kempe
d920683237
Use inline if
2015-02-04 16:13:30 +02:00
Ofir Ovadia
58e7bbc8ec
Prefetching the user object when getting the token in TokenAuthentication.
...
Since the user object is fetched 4 lines after getting Token from the database, this removes a DB query for each token-authenticated request.
2015-02-04 16:08:41 +02:00
Greg Kempe
7bb5fd270d
FIX: Don't default to list in method args
...
Fixes @list_route and @detail_route so that they don't initialize their `methods` parameter as a list. In some cases the list gets cleared, and the result is that default parameter is now empty, and may get reused unexpectedly.
2015-02-04 16:03:03 +02:00
Tom Christie
a0374e4498
Remove erronous checkin
2015-02-04 09:08:43 +00:00
