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
658 commits 7 branches 66 tags 3.4 MiB
Commit graph

658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Orestes Sanchez
8df7b65547 Merge branch 'bug/testing-1.6' of github.com:miceno/django-categories into bug/testing-1.6 
Conflicts:
	.travis.yml
 2015-08-12 18:31:15 +02:00
Orestes Sanchez
3a238b17b5 Run the test with a different configuration 2015-08-12 18:28:24 +02:00
Orestes Sanchez
8cb979c096 Run the test with a different configuration 2015-08-12 18:25:56 +02:00
Orestes Sanchez
c7344f6b60 Use singleton registry to import register_fk and register_m2m since they are members on Registry class. 2015-08-12 17:11:08 +02:00
Corey Oordt
e40b240e24 Merge branch 'dev' 2015-06-09 15:24:25 -05:00
Corey Oordt
cf79d1ba7a Version bump to 1.3 2015-06-09 15:23:43 -05:00
Corey Oordt
addb0e410f defaulting the url prefix to / if it can't find the category tree 2015-06-09 15:23:43 -05:00
Corey Oordt
7f8e303a95 Version 1.3b8: Fixes some migrations 2015-06-09 15:23:43 -05:00
Corey Oordt
02780ba2a1 Version 1.3b7 - fixes registration when there is no app config 2015-06-09 15:23:43 -05:00
Corey Oordt
e841de7aca Version bump to 1.3b6 2015-06-09 15:23:43 -05:00
Corey Oordt
dc99eac19c Fixes potential double imports in dev and test servers 2015-06-09 15:23:43 -05:00
Corey Oordt
8dda6ec87b Fixed a potential issue with double-loading of the dev server 2015-06-09 15:23:43 -05:00
Corey Oordt
7cc0c9987e Version bump to 1.3b5 2015-06-09 15:23:43 -05:00
Corey Oordt
acff7f02a3 Dramatically refactored how migrations are performed to work with Django 1.7 2015-06-09 15:21:38 -05:00
Corey Oordt
28ef4d5565 Updates the existing migration to south_migrations 2015-06-09 15:20:09 -05:00
Corey Oordt
7c73bd51c4 Removing outdated settings and updating outdated files 2015-06-09 15:20:09 -05:00
Corey Oordt
6eb306d715 Version bump to 1.3b4 2015-06-09 15:20:09 -05:00
Corey Oordt
dd60aebf28 Fixes a conflict with treebeard. They stole the name admin_tree_list 2015-06-09 15:20:09 -05:00
Corey Oordt
c6b7cdd520 Changing migration dependency of contenttypes to 0001_initial for support for Django 1.7 2015-06-09 15:20:09 -05:00
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