Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
527 Commits
1 Branch
0 Tags
1.4 MiB
Commit Graph

527 Commits (c76cc663e07a043e77316faa3e5814cdbb73ad88)

Author SHA1 Message Date
Diederik van der Boor c79bb09b87 update AUTHORS 2014-09-22 16:01:07 +02:00
Diederik van der Boor 981614e5c6 Merge branch 'django_1.7_support' of https://github.com/g3rd/django_polymorphic 
Conflicts:
	docs/managers.rst
	polymorphic/admin.py
	polymorphic/manager.py
	polymorphic/tests.py
	runtests.py
 2014-09-22 15:42:35 +02:00
Diederik van der Boor 263e569f4e modernize runtests to fix app loading 2014-09-22 15:15:17 +02:00
Diederik van der Boor ff6b09e7c7 admin: split get_queryset() / queryset() methods. 
avoid calling loops due to some inherited classes
 2014-09-22 15:14:32 +02:00
Diederik van der Boor 30eb88fbdb Travis and tox: add Django 1.7 2014-09-22 15:01:49 +02:00
Diederik van der Boor be54fd9085 docs: use new get_queryset() notation too 2014-09-22 15:00:52 +02:00
Diederik van der Boor cf6d2a4a41 Replace get_query_set with assignment. 
Avoid calling the super class by accident, potentially causing loops.
Follow the django-mptt approach here.
 2014-09-22 15:00:29 +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
Chad Shryock cc53b3003e Remove exception. 2014-09-17 08:30:12 -04:00
Chad Shryock b9654b7138 Missing return. 2014-09-17 08:26:28 -04:00
Chad Shryock 112808d057 Django 1.7 no run on Python 2.6. Exclude tests. 2014-09-16 22:38:56 -04:00
Chad Shryock d0fe45242b Okay. Now I think Travis will run D1.7 tests! 2014-09-16 22:35:12 -04:00
Chad Shryock 35debe3798 Test Django 1.7! 2014-09-16 22:30:27 -04:00
Chad Shryock 4dff05405b Updated the docs to be Django 1.7 friendly 2014-09-16 22:17:06 -04:00
Chad Shryock 734752c2e7 Django 1.7 upgrades 2014-09-16 22:11:13 -04:00
Chad Shryock e84a2072fc Upgraded script to be Django 1.7 friendly 2014-09-16 22:10:48 -04:00
Ben Konrath 6aa9d7cc3a Use admin class function to check permissions. 2014-09-11 15:18:40 +02:00
Chad Shryock af4843e54b Cleared up the Django 1.8 Warning messages. 2014-09-10 23:13:51 -04:00
Diederik van der Boor 25b720c43c Merge pull request #94 from benkonrath/consistent-admin-labels 
Use consistent labels in admin
 2014-08-12 09:35:01 +02:00
Ben Konrath ec5ce49d81 Use consistent labels in admin. 2014-08-04 15:05:13 +02:00
Diederik van der Boor a2f12177ad changelog: mention the backwards incompatibility that #93 introduces. 
This at least affects one of own projects.
 2014-07-29 14:40:32 +02:00
Diederik van der Boor 14df8c529e Move the get_permission_codename import to the main code. 
cc #93
 2014-07-29 12:15:09 +02:00
Diederik van der Boor bbb1cd068a Merge pull request #93 from Skeptiker88/master 
added permission check for all child types
 2014-07-29 12:13:45 +02:00
Kevin Armenat 029bb2ae1a added django < 1.6 compatibilty for permission codename generation 2014-07-29 11:15:38 +02:00
Kevin Armenat 6ce390f777 added permission check for all child types 2014-07-29 09:47:23 +02:00
Diederik van der Boor 1490af29b0 Merge pull request #92 from davesque/patch-1 
Typo in documentation
 2014-07-28 11:38:19 +02:00
David Sanders 56949065b2 Typo in documentation 2014-07-27 09:54:28 -06:00
Marius Lueck d755d257ef Changed super call of get_queryset to queryset 2014-07-25 22:55:58 +02:00
Marius Lueck fb1795ad12 Fixed compatibility with django 1.8 2014-07-25 11:48:07 +02:00
Diederik van der Boor 831075c3c7 bump version to 0.5.6 2014-07-21 11:42:26 +02:00
Diederik van der Boor 656a8580e4 Changelog: mention fix by @jrief 2014-07-21 11:41:46 +02:00
Diederik van der Boor e9b7c57e31 Merge pull request #88 from jrief/fix-mix-polymorphic-with-parler 
django-polymorphic does not work with django-parler
 2014-07-21 11:38:56 +02:00
Jacob Rief ca3f2f8fea --use-mirrors is deprecated 2014-07-18 18:28:23 +02:00
Jacob Rief 62e7940c33 Fixed: adding polymoric model with django-parler did not work 2014-07-18 18:26:51 +02:00
Diederik van der Boor d8b40167d3 Mention the improvements of #87 in the changelog and documentation too. 2014-07-08 17:18:07 +02:00
Diederik van der Boor 2e2728e2c6 Merge pull request #87 from krayevidi/master 
Adds pk_regex attr in PolymorphicParentModelAdmin
 2014-07-08 17:14:54 +02:00
Andrew d8d6f07f71 Adds pk_regex attr in PolymorphicParentModelAdmin 2014-07-08 18:05:04 +03:00
Diederik van der Boor ba941165ab set date in changelog as well 2014-04-29 14:13:10 +02:00
Diederik van der Boor 8a548ca829 bump version to 0.5.5 2014-04-29 14:11:58 +02:00
Diederik van der Boor b9d7e9f234 Improved description of test_proxy_get_real_instance_class unit test 
Camp life rule: leave things better then you found them.
 2014-04-29 14:07:33 +02:00
Diederik van der Boor 5499901db7 Merge branch 'jf/polymorphic' of https://github.com/gnulnx/django_polymorphic into gnulnx-jf/polymorphic 2014-04-29 14:04:53 +02:00
John Furr 8687e135a3 Test that proxy models derived from PolyMorphicBase classes 
can call get_real_instance() and get_real_instance_class()

Includes:
def test_proxy_get_real_instance_class(self):
 2014-04-29 07:35:27 -04:00
Diederik van der Boor 4af7f49908 Added changelog entry for PR #77 2014-04-29 11:58:49 +02:00
Diederik van der Boor adf0be6579 Merge pull request #77 from gnulnx/jf/polymorphic 
Fix proposal for get_real_instance_class() for proxy models
 2014-04-29 11:56:15 +02:00
John Furr f85ebdd9e6 Fix get_real_instance_class for proxy models 2014-04-28 11:32:30 -04:00
Diederik van der Boor 36d1cc2961 Merge pull request #75 from vail130/master 
Fixed tab spacing in admin.rst
 2014-04-22 13:49:42 +02:00
Vail Gold d901524e75 Fixed tab spacing in admin.rst 2014-04-22 07:39:58 -04:00
Diederik van der Boor be8d7d016f Merge pull request #74 from vail130/master 
Added to admin docs how to add polymorphic child model as inline.
 2014-04-22 11:17:04 +02:00
Vail Gold df178dbb44 Added to admin docs how to add polymorphic child model as inline. 2014-04-19 14:28:08 -04:00
Diederik van der Boor bf64b111c4 Merge pull request #73 from utapyngo/master 
Fixed typo: CopntentType
 2014-04-18 14:33:04 +02:00