6154 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Xavier Ordoquy	9a20609223	Merge pull request #3004 from linovia/translations/3.1.3 ... Translations updated for 3.1.3	2015-06-04 14:59:32 +01:00
Xavier Ordoquy	886220cb70	Last minute pull request	2015-06-04 14:56:00 +01:00
Tom Christie	a3d6601e09	Merge pull request #3008 from linovia/feature/ipaddress-fix ... `IPAddressField` improvements	2015-06-04 14:54:50 +01:00
Xavier Ordoquy	757e45acee	Adding the last minute PR.	2015-06-04 14:37:01 +01:00
Tom Christie	e8cc948f6b	Merge pull request #2695 from delinhabit/refactor-decimalfield ... [enhancement] Refactored DecimalField to allow easier subclassing	2015-06-04 14:26:28 +01:00
Xavier Ordoquy	dee5fb5647	Merge remote-tracking branch 'reference/master' into feature/ipaddress-fix ... Conflicts: docs/api-guide/fields.md	2015-06-04 14:21:33 +01:00
Osvaldo Santana Neto	7ae71deb84	Handle invalid characters in headers	2015-06-03 14:55:34 -03:00
Xavier Ordoquy	051b86e6fd	Translations updated for 3.1.3	2015-06-03 17:34:13 +01:00
Xavier Ordoquy	bc778732bf	Release notes for 3.1.3	2015-06-03 17:27:38 +01:00
Xavier Ordoquy	f3dbe9bb2a	Bump to version 3.1.3	2015-06-03 16:57:18 +01:00
Xavier Ordoquy	0c66c7cfa6	Merge pull request #3000 from linovia/ovangle/uuid_format2 ... Add 'format' argument to UUIDField	2015-06-03 12:32:23 +01:00
Tom Christie	b1b47036d7	Use six.text_type for hyperlink names	2015-06-03 11:53:27 +01:00
Tom Christie	99e97fa9d3	Cleanup hyperlink rendering implementation	2015-06-03 11:47:33 +01:00
Tom Christie	ae704eec58	Fix issue with pagination control always displaying	2015-06-03 11:35:03 +01:00
Tom Christie	25bb3b1502	Use chevron control for row linking, rather than hyperlinking first item	2015-06-03 11:15:54 +01:00
Tom Christie	90f2e26679	Add Hyperlink and rendering in admin style renderer	2015-06-03 11:00:38 +01:00
Shtarev	745d8d0004	added comment	2015-06-03 09:04:28 +03:00
Tom Christie	bb97485627	Merge pull request #2998 from linovia/documentation/include_translations_in_process ... Include translations in release process	2015-06-02 16:25:49 +01:00
Xavier Ordoquy	a97cbd1d68	Merge pull request #2999 from linovia/feature/short_pytest_tracebacks ... Let py.test use the short traceback format.	2015-06-02 16:24:47 +01:00
Xavier Ordoquy	ea00fc7a85	Fix the UUID examples style.	2015-06-02 16:10:14 +01:00
Xavier Ordoquy	734bf3cfe6	Merge pull request #2981 from jannon/fix-model-serializer-metadata ... Read-Only RelatedField Metadata Failure Test and Fix	2015-06-02 15:09:05 +01:00
Xavier Ordoquy	a61f865518	Add format examples.	2015-06-02 14:18:26 +01:00
Xavier Ordoquy	c82f6aa835	Merge remote-tracking branch 'origin/master' into documentation/include_translations_in_process	2015-06-02 13:49:24 +01:00
Xavier Ordoquy	0c97dd1806	Merge remote-tracking branch 'reference/master'	2015-06-02 13:04:57 +01:00
Xavier Ordoquy	e8e1908097	Remove the checked box and add a todo list during development cycle.	2015-06-02 13:01:17 +01:00
Xavier Ordoquy	87a523465b	Let py.test use the short traceback format.	2015-06-02 10:49:47 +01:00
Xavier Ordoquy	1957679368	Merge pull request #2887 from ticosax/doom-transaction-on-error ... Rollback the transaction on error if ATOMIC_REQUESTS is set.	2015-06-02 10:34:03 +01:00
Xavier Ordoquy	8fa3284620	Merge remote-tracking branch 'reference/master'	2015-06-02 10:24:28 +01:00
Xavier Ordoquy	6c1a285c83	Add the translations to the process.	2015-06-02 10:17:19 +01:00
Tom Christie	7f6fb3183f	Merge pull request #2994 from linovia/documentation/add_warning_about_login ... Add a warning about totally custom login views.	2015-06-02 09:51:08 +01:00
Jannon Frank	a97c989248	fix read_only related field metadata	2015-06-02 00:40:00 -07:00
Xavier Ordoquy	d4dd22ff1c	Merge pull request #2997 from ticosax/fix-typo-duration-field ... fix Typo	2015-06-02 08:27:11 +01:00
Nicolas Delaby	34dc98e8ad	improve wording	2015-06-02 09:19:58 +02:00
Nicolas Delaby	8ad38208a1	more assertions make the test more readable	2015-06-02 09:19:58 +02:00
Nicolas Delaby	d1371cc949	Use post instead of get for sanity of use-case.	2015-06-02 09:19:58 +02:00
Nicolas Delaby	c2d2417237	Tell default error handler to doom the transaction on error ... if `ATOMIC_REQUESTS` is enabled.	2015-06-02 09:19:58 +02:00
Nicolas Delaby	27fd48586e	allow to pass arbitrary arguments to py.test	2015-06-02 09:19:18 +02:00
Nicolas Delaby	3f3a01b4b8	fix Typo	2015-06-02 09:18:24 +02:00
Xavier Ordoquy	d79956d40e	Translation update.	2015-06-02 00:20:46 +01:00
Xavier Ordoquy	4ad8c17371	Add a warning about totally custom login views.	2015-06-01 18:13:40 +01:00
Xavier Ordoquy	f8eacc5bc0	Merge pull request #2993 from linovia/bug/2894 ... MultipleChoiceField empties incorrectly on a partial update using multipart/form-data (#2894)	2015-06-01 17:48:20 +01:00
Xavier Ordoquy	14055dd3f4	Merge pull request #2989 from ticosax/duration-field ... Add DurationField	2015-06-01 17:38:57 +01:00
Nicolas Delaby	f701ecceb7	Add DurationField	2015-06-01 18:20:53 +02:00
Xavier Ordoquy	5c90bf9cc0	Fix for #2894 thanks to @carljm	2015-06-01 16:13:35 +01:00
Xavier Ordoquy	94e2d3ca61	Test case upgrade to use partial data	2015-06-01 16:13:12 +01:00
Xavier Ordoquy	989c08109b	Failing test case for #2894	2015-06-01 16:04:05 +01:00
Tom Christie	0fdaa0dbba	Merge pull request #2992 from linovia/feature/clean_mock_html_dir ... Remove an extra MockHTMLDict definition.	2015-06-01 15:54:09 +01:00
Xavier Ordoquy	2f524ec1a3	Remove an extra MockHTMLDict definition.	2015-06-01 15:46:27 +01:00
Xavier Ordoquy	e3f856ff1d	Merge pull request #2975 from sheppard/read-only-nested ... can't create nested serializers for unique_together relations	2015-06-01 12:01:40 +01: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