Xavier Ordoquy
|
b06f944d2d
|
Merge pull request #3016 from hellysmile/non_atomic_requests
Fix set_rollback on @transaction.non_atomic_requests.
|
2015-06-08 23:43:50 +02:00 |
|
Xavier Ordoquy
|
ca0a7ee1de
|
Revert "Bump the django-guardian & django-filter to latests versions."
This reverts commit e095b91f60.
|
2015-06-08 21:48:05 +02:00 |
|
Xavier Ordoquy
|
e095b91f60
|
Bump the django-guardian & django-filter to latests versions.
|
2015-06-08 21:42:42 +02:00 |
|
hellysmile
|
cbfce93129
|
Fitx TestCase due Django interals.
|
2015-06-08 18:15:31 +03:00 |
|
Nico Mandery
|
325789db95
|
set the filter_backends class variable in the DjangoFilterBackend documentation for clearness
|
2015-06-08 15:18:30 +02:00 |
|
hellysmile
|
b015ae99e6
|
Inline @transaction.non_atomic_requests for Django<1.6.
|
2015-06-08 07:39:08 +03:00 |
|
hellysmile
|
c292b3d132
|
Fix set_rollback on @transaction.non_atomic_requests.
|
2015-06-08 07:10:57 +03:00 |
|
Tom Christie
|
6651432d59
|
Merge pull request #3015 from strixcuriosus/limit-offset-pagination-link-urls
Include correct limits in LimitOffsetPagination link urls
|
2015-06-05 20:37:04 +01:00 |
|
Ash Hoover
|
35c28a2a71
|
Include correct limits in LimitOffsetPagination link urls
|
2015-06-05 08:56:33 -07:00 |
|
malinich
|
4a2bad03c5
|
outdated method 'get_filter_backends' has been deleted from the documentation
|
2015-06-05 15:40:13 +03:00 |
|
Jannon Frank
|
b0752217ae
|
only include 'allow_blank' on CharField
|
2015-06-05 02:21:13 -07:00 |
|
Tom Christie
|
bde05bfd3e
|
Merge pull request #3010 from jaredpetersen/master
Remove reference to Bootstrap Customizer in browsable-api.md
|
2015-06-05 08:55:10 +01:00 |
|
Jared Petersen
|
2b2fbbd299
|
Update browsable-api.md
The Bootstrap Customizer has been discontinued and is no longer available (http://getbootstrap.com/2.3.2/customize.html), so I removed the reference to it in the page.
|
2015-06-04 21:28:21 -07:00 |
|
Xavier Ordoquy
|
8935db1be9
|
Merge pull request #3003 from linovia/release/3.1.3
Release 3.1.3
|
2015-06-04 15:04:55 +01:00 |
|
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 |
|