Commit graph

389 commits

Author SHA1 Message Date
Corey Oordt
87f985992b Version bump to 1.3b1 2015-06-09 15:20:09 -05:00
Corey Oordt
69bf632a03 small fixes in some fields 2015-06-09 15:19:36 -05:00
Jose Soares
678e84504d [-] Missed some migrations 2015-06-09 15:17:48 -05:00
Jose Soares
4f51f96d5c [-] Fixed some tree editor and generic collection issues 2015-06-09 15:17:48 -05:00
Jose Soares
e0676d4f25 [-] Migrations updates 2015-06-09 15:17:48 -05:00
Jose Soares
a6443ada85 [-] 1.6/1.7/1.8 compatiable changes (WIP) 2015-06-09 15:17:48 -05:00
Brent O'Connor
74cc9f8346 Fixed the RemovedInDjango19Warning deprecation warning 2015-06-09 15:17:47 -05:00
Brent O'Connor
70abc1c807 Fixed tests so they run under Django 1.7 2015-06-09 15:17:47 -05:00
Brent O'Connor
9822ba8cbb Added the fields property with it set to '__all__' in order to not get the RemovedInDjango18Warning 2015-06-09 15:17:47 -05:00
Brent O'Connor
58abcc7401 Renamed get_query_set to get_queryset to get Django categories to work in Django 1.7. I'm not sure of a good way to make this work in Django 1.6. 2015-06-09 15:17:47 -05:00
Corey Oordt
77d0903d59 Merge pull request #93 from webu/feature/i18n_french
i18n: add French translation
2015-05-27 13:30:26 -05:00
Olivier Le Brouster
ab31c29350 i18n: add french translation 2015-05-19 17:02:58 +02:00
Corey Oordt
b75f11213c Version 1.2.3: Added a new way to register models manually 2015-05-05 18:05:37 -05:00
Corey Oordt
a4c9e70950 Merge pull request #78 from mirzadelic/master
bootstrap class on table (important for django-suit)
2013-11-24 14:41:56 -08:00
Mirza Delic
f02e06ea99 bootstrap class on table (important for django-suit) 2013-10-20 21:33:59 +02:00
Corey Oordt
2257f7d76d Merge pull request #77 from s1n4/unicode-slug
Use unicode-slugify to fix unicode slug issue
2013-09-09 05:28:13 -07:00
Sina Samavati
588815acc3 Update requirements 2013-09-07 13:16:37 +04:30
Sina Samavati
703a036bf5 Fix unicode slug issue 2013-09-07 13:16:25 +04:30
Corey Oordt
6af6d815e2 Merge pull request #76 from ikresoft/master
Using custom model in CategoryDetailView
2013-08-01 12:25:25 -07:00
Enver Bisevac
451af0e054 Using custom model in CategoryDetailView 2013-07-29 15:24:11 +02:00
Corey Oordt
a254fe9087 Version 1.2.2 2013-07-07 15:54:40 -05:00
Corey Oordt
b22da41567 Merge pull request #71 from nephila/feature/i18n_it
Italian localization
2013-06-21 05:37:57 -07:00
Iacopo Spalletti
6c3d305c11 Italian localization 2013-06-05 12:50:17 +02:00
Corey Oordt
7096d8a3eb Fixing migration script for adding fields 2013-05-20 17:42:03 -05:00
Corey Oordt
a232b8e6e3 Version 1.2.1: Fixed i18n and failing test in Django 1.4 2013-03-22 06:25:52 -05:00
Corey Oordt
b069bcf316 Merge pull request #68 from 9gix/master
Load I18N templatetags
2013-03-22 04:19:39 -07:00
Eugene
1d01494ff5 Load I18N templatetags 2013-03-21 02:24:53 +08:00
Corey Oordt
0bb8af6351 Merge branch '1.2' 2013-03-20 06:59:27 -05:00
Corey Oordt
63eefeeaf1 Version bump 1.2 2013-03-20 06:59:15 -05:00
Corey Oordt
c6f122d724 Fixing a few minor Django 1.5 incompatibilities 2013-03-20 06:54:34 -05:00
Corey Oordt
8ce56e8190 Fix for Django 1.5: {% url %} parameter needs to be quoted 2013-03-20 06:54:34 -05:00
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