summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* debian: python >= 2.7HEADmasterThomas NOEL2016-03-041-0/+1
* Merge tag '3.3.2'v3.3.2Thomas NOEL2016-03-04312-5200/+17989
|\
| * Merge pull request #3733 from linovia/version/3.3.23.3.2Xavier Ordoquy2015-12-1495-2198/+7459
| |\
| | * Bump version to 3.3.2Xavier Ordoquy2015-12-141-1/+1
| | * Update the release date.Xavier Ordoquy2015-12-141-1/+1
| | * Translations update.Xavier Ordoquy2015-12-1493-2197/+7405
| | * 3.3.2 release notes.Xavier Ordoquy2015-12-141-0/+53
| |/
| * Merge pull request #3723 from linovia/bug/authtoken_versionning_compatJosé Padilla2015-12-131-1/+1
| |\
| | * Add extra args/kwargs to authtoken's views (#3718)Xavier Ordoquy2015-12-111-1/+1
| * | Merge pull request #3728 from karthik-suresh/Fixes-Issue3727Xavier Ordoquy2015-12-121-0/+3
| |\ \ | | |/ | |/|
| | * Import parser added to docs in API guideKarthik Suresh2015-12-121-0/+3
| * | Merge pull request #3721 from raphaelmerx/rm-formatTom Christie2015-12-111-1/+1
| |\ \
| | * | Fixed suggestion for format in test rendererRaphael Merx2015-12-101-1/+1
| |/ /
| * | Merge pull request #3714 from knbk/set_app_nameXavier Ordoquy2015-12-083-4/+5
| |\ \
| | * | Add app_name to rest_framework.urls.knbk2015-12-083-4/+5
| |/ /
| * | Update base translation file.Xavier Ordoquy2015-12-071-56/+82
| * | Merge pull request #3705 from mcastle/patch-2Tom Christie2015-12-071-4/+3
| |\ \
| | * | Resolve #3596Marlon2015-12-051-4/+3
| * | | Merge pull request #3701 from Cheglader/masterXavier Ordoquy2015-12-072-0/+14
| |\ \ \
| | * | | Fixed Class NewlinesLuis San Pablo2015-12-041-0/+1
| | * | | Fixes #3628Luis San Pablo2015-12-041-0/+0
| | * | | Fixed Test Case for HyperlinkLuis San Pablo2015-12-041-4/+4
| | * | | Hyperlink Test CaseLuis San Pablo2015-12-041-0/+10
| | * | | Force BuildLuis San Pablo2015-12-031-0/+0
| | * | | Implement __getnewargs__ for #3628Luis San Pablo2015-12-031-0/+3
| | |/ /
| * | | Merge pull request #3709 from qrilka/patch-1Xavier Ordoquy2015-12-071-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixed versioning regexpKirill Zaborsky2015-12-071-1/+1
| |/ /
| * | Merge pull request #3687 from benred42/3679-UUIDField-validationTom Christie2015-12-022-3/+6
| |\ \
| | * | Added validation to UUIDField to properly catch invalid input types (lists, t...bphillips2015-12-012-3/+6
| * | | Merge pull request #3689 from jpadilla/django19Xavier Ordoquy2015-12-021-4/+4
| |\ \ \ | | |/ / | |/| |
| | * | Use latest release of Django 1.9José Padilla2015-12-021-4/+4
| |/ /
| * | Merge pull request #3662 from awwester/ticket_3228José Padilla2015-12-012-3/+24
| |\ \
| | * | #3228 - add confirm modal for deleteAdam Wester2015-12-012-3/+24
| * | | Merge pull request #3631 from syphar/paginatTom Christie2015-11-303-1/+63
| |\ \ \
| | * | | allow setting a custom Django Paginator in pagination.PageNumberPaginationDenis Cornehl2015-11-133-1/+63
| * | | | Fix template typo.Tom Christie2015-11-301-214/+218
| * | | | Merge pull request #3683 from nikolas/patch-2José Padilla2015-11-301-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add missing link to django-crispy-formsNik Nyby2015-11-301-0/+1
| |/ / /
| * | | Merge pull request #3677 from Ernest0x/patch-4Tom Christie2015-11-272-1/+38
| |\ \ \
| | * | | Added test case for rendering nested fields with none valuePetros Moisiadis2015-11-271-0/+37
| | * | | Updated NestedBoundField to also handle empty string when rendering its formPetros Moisiadis2015-11-261-1/+1
| * | | | Merge pull request #3668 from akx/exc-hidingTom Christie2015-11-271-8/+8
| |\ \ \ \
| | * | | | Ensure `Django{Model,Object}Permissions` don't hide exceptions.Aarni Koskela2015-11-271-8/+8
| | |/ / /
| * | | | Merge pull request #3676 from akx/tests-on-windowsTom Christie2015-11-264-3/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix `smart_repr()` to also clean upper-case hex addresses.Aarni Koskela2015-11-261-1/+1
| | * | | Add `types` to isort's standard library list.Aarni Koskela2015-11-261-0/+1
| | * | | Upgrade isort to 4.2.2.Aarni Koskela2015-11-261-1/+1
| | * | | Upgrade transifex-client dependency to 0.11Aarni Koskela2015-11-261-1/+1
| |/ / /
| * | | Merge pull request #3675 from pt247/masterJosé Padilla2015-11-261-1/+1
| |\ \ \
| | * | | Fix for Incorrect regex in URLPathVersioning documentation #3638Prashant Tiwari2015-11-261-1/+1
| |/ / /