Commit graph

605 commits

Author SHA1 Message Date
Carl Meyer
6a01f3389a Add spaces in changelog for consistency with older sections. 2017-01-11 15:35:51 -08:00
Romain Garrigues
25b6e09296 Merge pull request #253 from romgar/ticket_251
Add fix + tests for abstract manager inheritance issue with StatusModel. Fixes #251.
2017-01-11 12:44:04 +00:00
Romain G
03fd2fb0a0 Add missing newline 2017-01-11 12:22:59 +00:00
Romain G
7ae505733e Update CHANGES 2017-01-11 12:21:42 +00:00
Romain G
3100d47931 Merge branch 'master' into ticket_251 2017-01-11 12:17:45 +00:00
Romain Garrigues
6c4f515540 Merge pull request #252 from browniebroke/doc/changelog
Update changelog about 2 recent pull requests
2017-01-10 14:18:48 +00:00
Romain G
63e5c59c66 Simplify test models + make it compatible for old Django versions 2017-01-09 19:16:09 +00:00
Romain G
679af01f26 Add fix + tests for abstract manager inheritance issue with StatusModel 2017-01-09 19:02:59 +00:00
Bruno Alla
0787a098fd Update changelog about 2 recent pull requests
https://github.com/carljm/django-model-utils/pull/239
https://github.com/carljm/django-model-utils/pull/240
2017-01-09 13:29:07 +00:00
Carl Meyer
f56e26b5a9 Merge pull request #250 from browniebroke/bugfix/extend-queryset
Fix issue when extend QuerySet and Manager - fixes #249
2017-01-08 10:06:27 -07:00
Bruno Alla
abd163f297 Remove extra backtick 2017-01-08 11:18:31 +00:00
Bruno Alla
ecf80381de Reword changes, use GH- convention for tickets and PR 2017-01-07 14:20:00 +00:00
Bruno Alla
336ac14144 Add changes at the top of the Changelog 2017-01-05 18:32:33 +00:00
Bruno Alla
2af54972eb Revert unrelated change regarding related fields
Remove attribute use_for_related_fields in SoftDeletableManagerMixin.
2017-01-05 18:32:13 +00:00
Bruno Alla
063332643d Split SoftDeletableQuerySet/Manager into Mixin 2017-01-05 14:40:03 +00:00
Bruno Alla
0efaad1218 Fix issue when extend QuerySet and Manager - fixes #249 2017-01-05 14:29:35 +00:00
Carl Meyer
0febeae9ee Merge pull request #240 from browniebroke/feature/soft-delete-purge
Ability to purge from db a SoftDeletableModel
2016-11-28 16:02:12 -08:00
Bruno Alla
4311e24e98 Add soft parameter to delete method instead of new one 2016-11-28 23:45:48 +00:00
Bruno Alla
6efab67b79 Merge remote-tracking branch 'carljm/master' into feature/soft-delete-purge
# Conflicts:
#	model_utils/tests/tests.py
2016-11-28 23:31:16 +00:00
Romain Garrigues
df57fdba92 Merge pull request #246 from romgar/ticket_244_split_tests_in_several_files
Separate tests in small files. Fixes #244 (at least the test splitting part).
2016-11-27 13:50:54 +00:00
romgar
eb41dc0ea0 Prevent test manual import for Django 1.6+. No impact on Django 1.7/1.8, duplicating all test runs in Django 1.6 2016-11-24 21:31:55 +00:00
romgar
2a9c199819 Remove test duplication related to TestCase inheritance in different files 2016-11-24 21:31:23 +00:00
romgar
6fefc53c58 Separate tests in small files, making it easier to edit/add new ones/not conflict on different merge requests 2016-11-23 23:49:53 +00:00
Carl Meyer
68bc61e825 Update changelog and AUTHORS. 2016-11-21 11:36:25 -08:00
Carl Meyer
94870b2510 Merge pull request #242 from romgar/ticket_241_double_monitor_field_recursion_error
Tests to demonstrate recursion error with double MonitorField and defer()/only() usage
2016-11-21 11:13:31 -08:00
Carl Meyer
9d39d46115 Merge pull request #243 from romgar/ticket_206_timestamp_resolution_issue_on_windows
Update tests to use freezegun to avoid time resolution issues on Windows
2016-11-21 11:08:56 -08:00
romgar
8ecf75144b Update tests to use freezegun to avoid time resolution issues on Windows 2016-11-20 22:08:07 +00:00
romgar
e2440a6872 Add tests to prevent regression in MonitorField behaviour if we filter out deferred fields in _save_initial 2016-11-19 12:08:48 +00:00
romgar
93dd940a5d Remove defered fields in _save_initial only for Django 1.10+ 2016-11-18 23:31:45 +00:00
romgar
2455c983fc Restore initial indentation 2016-11-18 23:12:39 +00:00
romgar
72158f1820 Avoid to directly initialise a monitored field if defered to avoid recursion issue 2016-11-18 23:11:23 +00:00
romgar
e9d57e60fe Add test to demonstrate issue #241 2016-11-18 00:24:57 +00:00
Bruno Alla
ff4afd7288 Add a purge_from_db to SoftDeletableModel 2016-11-17 08:56:59 +00:00
Carl Meyer
59b5fa24f7 Merge pull request #239 from browniebroke/bugfix/softdelete-multi-db
SoftDeletableModel: use correct DB connection
2016-11-09 13:00:24 -07:00
Bruno Alla
516c457747 SoftDeletableModel: use correct DB connection
When deleting a SoftDeletableModel instance, the `using` parameter
should be passed down to the `save()` method.

