5824 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	ed3f9593af	Merge branch 'version-3.2' into remove-url-from-future	2015-07-30 16:02:40 +01:00
Tom Christie	1b3b01e042	Remove unused imports	2015-07-30 15:59:27 +01:00
Tom Christie	c8ad0cce19	Bump minimum Django version to 1.5	2015-07-30 15:43:39 +01:00
Tom Christie	4fd971e3e5	Update exception handler test in line with deprecations	2015-07-30 15:42:11 +01:00
Tom Christie	c203ca4c64	Deprecations	2015-07-30 15:26:42 +01:00
Tom Christie	5b39d820be	Remove 'load url from future' tags in templates.	2015-07-30 15:14:02 +01:00
Tom Christie	1f55bc747b	Merge pull request #2926 from tomchristie/admin-style ... Admin style renderer	2015-07-30 15:01:37 +01:00
Tom Christie	1f50f08f28	Merge pull request #3190 from Hachikooking/master ... Correct API ROOT to enable parametered urls	2015-07-30 14:54:17 +01:00
Tom Christie	79b825ef32	Drop unused import	2015-07-30 14:38:04 +01:00
Tom Christie	a4e0f03050	Tweak quickstart to show newest users first in list view	2015-07-30 14:18:09 +01:00
Tom Christie	5c1d6a9200	Docs for AdminRenderer	2015-07-30 14:07:51 +01:00
Tom Christie	accd8fe16b	Merge pull request #3198 from jpadilla/search ... Fix weird search behavior	2015-07-30 09:09:49 +01:00
José Padilla	ea1a8f4ac5	Fix weird search behavior. Closes #3197	2015-07-29 21:25:21 -04:00
José Padilla	0b345516a5	Turn off autocomplete on search form	2015-07-29 21:24:55 -04:00
Hachikooking	d2ae7d4fcd	Add args to the function call for unnamed parameters	2015-07-29 14:43:25 +02:00
clemence.lop	2109f55244	Correct API ROOT to enable parametered urls	2015-07-28 15:55:49 +02:00
Tom Christie	6e3ba202af	Merge pull request #2690 from delinhabit/hyperlinked-relation-callable-source ... Support source='some_method' for HyperlinkedRelatedField.	2015-07-27 16:19:48 +01:00
Ion Scerbatiuc	d4353cc1fd	Moved the code comment inside the if block and removed whitespace	2015-07-27 07:57:05 -07:00
Ion Scerbatiuc	0386a01673	Addressed CR comments	2015-07-27 07:45:35 -07:00
Tom Christie	c5a04a8516	Add test for nullable ChoiceField and blank HTML input. Closes #2623.	2015-07-27 13:51:03 +01:00
Tom Christie	75beb6ab2d	Note on ValidationError in perform_create. Closes #2791.	2015-07-27 13:32:30 +01:00
Tom Christie	402fb39396	HStoreField maps to ListField(CharField(allow_blank=True). Closes #2659.	2015-07-27 13:18:49 +01:00
Tom Christie	f1e2135b04	Restyle horizontal checkbox. Closes #2783.	2015-07-27 13:11:24 +01:00
Tom Christie	798cd1a637	Fix for DjangoObjectPermissionsFilter with Guardian < 1.3	2015-07-27 10:20:37 +01:00
Tom Christie	99d9afc9d0	Remove out-of-date note on footer block in browsable API template. Closes #3187.	2015-07-27 09:18:41 +01:00
Tom Christie	caf337a4ae	Merge pull request #3188 from jpadilla/master ... Add missing link to third party resources	2015-07-27 09:17:02 +01:00
José Padilla	4f0220b780	Add missing link	2015-07-26 20:00:34 -04:00
Ion Scerbatiuc	47a22a55ca	Added a possible fix	2015-07-25 09:44:00 -07:00
Ion Scerbatiuc	46b65d1647	Added another test case for PK relations	2015-07-25 09:42:27 -07:00
Ion Scerbatiuc	f53c6c7741	Added a test to reproduce the issue	2015-07-25 08:28:46 -07:00
Tom Christie	bdeb28944f	Use RuntimeError, not AssertionError when guarding against direct View.queryset evalutation. Refs #3180.	2015-07-24 09:13:39 +01:00
Tom Christie	36d8d3681a	Merge pull request #3180 from tomchristie/guarded-queryset ... Guard against erroneous direct .queryset evaluation in CBVs.	2015-07-24 09:11:56 +01:00
Tom Christie	108dfafa44	Fix Django 1.5/1.4 compat issue	2015-07-24 09:02:16 +01:00
Tom Christie	c0e3e670ca	Fix Django compat for Queryset import	2015-07-23 17:43:49 +01:00
Tom Christie	e05021c8c6	Guard against erronous direct .queryset evaluation in CBVs.	2015-07-23 17:17:18 +01:00
Tom Christie	4c1597efe0	Error modals	2015-07-23 16:16:48 +01:00
Tom Christie	b996266431	Merge master	2015-07-23 15:28:29 +01:00
Tom Christie	9d136abb24	Merge pull request #3179 from tomchristie/browsable-api-errors ... Errors in browsable API on error.	2015-07-23 15:25:43 +01:00
Tom Christie	d14bc3c4e1	Fix test cases for python3	2015-07-23 14:41:28 +01:00
Tom Christie	92008d3d16	None -> '' in the context of form field values	2015-07-23 14:36:23 +01:00
Tom Christie	90fe0fb881	Errors in browsable API on error. Closes #3024.	2015-07-23 14:31:25 +01:00
Tom Christie	6e6fa893e4	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-23 12:41:44 +01:00
Tom Christie	22631c73a7	Resolve assertion error with LimitOffsetPagination and erronous parameters. Closes #2920.	2015-07-23 12:41:35 +01:00
Tom Christie	e7d14532b0	Merge pull request #3178 from ilogik/master ... fixed a typo in docs	2015-07-23 11:21:33 +01:00
Adrian Mester	d9c934debd	fixed a typo in docs	2015-07-23 13:10:20 +03:00
Tom Christie	77e69451c1	Update CONTRIBUTING.md	2015-07-22 13:05:56 +01:00
Tom Christie	762a30dbda	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-07-22 12:36:43 +01:00
Tom Christie	f9c61e8090	Prominent notes on deprecation status of pagination settings. Closes #3173.	2015-07-22 12:36:32 +01:00
Tom Christie	cab981837f	Merge pull request #3172 from jpadilla/master ... Update quickstart.md	2015-07-20 07:17:59 +01:00
José Padilla	7f7e6b33ff	Update quickstart.md ... Closes #3171	2015-07-19 21:47:09 -04:00