Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
358 commits 7 branches 66 tags 3.4 MiB
Commit graph

358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Corey Oordt
0be7d5e41f Fixing a merge conflict 2013-03-20 06:54:34 -05:00
Corey Oordt
7232937014 Updating the admin template to support the latest django admin code 2013-03-20 06:54:34 -05:00
Corey Oordt
073b09a7b3 Added admin settings documentation 2013-03-20 06:54:34 -05:00
winniehell
89c7333306 i18n 2013-03-20 06:54:34 -05:00
winniehell
591680a24e german translation 2013-03-20 06:54:34 -05:00
Corey Oordt
0f2f24d2ce Added customization of admin fieldsets 2013-03-20 06:54:34 -05:00
Corey Oordt
4698f32fc0 Merge pull request #65 from yohanboniface/1.5 
1.5 compat: remove adminmedia templatetag calls
 2013-03-19 06:18:38 -07:00
Corey Oordt
6a9c2659d2 Merge pull request #66 from epicserve/grappelli_django_1.5 
Made it so django-categories works with Django 1.5 and Grappelli 2.4.4
 2013-03-19 06:18:12 -07:00
Brent O'Connor
69565161ff Made it so django-categories works with Django 1.5 and Grappelli 2.4.4 2013-03-18 12:01:10 -07:00
Yohan Boniface
1d7463db2a 1.5 compat: remove adminmedia templatetag calls 
See https://docs.djangoproject.com/en/1.5/releases/1.5/#miscellaneous
 2013-03-01 00:35:33 +01:00
Corey Oordt
46f28a3703 Merge pull request #64 from iepathos/master 
Fixed NoneType error in templatetags
 2013-02-27 17:12:51 -08:00
Corey Oordt
bf751dcb5d Merge pull request #63 from iepathos/patch-1 
Update categories/templatetags/category_tags.py
 2013-02-27 17:12:21 -08:00
Glen
fb6fb4e6f5 Update categories/templatetags/category_tags.py 
Added NoneType check to display_drilldown_as_ul on line 188 to fix NoneType error.
 2013-02-24 23:16:53 -08:00
Glen
59c3e27134 Update categories/templatetags/category_tags.py 
Added str() to line 49 to fix an error where .strip("'\"") in get_category is getting called on a non-string category_string.
 2013-02-24 14:05:07 -08:00
Glen
bdb1d68bea Update categories/templatetags/category_tags.py 
Added str() to line 49 to fix an error where .strip("'\"") in get_category is getting called on a non-string category_string.
 2013-02-24 14:03:48 -08:00
Corey Oordt
e8b4a50e28 Merge pull request #58 from epicserve/master 
Fixed an exception error
 2012-10-11 04:45:24 -07:00
Brent O'Connor
f55f131655 Fixed an exception error 
Fixed an exception error that occurs when an empty form is submitted for apps that are created using categories.base.CategoryBase.
 2012-10-10 10:23:17 -07:00
Corey Oordt
96748afeb4 Version bump to 1.1.4 2012-08-28 19:41:58 -05:00
Corey Oordt
fbc21bcc39 Merge pull request #50 from epicserve/grappelli 
Made updates so django-categories works with django-grappelli
 2012-08-28 17:38:59 -07:00
Corey Oordt
535144f4b7 Merge branch '1.1.3' 2012-08-28 19:22:57 -05:00
Corey Oordt
123459eec1 To satisfy a very demanding and owly jsoa, I removed an unused variable. :P 2012-08-28 08:16:00 -05:00
Corey Oordt
0d167164a1 Updating the signal registration to check for south first and fail silently 2012-08-28 08:00:29 -05:00
Corey Oordt
2b4512beae Version bump to 1.1.3 2012-08-28 06:57:38 -05:00
Corey Oordt
c522ae6d96 Moved the registration of the signal to models.py where it will get executed 2012-08-28 06:57:22 -05:00
Corey Oordt
e41623b4ad Refactored the migration script to use the syncdb signal. The post_migrate signal only fires for south-managed apps, so it isn't as useful. 2012-08-28 06:56:55 -05:00
Brent O'Connor
8a621e9d14 Simplified the assignment of the IS_GRAPPELLI_INSTALLED variable 2012-08-27 16:56:12 -07:00
Brent O'Connor
ff6043d2b3 Updated the code so it will work with or without Grappelli installed 2012-08-27 09:45:26 -07:00
Brent O'Connor
85fb2083bb Made updates so django-categories works with django-grappelli 2012-08-24 13:57:48 -07:00
Corey Oordt
a92ab30f9c Merge branch '1.1.2' 2012-08-18 13:07:46 -04:00
Corey Oordt
18ab6a49a1 Version bump to 1.1.2 2012-08-18 13:07:04 -04:00
Corey Oordt
0467d30434 Can't use the m2m tests because it conflicts with the fk tests. 2012-08-18 13:06:46 -04:00
Corey Oordt
8be19c893a Placing some south imports into try blocks. 2012-08-18 13:04:58 -04:00
Corey Oordt
7fa53a7003 Capitalizing the various REGISTRY settings 2012-08-18 13:02:15 -04:00
Corey Oordt
d63828ebf6 Refactored the registration of fields from __init__ to a new module. 
It also makes it easier to test.
 2012-08-18 12:53:37 -04:00
Corey Oordt
e0212bb030 Version bump to 1.1.1 final! 2012-08-08 13:43:15 -04:00
Corey Oordt
7d3485309d Version bump to 1.1.1 2012-08-08 11:21:29 -04:00
Corey Oordt
d33d9f9c55 Fixed a bug in the compatibility layer 2012-08-08 11:21:28 -04:00
Jose Soares
8f202fa9e3 Minor tweak to tempatetag tests 2012-07-14 12:59:58 -04:00
Jose Soares
64936c81ce TravisCI stuff 2012-07-14 11:03:15 -04:00
Jose Soares
5f1b280fa4 Added travisci 2012-07-14 10:56:01 -04:00
Corey Oordt
213a208a23 Merge branch '1.1' 2012-07-12 19:32:10 -04:00
Corey Oordt
e588f33c99 Updated read me and version bump to 1.1 2012-07-12 19:31:47 -04:00
Corey Oordt
234bc9f963 Updated and rendered docs 2012-07-12 19:31:27 -04:00
Corey Oordt
53a203aad2 Fixed an incorrect include in the example 2012-07-12 19:28:39 -04:00
Corey Oordt
3a71754a6a Template tags now work with any derivative of CategoryBase. Recognizes the "using" param to specify the model to use. 2012-07-12 19:28:11 -04:00
Corey Oordt
86d9b376e1 Fixed some Django 1.4 cosmetic issues 2012-07-12 19:26:45 -04:00
Corey Oordt
0d254eca63 pep8 cleanup 2012-07-12 19:24:55 -04:00
Corey Oordt
fa470df0a7 Update to template tags to include ways to retrieve an object from a model other than Category. 2012-07-11 07:05:47 -04:00
Corey Oordt
2a501a39a2 Fixes Pull Request #37 Adds notification in the readme regarding issue with South version 0.7.4 2012-07-02 07:53:53 -05:00
Corey Oordt
b4d07bfb9e Updated the credits to add Iacopo Spalletti 2012-07-02 07:49:14 -05:00