Commit graph

329 commits

Author SHA1 Message Date
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
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
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
Carl Meyer
c9122ff025 Merge pull request #69 from kezabelle/feature/choices_contains
Implementing __contains__ in Choices
2013-08-05 18:40:44 -07:00
Keryn Knight
6f0cf2a96c first pass at tests for the __contains__ functionality
just implemented.
2013-08-02 12:24:44 +01:00
Keryn Knight
f89369f9ac Implement __contains__ ('x' in Choices('x')) for Choices objects.
In Choices, `_choice_dict` appears to be a definitive location of all
internal/DB representations, so it seems the best target for finding
out if the given item is part of the sequences.
2013-08-02 12:23:48 +01:00
Trey Hunner
176f557b13 Add setup.cfg for `python setup.py build_sphinx` 2013-07-31 22:58:15 -07:00
Trey Hunner
1ff3f267f9 Remove documentation from README 2013-07-31 22:57:41 -07:00
Trey Hunner
9a24ab0a37 Exclude docs html output from git 2013-07-31 22:57:15 -07:00
Trey Hunner
e84a76979b Add initial documentation (based on README) 2013-07-31 22:55:43 -07:00
Trey Hunner
75646a1874 Improve FieldTracker tests for inherited models 2013-07-30 10:16:43 -07:00
Trey Hunner
e79539a39c Note FieldTracker fix in CHANGES 2013-07-29 13:36:07 -07:00
Trey Hunner
98f078d718 Allow FieldTracker to work in child models
Fixes #57.
2013-07-29 12:54:49 -07:00
Carl Meyer
369f9f8ced Merge pull request #64 from carljm/test-skipping
Use real unittest test skipping.
2013-07-25 11:55:48 -07:00
Carl Meyer
677f3e4794 Merge pull request #63 from carljm/update-test-matrix
Update test matrix
2013-07-25 11:55:16 -07:00
Carl Meyer
2d40c5b927 Merge branch 'update-test-matrix' into test-skipping
* update-test-matrix:
  Fix typo in .travis.yml.
  Don't use unnecessary quotes in .travis.yml.
2013-07-25 12:30:05 -05:00
Carl Meyer
6f1876b8de Fix typo in .travis.yml. 2013-07-25 12:28:03 -05:00
Carl Meyer
0481f0aafe Don't use unnecessary quotes in .travis.yml. 2013-07-25 12:23:59 -05:00