 Diederik van der Boor
|
966776aea5
|
Merge pull request #217 from Corvia/master
#216 Allow ContentType queries to be performed on non-default databases.
|
2016-05-31 17:18:06 +02:00 |
|
|
Diederik van der Boor
|
1c4facef4e
|
Merge pull request #210 from andrewdodd/IncludeProxyModelOnly
Issue #200 - Exclude super-class from proxy model query sets
|
2016-05-23 14:44:37 +02:00 |
|
|
Diederik van der Boor
|
5175cd6dbe
|
Merge pull request #208 from NotSqrt/master
Test that expressions are supported
|
2016-05-04 11:11:13 +02:00 |
|
|
Diederik van der Boor
|
4277c148aa
|
Merge pull request #161 from theatlantic/pr-add-deferred-fields
Add support for qset.only() and qset.defer()
|
2016-02-17 11:14:48 +01:00 |
|
|
Diederik van der Boor
|
ed7573b347
|
Merge pull request #194 from slide333333/master
Support for Django 1.8 complex expressions in annotate/aggragte
|
2016-02-17 11:12:22 +01:00 |
|
|
Diederik van der Boor
|
673c3bf565
|
Merge pull request #196 from GregoryAveryWeir/patch-1
Update quickstart for Django 1.9 compatibility
|
2016-02-17 11:11:40 +01:00 |
|
|
Diederik van der Boor
|
5c4ee7484e
|
Merge pull request #190 from amuttsch/amuttsch-doc-pk-regex
Mention pk_regex in docs when using non-int pk
|
2016-01-03 10:17:44 +01:00 |
|
|
Diederik van der Boor
|
f10b5d23c8
|
Merge pull request #186 from gilgamezh/allow_extra_manager
Allow to set a 'extra' custom manager withut override the default
|
2016-01-03 10:15:41 +01:00 |
|
|
Diederik van der Boor
|
0df80488cb
|
Merge pull request #178 from jonashaag/patch-1
Test Django 1.8 with Python 3.5
|
2016-01-03 10:13:48 +01:00 |
|
|
Diederik van der Boor
|
999775c2d5
|
Merge pull request #170 from hobarrera/django19
Django19
|
2015-12-16 15:57:29 +01:00 |
|
|
Diederik van der Boor
|
6a86a5ce91
|
Merge pull request #165 from fusionbox/django-1.9
Django 1.9 Fixes
|
2015-10-20 16:40:57 +02:00 |
|
|
Diederik van der Boor
|
37d3f3ea1e
|
Merge pull request #167 from gonzalobustos/master
add spanish translation
|
2015-10-13 11:48:55 +02:00 |
|
|
Diederik van der Boor
|
fdf905d91b
|
Merge pull request #156 from svleeuwen/patch-1
Fix Pickle exception when polymorphic model is cached
|
2015-10-01 14:02:12 +02:00 |
|
|
Diederik van der Boor
|
f4898c305a
|
Merge pull request #159 from ixc/object-does-not-exist
Raise Http404 if object does not exist.
|
2015-10-01 11:47:20 +02:00 |
|
|
Diederik van der Boor
|
670b2be79c
|
Merge pull request #162 from jonashaag/build
Simplify tox.ini, add more configurations to .travis.yml
|
2015-09-30 17:39:00 +02:00 |
|
|
Diederik van der Boor
|
570e440477
|
Merge pull request #139 from martinmaillard/custom-admin-site
Use parent admin site class for child admin site
|
2015-08-04 16:11:05 +02:00 |
|
|
Diederik van der Boor
|
f1a9181551
|
Merge pull request #149 from kelseyq/master
add base_model declaration to child models in admin docs example (docfix)
|
2015-08-04 11:56:20 +02:00 |
|
|
Diederik van der Boor
|
640461216b
|
Merge pull request #127 from warrd/master
Issue with related_name in polymorphic_ctype field
|
2015-04-08 13:40:28 +02:00 |
|
|
Diederik van der Boor
|
9efc5cfcb2
|
Merge pull request #124 from benkonrath/fix-admin-500-error
Don't remove '/' from id when it's not in the path
|
2015-04-08 13:35:25 +02:00 |
|
|
Diederik van der Boor
|
2b78b92cc6
|
Merge pull request #121 from luisza/master
Fixed preserved filter for django 1.7
|
2015-04-08 13:25:17 +02:00 |
|
|
Diederik van der Boor
|
c947c3dec1
|
Merge pull request #119 from theatlantic/child-model-custom-pk-bug
Bug with queryset results on base model where child model has a custom primary key
|
2015-04-08 13:09:35 +02:00 |
|
|
Diederik van der Boor
|
d16d989e91
|
Merge pull request #118 from theatlantic/_default_manager-instance-fix
Set _default_manager directly on model_cls; don't use add_to_class()
|
2015-04-08 13:06:12 +02:00 |
|
|
Diederik van der Boor
|
7edafcfab8
|
Merge pull request #117 from ellmetha/master
Django 1.8 alpha support
|
2015-02-23 12:07:33 +01:00 |
|
|
Diederik van der Boor
|
261e382556
|
Merge pull request #67 from hottwaj/parent_link_support
parent_link and related_name support for inheritance fields
|
2014-12-30 13:34:16 +01:00 |
|
|
Diederik van der Boor
|
e9e4719fd3
|
Merge pull request #106 from njamaleddine/master
Updated README.rst
|
2014-09-29 11:44:41 +02:00 |
|
|
Diederik van der Boor
|
84791daf47
|
Merge pull request #99 from benkonrath/admin_class_permissions
Use admin class function to check permissions.
|
2014-09-22 16:03:55 +02:00 |
|
|
Diederik van der Boor
|
ea160669cf
|
Merge pull request #91 from mlsen/master
Django 1.8 compatibility
|
2014-09-22 14:51:03 +02:00 |
|