https://docs.djangoproject.com/en/1.10/topics/db/multi-db/#selecting-a-d
atabase-for-save
2016-11-09 19:49:31 +00:00
Carl Meyer
e1a3cee4d3 Bump version to 2.6.1.a1. 2016-09-19 08:05:40 -06:00
Carl Meyer
a9a8451fc9 Bump version to 2.6. 2016-09-19 08:03:42 -06:00
Carl Meyer
f941ec9db3 Merge pull request #236 from radowit/soft-deletable-model
Add SoftDeletableModel
2016-09-12 10:33:03 -06:00
Radosław Ganczarek
9e90dde2e8 Add SoftDeletableModel 2016-09-12 15:11:34 +02:00
Carl Meyer
9231617d39 Merge pull request #235 from st4lk/dj110-filefield
Support Django 1.10 deferred FileField with FieldTracker
2016-09-08 09:22:40 -06:00
Alexey Evseev
9ee6065f81 Support Django 1.10 deferred FileField with FieldTracker 2016-09-08 18:00:48 +03:00
Carl Meyer
e3c53e1204 Merge pull request #233 from jarekwg/upgrade/dj110
Django 1.10 support for FieldTracker
2016-08-17 21:18:57 -06:00
Jarek Glowacki
bc7d820724 Keep trunk tests in allowed_failures 2016-08-18 12:55:47 +10:00
Jarek Glowacki
bbc076429a Nicer solution 2016-08-17 11:48:27 +10:00
Jarek Glowacki
922c49770e Django 1.10 support for FieldTracker 2016-08-15 12:24:07 +10:00
Carl Meyer
d212eb7ca2 Fixes #231 -- clarify that requirements.txt contains dev dependencies. 2016-08-10 07:07:55 -06:00
Carl Meyer
65b0823e16 Bump version to 2.5.3a1. 2016-08-09 15:09:11 -06:00
Carl Meyer
da8e8cf3c9 Include runtests.py in sdist; bump version to 2.5.2. 2016-08-09 15:06:49 -06:00
Carl Meyer
8619b3d270 Add twine to requirements. 2016-08-03 08:44:42 -06:00
Carl Meyer
34e4b6880f Bump version to 2.5.2a1. 2016-08-03 08:44:29 -06:00