Carl Meyer
06dddbfa82
Use full name in AUTHORS.
2013-10-11 13:29:47 -06:00
Carl Meyer
1d3af52456
Update AUTHORS and changelog.
2013-10-11 13:25:37 -06:00
Carl Meyer
79ca819736
Merge branch 'fix-choices-deepcopy'
...
* fix-choices-deepcopy:
Added deepcopy test
Implemented __deepcopy__ to avoid infinite recursion in __getattr__ while deepcopying a Choices instance
2013-10-11 13:24:13 -06:00
Carl Meyer
3211c92a4d
Merge branch 'master' into fix-choices-deepcopy
...
* master: (23 commits)
only accepting iterables to the when field
adding 'when' parameter to MonitorField
Update AUTHORS and changelog.
Add test to verify get_subclass() on QuerySet
Refactor to make sure get_subclass() is on QuerySet
Fixed indexing into Choices so its useful.
Fix bug with child/grandchild select_subclasses in Django 1.6+; thanks Keryn Knight.
fixed code block
Bump version for dev.
Bump version for 1.5.0 release.
Add option-groups capability to Choices.
Add Changelog note about Choices equality/addition.
Added tests to improve coverage
Alphabetised authors
Removed redundant inequality method on Choices
Moved documentation for Choices field to the right place
Corrected typo
Added self to Authors file
Added equality methods to Choices objects, and overrode + for Choices for easy concatenation with other Choices and choice-like iterables. Also wrote tests for them, and extended the readme to reflect this
Fix typo noted by @silonov
...
Conflicts:
model_utils/choices.py
2013-10-11 13:23:56 -06:00
Carl Meyer
55ac3ddb3c
Merge pull request #85 from filipeximenes/master
...
Adding 'when' parameter to MonitorField
2013-10-11 12:02:26 -07:00
Filipe Ximenes
3d82ec89b4
only accepting iterables to the when field
2013-10-11 08:24:00 -03:00
Filipe Ximenes
e3450977bd
adding 'when' parameter to MonitorField
2013-10-11 00:08:38 -03:00
Carl Meyer
d7f7a54e77
Update AUTHORS and changelog.
2013-10-08 11:15:01 -06:00
Carl Meyer
12906a1ed6
Merge pull request #82 from tswicegood/fix-get_subclass
...
Refactor to make sure get_subclass() is on QuerySet
2013-10-08 10:12:37 -07:00
Travis Swicegood
03c8a1929b
Add test to verify get_subclass() on QuerySet
2013-10-08 10:38:52 -05:00
Travis Swicegood
9111843752
Refactor to make sure get_subclass() is on QuerySet
...
There's an edge case where you might want to call get_subclass() on a
QuerySet the same way you can call get() after you have already called
various filter/exclude methods.
2013-10-07 18:15:41 -05:00
Carl Meyer
5a33ff760a
Fixed indexing into Choices so its useful.
2013-09-24 15:13:27 -06:00
Carl Meyer
4b6a800050
Fix bug with child/grandchild select_subclasses in Django 1.6+; thanks Keryn Knight.
2013-09-20 10:04:10 -06:00
Carl Meyer
8bead336a7
Merge pull request #77 from Tavistock/patch-1
...
Documentation: fixed code block
2013-09-08 18:56:25 -07:00
Tavistock
ff64b06c9d
fixed code block
...
the code block was displaying incorrectly
2013-09-08 13:59:54 -04:00
Carl Meyer
4e7ddfc221
Bump version for dev.
2013-08-29 22:35:32 -06:00
Carl Meyer
edbef99ce2
Bump version for 1.5.0 release.
2013-08-29 22:06:44 -06:00
Carl Meyer
2e44f1c2c0
Add option-groups capability to Choices.
2013-08-29 22:00:53 -06:00
Carl Meyer
32f839b577
Add Changelog note about Choices equality/addition.
2013-08-25 09:04:27 -06:00
Tony Aldridge
b706aee4a9
Added tests to improve coverage
2013-08-25 08:29:10 +01:00
Tony Aldridge
2d6b8b4603
Alphabetised authors
2013-08-25 08:22:20 +01:00
Tony Aldridge
1a6d9a193e
Removed redundant inequality method on Choices
2013-08-24 10:51:25 +01:00
Tony Aldridge
cac7416cda
Moved documentation for Choices field to the right place
2013-08-24 10:40:53 +01:00
Tony Aldridge
3485df15f2
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
README.rst
2013-08-24 10:36:21 +01:00
Tony Aldridge
814df377bd
Corrected typo
2013-08-23 17:04:18 +01:00
Tony Aldridge
19560d9026
Added self to Authors file
2013-08-23 17:02:31 +01:00
Tony Aldridge
003ad70805
Added equality methods to Choices objects, and overrode + for Choices
...
for easy concatenation with other Choices and choice-like iterables.
Also wrote tests for them, and extended the readme to reflect this
2013-08-23 16:58:10 +01:00
Den Lesnov
18999c43dd
Added deepcopy test
2013-08-21 17:15:19 +04:00
Trey Hunner
09278083e8
Fix typo noted by @silonov
2013-08-17 11:35:03 -07:00
Trey Hunner
e1faec7577
Merge pull request #73 from silonov/json_fields_support
...
Json fields support
2013-08-17 01:46:31 -07:00
Trey Hunner
2679f6114b
Merge branch 'silonov-json_fields_support'
...
Conflicts:
CHANGES.rst
model_utils/tests/tests.py
2013-08-17 01:40:09 -07:00
Den Lesnov
5f291a6a4a
Implemented __deepcopy__ to avoid infinite recursion in __getattr__ while deepcopying a Choices instance
2013-08-15 15:01:09 +04:00
Mikhail Silonov
ef510d53dd
Removed reinvented wheel
2013-08-12 13:22:34 +04:00
Trey Hunner
15910e04e7
Merge branch 'field-tracker-inheritance'
...
Conflicts:
CHANGES.rst
2013-08-11 18:49:20 -07:00
silonov
f20e723952
Added more general mutable fields support instead of json-specific
2013-08-11 19:32:45 +04:00
silonov
630741b423
Added JSONEncoder().encode(...) check for json-like fields
2013-08-10 01:59:06 +04:00
Carl Meyer
2eacb11b45
Tweak AUTHOR list and changelog.
2013-08-08 09:45:49 -06:00
Carl Meyer
9a3abce7f5
Update testing idioms.
2013-08-08 09:43:46 -06:00
Carl Meyer
a66f2769cb
Merge remote-tracking branch 'silonov/save_with_untracked_updated_fields'
...
* silonov/save_with_untracked_updated_fields:
Fixed a bug causing `KeyError` when saving with the parameter `update_fields` in which there are untracked fields.
2013-08-08 09:29:04 -06:00
Mikhail Silonov
8c6f343111
Added JSON Fields support
2013-08-08 18:02:12 +04:00
Mikhail Silonov
b9f954074c
Fixed a bug causing KeyError when saving with the parameter update_fields in which there are untracked fields.
2013-08-08 13:22:25 +04:00
Trey Hunner
9050d60295
Merge pull request #68 from carljm/docs
...
Documentation
2013-08-08 01:00:51 -07:00
Trey Hunner
6e397303f8
Reference make test instead of ./runtests.sh
2013-08-07 22:52:44 -07:00
Trey Hunner
a7c6ff9392
Set version in setup.py docs automatically
2013-08-07 22:52:39 -07:00
Trey Hunner
ed011eaeaa
Add Makefile with init, test, and docs tasks
2013-08-07 22:51:34 -07:00
Trey Hunner
0197c9e0f8
Link to documentation and PyPI in README
2013-08-07 00:30:28 -07:00
Trey Hunner
1bdf90be20
Add explicit references for cross-doc file links
2013-08-06 20:47:22 -07:00
Trey Hunner
85330bc106
Split usage docs into multiple files
2013-08-06 20:29:39 -07:00
Trey Hunner
b78ff6e4b8
Add some missing blank lines above headers in docs
2013-08-05 23:30:25 -07:00
Carl Meyer
64a47ad861
Update AUTHORS and changelog for Choices.__contains__ addition.
2013-08-05 19:49:21 -06:00
