Commit Graph

  • 7577e1766a Merge 843daa37bf into 84260b5dd6 Philip Neustrom 2015-02-13 02:29:42 +0000
  • 843daa37bf Merge remote-tracking branch 'upstream/master' into paginate_kwarg_setting Philip Neustrom 2015-02-12 18:28:19 -0800
  • 58d1ca8671 Fixes HiddenField being rendered in HTMLFormRenderer Rubén Durá Tarí 2015-02-12 12:03:00 +0000
  • 84260b5dd6 Merge pull request #2550 from maryokhin/patch-1 Kevin Brown 2015-02-11 19:39:51 -0500
  • 9d80335ac8 Remove '.model' shortcut from viewset docs. Refs #2486. Closes #2549. Tymur Maryokhin 2015-02-12 01:10:03 +0100
  • ad32e14360 Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1 Tom Christie 2015-02-11 14:19:18 +0000
  • c3425accde Fix incorrect HTML parsing for DictField Tom Christie 2015-02-11 14:19:07 +0000
  • 3d25dadbf3 change custom message for clarity donewell 2015-02-11 11:20:03 +0000
  • 9a9a00bff2 simplify argument handling donewell 2015-02-11 11:15:01 +0000
  • 6048152c2c Merge 36cd8663d4 into 637af1fc14 Omer Katz 2015-02-10 23:44:19 +0000
  • ccb2b8ff69 Update documentation Xavier Ordoquy 2015-02-10 23:56:05 +0100
  • 637af1fc14 Merge pull request #2540 from linovia/release/3.0.5 3.0.5 Xavier Ordoquy 2015-02-10 23:48:38 +0100
  • 59b3fe8f39 Bumped the version to 3.0.5 Xavier Ordoquy 2015-02-10 22:48:04 +0100
  • f6033cee87 Add release notes for 3.0.5. Xavier Ordoquy 2015-02-10 22:36:41 +0100
  • 9ea615af14 add message to custom permission donewell 2015-02-10 17:41:03 +0000
  • b999db1c46 Merge pull request #2535 from carltongibson/search-filter-duplicates Tom Christie 2015-02-10 10:43:00 +0000
  • 3522b69394 Add distinct call in filter_queryset Carlton Gibson 2015-02-10 10:51:38 +0100
  • d87bb67d11 Failing test case for #1488 Carlton Gibson 2015-02-10 10:50:35 +0100
  • 5dab548681 Merge d470a2c173 into 7b639c0cd0 Guilherme Gondim 2015-02-10 05:12:06 +0000
  • 84bc8b6cdf Merge 4881126544 into 7b639c0cd0 Damien Nozay 2015-02-09 22:19:17 +0000
  • 647d24a095 Merge pull request #2534 from JoarLeth/version-3.1 Tom Christie 2015-02-09 22:09:15 +0000
  • b18d773b51 Fix typo in 3.1 announcement Joar Leth 2015-02-09 22:51:49 +0100
  • fbb21caaaa Merge master Tom Christie 2015-02-09 20:43:50 +0000
  • 7b639c0cd0 Drop django master from the build matrix. Tom Christie 2015-02-09 17:57:08 +0000
  • 873fb69395 Merge pull request #2530 from tomchristie/attribute-proxying-fix Tom Christie 2015-02-09 17:56:25 +0000
  • 1a087c8c5b Fix .gitignore Tom Christie 2015-02-09 17:47:59 +0000
  • b2939c157d Fixes for latest version of pep8 Tom Christie 2015-02-09 17:43:20 +0000
  • 0669f507b3 pep8 fix Tom Christie 2015-02-09 17:22:13 +0000
  • 54d82f59ed Py3 compat fix Tom Christie 2015-02-09 17:19:22 +0000
  • d13c807616 Fix misleading AttributeErrors Tom Christie 2015-02-09 17:02:54 +0000
  • 407480b484 Minor docs work Tom Christie 2015-02-09 17:01:41 +0000
  • 36cd8663d4 Added full stack benchmarks with filters. Omer Katz 2015-02-07 13:11:18 +0200
  • a8e7f664db Fixed the lint error. Omer Katz 2015-02-07 13:09:15 +0200
  • 41412f9392 Python 2.6 compatibility Javier Chamizo 2015-02-07 04:00:29 +0100
  • 7854bd5daf Pass a dict as data to django-filter Javier Chamizo 2015-02-07 03:22:22 +0100
  • 0240df1a38 Minor internal API cleanpu Tom Christie 2015-02-06 16:15:10 +0000
  • 670723f021 Minor cleanups/improvements to ModelSerializer API Tom Christie 2015-02-06 15:45:02 +0000
  • 235b98e427 Merge pull request #2460 from mmarvick/master José Padilla 2015-02-06 11:31:25 -0400
  • 5d8c3abe72 Fix typo Tom Christie 2015-02-06 15:27:35 +0000
  • dec3493d7c Minor cleanup Tom Christie 2015-02-06 14:43:43 +0000
  • a435b1b355 Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1 Tom Christie 2015-02-06 14:39:31 +0000
  • 3dff9a4fe2 Resolve merge conflict model-serializer-caching Tom Christie 2015-02-06 14:35:06 +0000
  • 1f99612845 Upgrade pending deprecations to deprecations Tom Christie 2015-02-06 13:21:35 +0000
  • 0e4d202c58 Merge pull request #2527 from linovia/feature/secured_pypi_upload Tom Christie 2015-02-06 13:10:48 +0000
  • 1d4956f616 Pagination images Tom Christie 2015-02-06 13:08:04 +0000
  • 750d0c9f2b Add Twine to the requirements. Xavier Ordoquy 2015-02-06 13:57:08 +0100
  • 238a3b507b Add Twine to the requirements. Xavier Ordoquy 2015-02-06 13:50:40 +0100
  • 53716f6152 Internationalization docs Tom Christie 2015-02-06 11:37:29 +0000
  • 9dd97a0ee5 Fixed a typo. Xavier Ordoquy 2015-02-06 10:23:58 +0100
  • 75ff754517 Use twine to upload to pypi. Xavier Ordoquy 2015-02-06 10:12:57 +0100
  • 7f9942aec4 Merge 08b6931103 into 24372ec778 André Ericson 2015-02-06 08:46:42 +0000
  • 08b6931103 get_authenticate_header should look for unauthenticated request in all authenticators André Ericson 2015-02-06 05:35:01 -0300
  • 7f801b9a01 Add trim_whitespace to CharField #2517 José Padilla 2015-02-06 01:09:19 -0400
  • 5bf803b6ed Revert some of the changes made in 1-serialization.md Michael Marvick 2015-02-05 19:42:36 -0800
  • 09488ad4da Link to ModelSerializer API Tom Christie 2015-02-06 00:25:03 +0000
  • 1fdfea2758 Merge branch 'version-3.1' of https://github.com/tomchristie/django-rest-framework into version-3.1 Tom Christie 2015-02-06 00:05:59 +0000
  • b11a98f1e7 Tweak gitignore Tom Christie 2015-02-06 00:05:42 +0000
  • 6c63ef13cd Drop 2.x announcements Tom Christie 2015-02-06 00:04:20 +0000
  • 1a08c0ce8a Fixed the failing full stack benchmarks. Omer Katz 2015-02-06 00:08:03 +0200
  • 24372ec778 Merge pull request #2524 from Kaptian/patch-1 Xavier Ordoquy 2015-02-05 23:02:59 +0100
  • fffde8a63b Update throttling.py Kaptian 2015-02-05 13:27:26 -0800
  • 48eb711a42 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into topic/benchmarks Omer Katz 2015-02-05 21:26:08 +0200
  • f1e7ce54a1 Merge pull request #2496 from jpadilla/version-3.1 Tom Christie 2015-02-05 14:49:19 +0000
  • c696b0ba0c Fix possible nested array fields José Padilla 2015-02-05 10:12:14 -0400
  • b2590bdd13 Merge 41a1188144 into 3b00824560 ygavenchuk 2015-02-05 09:47:55 +0000
  • 41a1188144 Into rest_framework.request.Request added support of Array params (data = {'qwerty': ['uiop', 'blah', ]} or in url "/some/url/path?qwerty[]=uiop&qwerty[]=blah"). Yuriy Gavenchuk 2015-02-05 11:39:25 +0200
  • 720d154c83 Merge remote-tracking branch 'upstream/version-3.1' into version-3.1 José Padilla 2015-02-04 23:34:20 -0400
  • 48fa77c09e Add child to ListField when using ArrayField José Padilla 2015-02-04 23:33:59 -0400
  • f98f842827 Minor bits of test cleanup Tom Christie 2015-02-05 01:24:55 +0000
  • 65bbc4a159 Merge branch 'brandoncazander-version-3.1-2489' into version-3.1 Tom Christie 2015-02-05 00:58:16 +0000
  • e1c4513312 Fix NamespaceVersioning with hyperlinked serializer fields Tom Christie 2015-02-05 00:58:09 +0000
  • 83673e8f74 Merge branch 'version-3.1-2489' of git://github.com/brandoncazander/django-rest-framework into brandoncazander-version-3.1-2489 Tom Christie 2015-02-04 23:32:48 +0000
  • 41b213414d Updating release notes Tom Christie 2015-02-04 23:32:25 +0000
  • a53377fd73 Allow custom page_kwarg keyword in settings. Philip Neustrom 2015-02-04 22:25:28 +0800
  • 57177f5fcd Merge 28598a7502 into 3b00824560 Philip Neustrom 2015-02-04 14:37:18 +0000
  • 28598a7502 Allow custom page_kwarg keyword in settings. Philip Neustrom 2015-02-04 22:25:28 +0800
  • 3b00824560 Merge pull request #2518 from longhotsummer/patch-1 Tom Christie 2015-02-04 14:30:53 +0000
  • e13d2af137 Parens around if clause Greg Kempe 2015-02-04 16:26:23 +0200
  • d21617ff3b Merge pull request #2519 from Ofir-Purple/optimize-token-auth-queries Tom Christie 2015-02-04 14:20:21 +0000
  • d920683237 Use inline if Greg Kempe 2015-02-04 16:13:30 +0200
  • 58e7bbc8ec Prefetching the user object when getting the token in TokenAuthentication. Ofir Ovadia 2015-02-04 16:08:41 +0200
  • 7bb5fd270d FIX: Don't default to list in method args Greg Kempe 2015-02-04 16:03:03 +0200
  • a0374e4498 Remove erronous checkin Tom Christie 2015-02-04 09:08:43 +0000
  • 8b4ce5c636 Minor authentication message improvement. Tom Christie 2015-02-04 09:07:10 +0000
  • 7208210706 Merge 3284410aac into 46181341d5 MEmmanuel 2015-02-04 08:40:35 +0000
  • 3284410aac Merge pull request #1 from MEmmanuel/update_autentication MEmmanuel 2015-02-04 09:33:37 +0100
  • 90930ad1f5 Added some full stack benchmarks. Some of them fail and I don't know why yet. Omer Katz 2015-02-04 09:34:25 +0200
  • 7b2192d861 Benchmarking nested serialization with many objects. Omer Katz 2015-02-03 19:12:34 +0200
  • 41d93d18a4 Increased the number of iterations for more accurate results. Omer Katz 2015-02-03 17:48:46 +0200
  • 9361689d97 Merge 52064cb5b5 into 46181341d5 Alexey Evseev 2015-02-04 07:49:06 +0000
  • 590026486d Merge 866d41f263 into 46181341d5 Omer Katz 2015-02-04 07:48:34 +0000
  • 2755b19ca1 Merge e2f4bb8bfa into 46181341d5 Omer Katz 2015-02-04 06:23:07 +0000
  • 46181341d5 Merge pull request #2512 from heywbj/docs Xavier Ordoquy 2015-02-04 00:13:52 +0100
  • 76efbdddb6 docs Warren Jin 2015-02-03 17:18:54 -0500
  • 186878e112 Update authentication.py MEmmanuel 2015-02-03 18:51:00 +0100
  • 52064cb5b5 blank fields shall not be required st4lk 2015-02-03 20:09:38 +0300
  • e2f4bb8bfa JSONRenderer guarantees that the render will return bytes. Adjusting type accordingly. Omer Katz 2015-02-03 17:50:08 +0200
  • 866d41f263 Increased the number of iterations for more accurate results. Omer Katz 2015-02-03 17:24:32 +0200
  • 024aa5462e Merge 4a869b755b into 33cfc2e486 Dustin Farris 2015-02-03 14:14:44 +0000
  • 77caa782fd Merge 8fadf54ff9 into 33cfc2e486 heywbj 2015-02-03 13:58:29 +0000