Commit Graph
21 Commits
Author SHA1 Message Date
Chris Glass 9c5c6c5136 Made the version number logic saner 2013-04-10 14:09:46 +02:00
Chris Glass 62d97f29b1 Merge pull request #30 from vdboor/cleanup_for_15
Cleanup before porting to Django 1.5
2013-04-05 03:09:42 -07:00
Chris Glass 33c3efbfbe Merge pull request #29 from julianwachholz/master
django.conf.urls.defaults is deprecated
2013-04-05 01:23:46 -07:00
Chris Glass 1d42927382 Bumped version in setup.py. 2013-03-25 10:11:09 +01:00
Chris Glass 2aadab6038 Added Adam to AUTHORS. Thanks a lot! 2013-03-25 10:07:50 +01:00
Chris Glass ced37a4872 Merge pull request #26 from floppya/update-gitignore
Ignore egg-info
2013-03-25 02:05:00 -07:00
Chris Glass 30172d3110 Merge pull request #24 from onepercentclub/port-regression-doctest-to-unit-test
Port regression doctest to unit test
2013-03-25 02:04:07 -07:00
Chris Glass 60c1d43332 Merge pull request #23 from onepercentclub/update-urls
Update urls
2013-03-25 02:03:12 -07:00
Chris Glass 272673f7c3 Merge pull request #22 from onepercentclub/add-travis-config
Add travis config.
2013-03-24 05:17:30 -07:00
Chris Glass 7cb733af72 Added Ben to AUTHORS. Thanks a lot! 2013-03-18 21:10:11 +01:00
Chris Glass 758eb577e4 Merge pull request #20 from onepercentclub/add-tox-config
Add tox config
2013-03-18 13:09:07 -07:00
Chris Glass 6b7edd06a6 Merge pull request #21 from vdboor/master
Remove unused load statements in add_type_form.html
2013-03-18 07:37:13 -07:00
Chris Glass 51b789cdc6 Point release fixes a merge error. 2013-02-28 11:27:51 +01:00
Chris Glass c1d00ed5c1 Merge branch 'master' of github.com:chrisglass/django_polymorphic 2013-02-28 11:26:44 +01:00
Chris Glass 72e1a144c1 Bumped setup.py version, Changes, for 0.3 release 2013-02-28 11:22:31 +01:00
Chris Glass 2c1c5d7630 Merge pull request #12 from vdboor/master
Avoid SQL query in pre_save_polymorphic()
2013-02-24 05:07:07 -08:00
Chris Glass c22e50662d Merge branch 'install-admin-templates' of https://github.com/onepercentclub/django_polymorphic into onepercentclub-install-admin-templates
Conflicts:
	MANIFEST.in
2013-02-24 14:04:31 +01:00
Chris Glass 183d69ae87 Merge pull request #14 from thenewguy/master
remove trailing slash
2013-01-31 12:45:32 -08:00
Chris Glass 28b8885236 Merge pull request #10 from vdboor/master
Polymorphic admin interface
2012-08-06 01:39:08 -07:00
Chris Glass db4cc4dc3b Merge pull request #5 from ojii/patch-1
Explicit is better than implicit
2012-01-09 07:48:57 -08:00
Chris Glass 11daac4fef Merge pull request #3 from mbrochh/dont_use_attrs
Not using attrs when getting the first user defined manager.
2011-12-20 10:53:00 -08:00