Commit Graph

6304 Commits

Author SHA1 Message Date
Thomas NOËL 426ba7ef65 debian: python >= 2.7 2016-03-04 17:38:43 +01:00
Thomas NOËL e349f3db43 Merge tag '3.3.2'
version 3.3.2
2016-03-04 17:27:18 +01:00
Xavier Ordoquy 552707381e Merge pull request #3733 from linovia/version/3.3.2
Version 3.3.2
2015-12-14 13:47:31 +01:00
Xavier Ordoquy ef8bde2d42 Bump version to 3.3.2 2015-12-14 07:33:17 +01:00
Xavier Ordoquy 5224feded4 Update the release date. 2015-12-14 07:32:50 +01:00
Xavier Ordoquy 485c297a04 Translations update. 2015-12-14 07:31:38 +01:00
Xavier Ordoquy bf18c9f6e3 3.3.2 release notes. 2015-12-14 07:22:30 +01:00
José Padilla df071d5555 Merge pull request #3723 from linovia/bug/authtoken_versionning_compat
Add extra args/kwargs to authtoken's views (#3718)
2015-12-13 14:53:13 -04:00
Xavier Ordoquy dcaff71217 Merge pull request #3728 from karthik-suresh/Fixes-Issue3727
Import parser added to docs in API guide
2015-12-12 22:19:13 +01:00
Karthik Suresh 82973cfa32 Import parser added to docs in API guide
Added missing import statements in code snippet of API guide.

Closes-Issue: #3727
2015-12-12 21:59:08 +05:30
Tom Christie ff4bc43a2f Merge pull request #3721 from raphaelmerx/rm-format
Fixed suggestion for format in test renderer
2015-12-11 09:13:48 +00:00
Xavier Ordoquy 7a5d81c0b4 Add extra args/kwargs to authtoken's views (#3718) 2015-12-11 07:16:04 +01:00
Raphael Merx fcc0a70f7c Fixed suggestion for format in test renderer
Rendered would suggest using format='JSON' when the right argument is
format='json'.
2015-12-10 15:19:03 -08:00
Xavier Ordoquy e83175323b Merge pull request #3714 from knbk/set_app_name
Add app_name to rest_framework.urls.
2015-12-08 09:59:11 +01:00
knbk e203967e09 Add app_name to rest_framework.urls.
This allows users in Django 1.9+ to include the authentication urls
without specifying the namespace, as in:

    urlpatterns = [
        ...
        url(r'^auth/', include('rest_framework.urls'))
    ]
