522 commits

Author	SHA1	Message	Date
Dirk Eschler	413ee22c61	Merge branch '0.12.x'	2018-01-26 10:24:22 +01:00
Dirk Eschler	90e0a3630a	Prepared 0.12.2 release.	2018-01-26 10:23:12 +01:00
AbdolHosein	fab3bd7cc7	Removes extra blank lines	2018-01-02 14:25:11 +03:30
AbdolHosein	dbb372137b	Removes unwanted spaces	2018-01-02 14:17:02 +03:30
AbdolHosein	a1ae1d1aa3	Fixes the fail issue on test progress	2018-01-02 14:11:16 +03:30
AbdolHosein	631347da74	Patches the issue with the Django 2.0 release on. Fixes #436	2018-01-02 13:38:23 +03:30
Dirk Eschler	00fc7f1804	Merge pull request #398 from btoueg/patch-1 ... Fix order_by with expression	2017-12-20 21:53:05 +01:00
Dirk Eschler	49836c210d	Satisfied flake8.	2017-11-24 15:14:40 +01:00
Dirk Eschler	0c50dffefe	Merge pull request #431 from Schnouki/fix-m2m-and-inherited-managers ... Fix M2M and inherited managers	2017-11-24 14:38:37 +01:00
Ben Lopatin	2438300915	Add docstring documentation for utils.unique	2017-10-28 20:56:49 -04:00
Thomas Jost	22423047e9	Correctly patch all managers in Django 1.10+ ... Fixes #389 and #413.	2017-09-26 16:29:20 +02:00
Thomas Jost	019d116434	Add (failing) tests for inherited managers and M2M relationships ... With several level of inheritance, custom managers with custom querysets, and a ManyToMany field with an explicit intermediary table. This reproduces bugs #389 and #413.	2017-09-26 16:27:22 +02:00
Florian Demmer	4ec3a4b4b0	Fix import with django < 1.7	2017-09-18 01:23:31 +02:00
Florian Demmer	8457782380	Get related model from field's path_info ... related_model is a cached property, that contains a string instead of the model eg. when overriding the default User model.	2017-09-18 01:23:06 +02:00
Donald Harvey	f64dd56002	Support django-nested-admin stacked inlines	2017-09-09 12:09:35 +01:00
Tocho Tochev	74929c2055	Fix reset of .select_related	2017-07-25 13:31:57 +03:00
Mariusz Felisiak	a7b484d10a	Used Meta.base_manager_name on model instead of Manager.use_for_related_fields.	2017-06-23 21:10:23 +02:00
Dirk Eschler	e28addcf45	Merge branch 'master' into remove-unused	2017-06-23 19:05:55 +02:00
Mariusz Felisiak	5f66a44649	Removed unused code. ... Unused since cc214e3c66.	2017-06-23 06:49:38 +02:00
Mariusz Felisiak	c93857c623	Used set() instead of direct assignment to the reverse side of a related set.	2017-06-22 22:20:06 +02:00
Mariusz Felisiak	b64ddf2e20	Used model attribute instead of deprecated ForeignObjectRel.to.	2017-06-22 22:15:37 +02:00
Mariusz Felisiak	7a823ea474	Added required on_delete attribute to OneToOneField and ForeignKey fields.	2017-06-22 22:03:07 +02:00
Benjamin Toueg	ff189d68f5	Fix .defer(None)	2017-06-01 17:21:39 +02:00
Benjamin Toueg	0b7d356f23	Fix .select_related(None)	2017-06-01 17:21:39 +02:00
Benjamin Toueg	60c632fc6a	Fix order_by with expression ... Fix #375	2017-06-01 17:20:06 +02:00
Dirk Eschler	dbb9becd09	Set empty MIGRATION_MODULES setting for Django 1.11. Should make the tests run again.	2017-04-13 12:05:38 +02:00
Dirk Eschler	46488f1abc	Handled import_models args change for Django 1.11.	2017-04-13 12:02:38 +02:00
Dirk Eschler	2c5fb88771	Merge pull request #371 from LeGast00n/master ... Works with collapsed admin elements	2017-04-08 10:38:17 +02:00
Dirk Eschler	5d31cbb76d	Merge pull request #406 from fvgoto/patch-1 ... FALLBACK_LANGUAGES['default'] needs to be tuple	2017-04-08 10:37:14 +02:00
Dirk Eschler	74e3f66ff4	Merge pull request #404 from helio-correia/wysiwyg-quill ... Modify javascript to also consider the div for using wysiwyg like Quill	2017-04-08 10:34:56 +02:00
Dirk Eschler	0dad9beefd	Prepared 0.12.1 release.	2017-04-05 14:03:25 +02:00
Florian Verdet	576fe159ed	settings: fix keep FALLBACK_LANGUAGES as tuple ... required to be tuple at: modeltranslation/utils.py#L117	2017-03-19 06:09:36 +01:00
Helio Correia	4b07119c30	Modify javascript to also consider the div for using wysiwyg like Quill	2017-03-08 12:00:23 +00:00
Dirk Eschler	85e26e3842	Removed superfluous can_import_settings check. The option has been removed in Django 1.11.	2017-02-22 14:17:27 +01:00
Dirk Eschler	257f59de97	Prepared 0.12 release.	2016-09-20 18:07:15 +02:00
Matthias Kestenholz	b6cc6888af	Remove the unsupported use-mirrors pip option ... Remove the duplicated make_option import Pin flake8's version to <3 as long as we are still supporting Python 2.6 Stop complaining (F999) about the assert Fix travis.py for now This will fail again as soon as Django 2.0 is released.	2016-09-14 12:35:58 +02:00
Primož Kerin	5c93fd6b7f	Make sync_translation_fields command Django 1.10 compatible	2016-09-14 12:35:58 +02:00
Jacek Tomaszewski	a7b5102c43	Fix deferred classes signal connection (close #379).	2016-08-19 21:23:45 +02:00
Jacek Tomaszewski	302c931fe0	Django 1.10 integration (ref #381)	2016-08-19 21:23:45 +02:00
Jacek Tomaszewski	2f227a45af	Fix values_list + annotate combo bug (close #374).	2016-06-01 19:02:30 +02:00
LAI	9fc4a44080	Works with collapsed admin elements	2016-05-13 10:01:57 +02:00
Matthias Kestenholz	dad7cc7ba6	Slightly reformat code to avoid flake8 errors ... These changes hopefully fix the Travis CI build.	2016-02-20 11:21:07 +01:00
Pavel Sutyrin	3f4d48dd5a	let register decorator return decorated class	2016-02-04 02:20:35 +03:00
Dirk Eschler	276ee5be8a	Prepared 0.11 release.	2016-01-31 20:03:11 +01:00
Dirk Eschler	9ca0bc47b3	Prepared 0.11rc2 release.	2015-12-15 13:42:17 +01:00
Jacek Tomaszewski	e50b0ce7a4	Try to fix custom manager in migrations (ref #330, #339, #350).	2015-12-13 15:47:08 +01:00
Dirk Eschler	a4b9f42d52	Changed version mapping so that rc is kept.	2015-12-07 10:47:32 +01:00
Dirk Eschler	27eccfda67	Prepared 0.11rc1 release.	2015-12-07 10:43:07 +01:00
Jacek Tomaszewski	caab290048	Fix travis for Python 3.5 adn 3.2; fix migrations for Django 1.9 (ref #349).	2015-12-07 00:23:17 +01:00
Jacek Tomaszewski	8320fc8a5a	Add Django 1.9 support (ref #349).	2015-12-06 18:48:17 +01:00