Commit Graph

  • 21ab6ff3ea Merge branch 'master' into document-how-to-trans Craig Blaszczyk 2014-12-31 12:51:39 +0000
  • f4d7f7e730 fix spelling & grammar errors Craig Blaszczyk 2014-12-31 12:49:20 +0000
  • 4bca062df6 Merge pull request #2363 from kdazzle/models_meta-cleanup Tom Christie 2014-12-30 10:36:17 +0000
  • eb04133bb9 emit a warning when a setting has an unexpected type Craig Blaszczyk 2014-12-29 13:15:54 +0000
  • 88ea5d6bb0 emit a warning when a setting has an unexpected type Craig Blaszczyk 2014-12-29 13:00:22 +0000
  • a7479721c8 First pass at refactoring get_field_info in utils.model_meta Kyle Valade 2014-12-29 00:35:00 -0800
  • 5d8c45681a Update copryright for 2015. Closes #2247. Tom Christie 2014-12-28 18:48:42 +0000
  • 264c68b053 update internationalisation instructions to prevent symlinking; add base .po file Craig Blaszczyk 2014-12-28 18:20:41 +0000
  • d8e66970a1 Note on using i18n_patterns with format_suffix_patterns. Closes #2278. Tom Christie 2014-12-28 12:14:07 +0000
  • efa5942ce1 Support namespaced router URLs with DefaultRouter. Tom Christie 2014-12-28 12:02:52 +0000
  • 67fc002f91 Drop unused import Tom Christie 2014-12-28 11:26:38 +0000
  • 8dc95ee221 Add notes on include and namespacing. Closes #2335. Tom Christie 2014-12-28 11:24:49 +0000
  • 66599c035c Merge 0796cc845b into 7b42c5ed17 Omer Katz 2014-12-28 11:14:50 +0000
  • 7b42c5ed17 Remove broken test. Closes #2359. Tom Christie 2014-12-28 11:14:32 +0000
  • 91019b4960 Merge 46b9a6acd9 into ef2eff2aba Rocky Meza 2014-12-28 11:13:27 +0000
  • 4eb6e56a03 Merge d8a7e65514 into ef2eff2aba Rocky Meza 2014-12-28 11:11:18 +0000
  • ef2eff2aba Only pass max_length for CharField. Closes #2317. Tom Christie 2014-12-28 11:07:38 +0000
  • 27f84aa0f3 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework Tom Christie 2014-12-28 11:02:36 +0000
  • a636320ff3 Add import notes in docs. Closes #2357 Tom Christie 2014-12-28 11:02:19 +0000
  • d8a7e65514 Add support for namespaces in APIRoot. Rocky Meza 2014-12-24 19:37:13 -0700
  • 0d2f30c1d4 Merge pull request #2358 from fusionbox/manger_typo Tom Christie 2014-12-27 08:22:55 +0000
  • 46b9a6acd9 [don't merge] TestRootWithAListlessViewset problem Rocky Meza 2014-12-26 22:27:37 -0700
  • 5b5652594a Typo manger => manager Rocky Meza 2014-12-26 22:24:31 -0700
  • 00531ec937 Release notes on non-text detail arguments. Closes #2341. Tom Christie 2014-12-26 15:48:16 +0000
  • 0a2d8983bf Merge 478001b873 into c2e00a075c zhanglc 2014-12-26 15:25:51 +0000
  • c2e00a075c Paginated serializers should get context. Tom Christie 2014-12-26 15:25:13 +0000
  • dda9737978 Add info about how django chooses which language to use Craig Blaszczyk 2014-12-26 12:52:17 +0000
  • 478001b873 fix: https://github.com/tomchristie/django-rest-framework/issues/2355 liucheng.zhang 2014-12-26 17:53:18 +0800
  • 6fbd89ad37 match DRF style guide Craig Blaszczyk 2014-12-24 18:26:17 +0000
  • 3e847b2134 instructions on how to translate REST framework error messages Craig Blaszczyk 2014-12-24 18:22:19 +0000
  • 0796cc845b Fixed tox dependencies. Omer Katz 2014-12-24 18:05:05 +0200
  • 813219c5df The build will now run with multiple processes in order to speed up tests. Omer Katz 2014-12-24 18:01:55 +0200
  • fbf5f58864 Added pytest-xdist to the requirements. Omer Katz 2014-12-24 18:00:27 +0200
  • 6317b166e9 Merge 00b92ee949 into 9f9b9f8944 Rocky Meza 2014-12-24 14:47:24 +0000
  • 9f9b9f8944 Merge pull request #2340 from shtouff/fix-htmlform-textarea Tom Christie 2014-12-24 14:44:32 +0000
  • b32ecdefba modified the tests accordingly Remi Paulmier 2014-12-24 14:07:28 +0100
  • 00b92ee949 [DONT MERGE] Failing test to illustrate #2333 Rocky Meza 2014-12-24 05:45:39 -0700
  • bf7309ef72 Adjusted the documentation according to comments. Omer Katz 2014-12-24 10:58:26 +0200
  • e6041f9c3e Merge pull request #2348 from theengineear/compress-invalid-template Kevin Brown 2014-12-23 17:35:39 -0500
  • 35768344db Remove ‘/‘ from inside variable block {{ }} Andrew Seier 2014-12-23 12:12:22 -0800
  • 399cb165b0 Remove commented code (warning during compression) Andrew Seier 2014-12-23 12:11:45 -0800
  • 2645a32929 Merge pull request #2346 from sh4r3m4n/master Tom Christie 2014-12-23 15:28:46 +0000
  • 18687f075d Documented an optional argument of HyperlinkedIdentityField Matías Lang 2014-12-23 12:22:10 -0300
  • be9b1e68fd Merge 2fcc382fdf into 201e7eaa4b Håkan W 2014-12-23 12:20:15 +0000
  • 2fcc382fdf fix flake8 issues Håkan Waara 2014-12-23 13:20:11 +0100
  • eb44302c3d let integerfields handle max_length, although do nothing with it. Håkan Waara 2014-12-23 13:11:34 +0100
  • 15673208a1 add failing test. adding a max_length argument to an IntegerField should be valid Håkan Waara 2014-12-23 13:10:13 +0100
  • 6c5ff71278 fix the way to use textarea rather than input with models.TextField Remi Paulmier 2014-12-22 18:05:07 +0100
  • 670a78536f Clarified intention of the first code example. Omer Katz 2014-12-22 11:35:15 +0200
  • 201e7eaa4b Merge pull request #2337 from BWStearns/master Tom Christie 2014-12-22 07:55:24 +0000
  • 3569674860 use of double quotes broke the code highlighting. Brian Stearns 2014-12-21 18:53:35 -0500
  • 73c38b0bcb Added more common usage examples of including routers in urlpatterns. Omer Katz 2014-12-21 22:21:14 +0200
  • 56f329fbe6 Merge 4ba48d3460 into e4c7c10b00 Rocky Meza 2014-12-21 10:54:17 +0000
  • 4ba48d3460 Add support for namespaces to DefaultRouter. Rocky Meza 2014-12-21 03:46:54 -0700
  • e4c7c10b00 Merge pull request #2331 from tomchristie/use-custom-list-serializer-for-pagination Tom Christie 2014-12-20 16:42:39 +0000
  • ffb8d568e0 Merge pull request #2330 from tomchristie/better-blank-html-behavior Tom Christie 2014-12-20 16:40:27 +0000
  • 03c4eb1130 Use custom ListSerializer for pagination if one is specified on the serializer. Tom Christie 2014-12-20 16:32:07 +0000
  • 77e3021fea Better behaviour with null and '' for blank HTML fields. Tom Christie 2014-12-20 16:26:51 +0000
  • 889a0bdeca Merge pull request #2322 from tomchristie/model-serializer-api Tom Christie 2014-12-19 21:44:24 +0000
  • 2a1485e009 Final bits of docs for ModelSerializer fields API Tom Christie 2014-12-19 21:32:43 +0000
  • c663a585ec Merge c06a82d053 into 48d15f6ff8 Tom Christie 2014-12-19 17:03:29 +0000
  • 48d15f6ff8 Stub out the documentation Tom Christie 2014-12-19 16:58:35 +0000
  • b8d5d94625 Don't try to iterate Nonetype objects when serializing Added test for serializing None in a many=True situation. Mark Jones 2014-12-19 10:10:08 -0600
  • f77831c208 Merge c06a82d053 into d109ae0a2e Tom Christie 2014-12-19 16:17:06 +0000
  • d109ae0a2e Merge pull request #2010 from tanwanirahul/master Tom Christie 2014-12-19 16:09:01 +0000
  • c06a82d053 Model serializer caching. Tom Christie 2014-12-19 16:02:27 +0000
  • 8f0fef4b75 Updated documentation on url_path per suggestions. Rahul 2014-12-19 21:22:10 +0530
  • 62f78dfbf1 Copy validators lists on instantiation. Tom Christie 2014-12-19 15:50:29 +0000
  • b4a3e7f640 Updates url_path info per suggestion Rahul 2014-12-19 21:20:19 +0530
  • 75e81b8254 build_*_field methods Tom Christie 2014-12-19 15:35:52 +0000
  • f72928ea98 build_field, build_final_kwargs Tom Christie 2014-12-19 15:09:57 +0000
  • 6aa0e307c9 Added documentation about url_path parameter for custom actions. Rahul 2014-12-19 20:31:21 +0530
  • 94883ae7cd Merge branch 'version-3.1' into model-serializer-api Tom Christie 2014-12-19 14:53:21 +0000
  • 3fc441059d Merge branch 'master' into version-3.1 Tom Christie 2014-12-19 14:53:10 +0000
  • 80bacc5fb0 depth should reduce by one on each nesting level. Closes #2287. Tom Christie 2014-12-19 14:52:53 +0000
  • 4a112fc3a6 Clean up Tom Christie 2014-12-19 14:51:45 +0000
  • a8a3fedb5c Add url_path documention for detail_route decorator tanwanirahul 2014-12-19 20:16:46 +0530
  • 2448cc8e85 Updated tests to use url_path attribute in list and detail decorators tanwanirahul 2014-12-19 19:53:48 +0530
  • 92ebeaa040 Change decorator attribute name to url_path per suggestions tanwanirahul 2014-12-19 19:52:59 +0530
  • caa1318124 get_uniqueness_field_options first pass Tom Christie 2014-12-19 13:13:20 +0000
  • 1a84943a00 get_extra_kwargs Tom Christie 2014-12-19 12:27:50 +0000
  • 6d907cde9a get_field_names, get_default_field_names Tom Christie 2014-12-19 12:18:40 +0000
  • ba753a7536 Merge branch 'version-3.1' into model-serializer-api Tom Christie 2014-12-19 11:53:26 +0000
  • 435aef7738 Merge branch 'master' into version-3.1 Tom Christie 2014-12-19 11:53:05 +0000
  • 5830f7e138 get_unique_together_validators and get_unique_for_date_validators Tom Christie 2014-12-19 10:15:36 +0000
  • e0096fe80c Merge pull request #2319 from maryokhin/master Tom Christie 2014-12-18 17:26:26 +0000
  • c1e4ec0c64 Update documentation Tom Christie 2014-12-18 15:42:42 +0000
  • 7105c1308e Add OPTIONS/metadata to docs index Tom Christie 2014-12-18 15:42:27 +0000
  • d60ecfc498 Assert fields in exclude are model fields Tymur Maryokhin 2014-12-18 16:03:15 +0100
  • c678a1f118 Update documentation Tom Christie 2014-12-18 13:49:50 +0000
  • fcdef983b1 Merge pull request #2316 from tomchristie/project-management Tom Christie 2014-12-18 13:49:31 +0000
  • 9c9d5bd859 Added project management docs. Tom Christie 2014-12-18 13:35:42 +0000
  • 4ea1402916 Merge master Tom Christie 2014-12-18 12:24:16 +0000
  • b8bdf812c1 Merge pull request #2315 from tomchristie/yaml-encoder-fix Tom Christie 2014-12-18 12:21:07 +0000
  • a68d9331fc YAML encoder fix for 3.0 serializers. Tom Christie 2014-12-18 12:17:46 +0000
  • 1e531d2081 Merge pull request #2314 from tomchristie/drop-setup-py-test Tom Christie 2014-12-18 11:55:10 +0000
  • af0f042462 Add pinned versions of wheels and mkdocs to our dev requirements. Tom Christie 2014-12-18 11:53:11 +0000
  • c8d88c8c8a Merge branch 'master' into version-3.1 Tom Christie 2014-12-18 11:21:25 +0000
  • 6909e92d22 Drop 'setup.py test'. Just use 'runtests.py'. Tom Christie 2014-12-18 10:58:08 +0000
  • d8803a35bd Merge pull request #2312 from tomchristie/check-for-wheel-before-pypi-publish Tom Christie 2014-12-18 10:55:58 +0000