2015-12-08 02:25:00 +01:00
Xavier Ordoquy f3949e994d Update base translation file. 2015-12-07 18:56:47 +01:00
Tom Christie c227b8188e Merge pull request #3705 from mcastle/patch-2
Admin and API browser fails for views without a filter_class
2015-12-07 10:10:24 +00:00
Xavier Ordoquy 6bbb2890cb Merge pull request #3701 from Cheglader/master
Fix #3628 by implementing __getnewargs__()
2015-12-07 10:45:06 +01:00
Xavier Ordoquy b8d109f2cf Merge pull request #3709 from qrilka/patch-1
Fixed versioning regexp
2015-12-07 10:22:59 +01:00
Kirill Zaborsky 85db6a681b Fixed versioning regexp
booking list regexp was fixed in 8b97bb8f68 but single booking wasn't for some reason, and `v1v2/bookings/123/` shouldn't be allowed here
2015-12-07 10:59:57 +03:00
Marlon c1b70538a2 Resolve #3596
Uses #3597, but without using `Context`.
2015-12-05 11:10:39 -06:00
Luis San Pablo 4b59681c60 Fixed Class Newlines 2015-12-04 05:57:09 +00:00
Luis San Pablo 84b5e41af8 Fixes #3628 2015-12-04 05:48:56 +00:00
Luis San Pablo 4092cef392 Fixed Test Case for Hyperlink 2015-12-04 05:42:46 +00:00
Luis San Pablo 8501f59216 Hyperlink Test Case 2015-12-04 05:30:39 +00:00
Luis San Pablo dfc84d9818 Force Build 2015-12-03 21:17:21 +00:00
Luis San Pablo 44a3d41ce9 Implement __getnewargs__ for #3628 2015-12-03 21:12:03 +00:00
Tom Christie 9f74b8860e Merge pull request #3687 from benred42/3679-UUIDField-validation
Fixed #3679 -- UUID Validation
2015-12-02 10:04:54 +00:00
Xavier Ordoquy 17267bfc32 Merge pull request #3689 from jpadilla/django19
Use latest release of Django 1.9
2015-12-02 08:15:53 +01:00
José Padilla eba6229b24 Use latest release of Django 1.9 2015-12-01 21:44:22 -04:00
bphillips c153bcb479 Added validation to UUIDField to properly catch invalid input types (lists, tuples, etc). 2015-12-01 14:09:10 -05:00
José Padilla d2f90fd6af Merge pull request #3662 from awwester/ticket_3228
#3228 - add confirm modal for delete
2015-12-01 10:50:34 -04:00
Adam Wester 6d1ed851b5 #3228 - add confirm modal for delete 2015-12-01 07:51:29 -05:00
Tom Christie 832d6322a7 Merge pull request #3631 from syphar/paginat
allow setting a custom Django Paginator class
2015-11-30 20:58:32 +00:00
Tom Christie bd8098e31f Fix template typo.
Closes #3682.
Thanks for the report!
2015-11-30 17:21:41 +00:00
José Padilla 68285a9bc2 Merge pull request #3683 from nikolas/patch-2
Add missing link to django-crispy-forms
2015-11-30 12:18:04 -04:00
Nik Nyby e3f62e230c Add missing link to django-crispy-forms 2015-11-30 10:48:56 -05:00
Tom Christie 8dea1aeed0 Merge pull request #3677 from Ernest0x/patch-4
Updated NestedBoundField to also handle empty string when rendering its form
2015-11-27 13:21:58 +00:00
Petros Moisiadis 3594c976b7 Added test case for rendering nested fields with none value 2015-11-27 15:07:29 +02:00
Tom Christie 0d0aff44ac Merge pull request #3668 from akx/exc-hiding
Reveal previously hidden AttributeErrors and TypeErrors
2015-11-27 11:51:25 +00:00
Aarni Koskela 69688289ce Ensure `Django{Model,Object}Permissions` don't hide exceptions.
Quietly catching `AttributeError` and `TypeError` when calling
`get_queryset()` is rather insidious, as those exceptions get caught no
matter where they might happen in the call stack.
2015-11-27 12:46:30 +02:00
Tom Christie 0e4ea2a591 Merge pull request #3676 from akx/tests-on-windows
Make tests pass on Windows too
2015-11-26 15:08:24 +00:00
Petros Moisiadis 570187b959 Updated NestedBoundField to also handle empty string when rendering its form
If a NestedBoundField field has a value of `None` and is inside another NestedBoundField field, it will have its value converted to an empty string while the form of its enclosing field is being rendered. So, NestedBoundField fields with an empty string value must be handled the same way as NestedBoundField fields with a `None` value.
2015-11-26 17:07:57 +02:00
Aarni Koskela 47c9bb143c Fix `smart_repr()` to also clean upper-case hex addresses.
Windows Pythons seem to like printing addresses in upper-case, while Linux
Pythons like lower-case hexes.

This led to an amusing (for a given value of "amusing", anyway) situation
where some repr tests would fail if the objects they were testing happened
to be allocated at an address with a hex digit in the range A..F.
2015-11-26 15:48:04 +02:00
Aarni Koskela bdf9c4997d Add `types` to isort's standard library list.
This re-stabilizes sorting after upgrading to 4.2.2.
2015-11-26 15:42:49 +02:00
Aarni Koskela 45c66dae42 Upgrade isort to 4.2.2.
This gets rid of a file encoding bug that occurs on Windows boxes where
the default implied encoding is cp1252, but the files themselves aren't.

The actual patch that seems to fix this is
1057d5e12e
but it seems like a good idea to upgrade to the latest and greatest.
2015-11-26 15:40:22 +02:00
Aarni Koskela 6dcb994c98 Upgrade transifex-client dependency to 0.11
Version 0.11b3's setup.py had an undeclared dependency on `py2exe` when
running on Windows (see
https://github.com/transifex/transifex-client/blob/0.11b3/setup.py#L23),
which made it impossible to install without having a working `py2exe` to
begin with.

This has been fixed in 0.11 proper.
2015-11-26 15:29:19 +02:00
José Padilla 200dda91ac Merge pull request #3675 from pt247/master
Fix for Incorrect regex in URLPathVersioning documentation #3638
2015-11-26 07:14:58 -04:00
Prashant Tiwari 8b97bb8f68 Fix for Incorrect regex in URLPathVersioning documentation #3638 2015-11-26 06:23:59 +00:00
Xavier Ordoquy d0352ae6fc Merge pull request #3621 from linovia/feature/how_to_turn_pagination_off
Document how to turn pagination off
2015-11-25 12:57:25 +01:00