Commit graph

496 commits

Author SHA1 Message Date
Carl Meyer
d29f7b573e Merge pull request #176 from myvision-de/master
German translations
2015-07-02 18:19:33 -07:00
Philipp Steinhardt
8bd2f8bcda * update AUTHORS.rst and CHANGES.rst 2015-07-02 14:30:09 +02:00
Philipp Steinhardt
1545e3179c * add translations paragraph to CONTRIBUTING.rst 2015-07-02 14:27:54 +02:00
Philipp Steinhardt
1bfee88c06 * clean up po file header 2015-07-02 13:53:39 +02:00
Philipp Steinhardt
3c54c847b8 * include .po message catalogs in source distributions
* remove include_package_data from setup
2015-07-02 13:41:26 +02:00
Philipp Steinhardt
5218b483c5 * add german translations 2015-07-01 14:16:40 +02:00
Philipp Steinhardt
0ddff705c6 * compile django messege catalogs during setup and install them
* add compiled django translations to gitignore
2015-07-01 14:16:03 +02:00
Trey Hunner
debff0cbbf Merge pull request #173 from carljm/fix-pypi-pin
Use shields.io for PyPI badge
2015-06-28 20:45:51 -07:00
Trey Hunner
9266f07db6 Merge pull request #174 from carljm/happy-new-year
Update copyright years to 2015
2015-06-28 20:27:14 -07:00
Trey Hunner
8015b86237 Happy New Year! 2015-06-28 19:04:27 -07:00
Trey Hunner
15275b3a9f Use shields.io for PyPI badge
pypipins is down: badges/pypipins#37
2015-06-28 18:46:20 -07:00
Carl Meyer
fb20a1390f Merge pull request #172 from pacahon/master
Fix #169 issue
2015-06-18 03:20:51 -06:00
Sergey Zherevchuk
608028aba8 Fix #169 issue
Hardcoding no_excerpt_field field in deconstruct() method of SplitField class
2015-06-18 11:11:28 +03:00
Carl Meyer
d797996d13 Fix Python 2.6 compatibility. 2015-01-28 12:17:34 -07:00
Carl Meyer
a1088dba52 Simpler cross-version implementation of _field_exists. 2015-01-28 10:59:20 -07:00
Carl Meyer
501896d75f Merge pull request #161 from carljm/django18
Django 1.8+ compatibility
2015-01-27 18:11:23 -07:00
Carl Meyer
a4680a32c6 Add Django trunk builds back to allowed-failures. 2015-01-27 16:59:22 -07:00
Carl Meyer
fce5b4391d Remove allow-failures from Travis config. 2015-01-27 16:49:16 -07:00
Carl Meyer
3f9b1cfac8 Fix select_subclasses for Django 1.8. 2015-01-27 16:48:06 -07:00
Carl Meyer
3110794afc Fix 'add_*_manager' signal handlers for Django 1.8+. 2015-01-27 16:43:29 -07:00
Carl Meyer
7012e16cc8 Add Dmytro Kyrychuk to AUTHORS file. 2015-01-26 22:28:55 -07:00
Carl Meyer
d91725497e Merge pull request #159 from orgkhnargh/dependencies_version_bump
Dependencies version bump, clean up tox.ini and .travis.yml.
2015-01-26 22:23:25 -07:00
Dmytro Kyrychuck
6944bdd218 added python3.4 to env list 2015-01-27 05:34:39 +02:00
Dmytro Kyrychuck
0bb09b419c django 1.8 builds is allowed to fail 2015-01-27 05:25:30 +02:00
Dmytro Kyrychuck
63ba203bda added django 1.8 envs 2015-01-27 05:15:52 +02:00
Dmytro Kyrychuck
971ae30151 env list in .travis.yml will now be sorted 2015-01-27 05:15:32 +02:00
Dmytro Kyrychuck
c460054180 included tox envs into .travis.yml 2015-01-27 03:57:12 +02:00
Dmytro Kyrychuck
b03c7fd5b2 travis-ci now runs tox 2015-01-27 03:54:54 +02:00
Dmytro Kyrychuck
271d3bfa27 updated tox.ini to use generative envlist 2015-01-27 02:07:23 +02:00
Dmytro Kyrychuck
8796f05ae3 added django 1.7.3 to build matrix (fixes #152) 2015-01-27 01:05:29 +02:00
Dmytro Kyrychuck
be55ed7427 bumped django 1.6.1 to 1.6.10 2015-01-27 00:59:10 +02:00
Dmytro Kyrychuck
a0ffbf0b39 bumped django 1.5.5 to 1.5.12 2015-01-27 00:57:40 +02:00
Dmytro Kyrychuck
254e5493c6 bumped django 1.4.10 to 1.4.18 2015-01-27 00:34:45 +02:00
Carl Meyer
b54d4652a3 Update AUTHORS/changelog. 2014-10-29 16:20:02 -06:00
Carl Meyer
fac4e077fc Merge pull request #157 from ad-m/patch-1
Fix GH-156: Django 1.7 migrations compatibility for SplitField.
2014-10-29 16:18:11 -06:00
ad-m
50caabdd2e Fix #156 issue 2014-10-29 00:27:10 +01:00
Carl Meyer
9786672361 Remove dead code branch. 2014-09-22 12:49:35 -06:00
Carl Meyer
67ec6e4b53 Update changelog. 2014-09-22 12:12:39 -06:00
Carl Meyer
ee05f01eff Merge pull request #151 from bboogaard/deferred-tracker-bug-2
Fix bug with FieldTracker and deferred fields.
2014-09-22 12:06:32 -06:00
bboogaard
31170692a5 Update CHANGES.rst 2014-09-01 09:30:29 +02:00
bboogaard
ac0957e3ec Update AUTHORS.rst and CHANGES.rst 2014-08-19 10:42:41 +02:00
bboogaard
041ef6b838 Keep track of deferred fields on model instance
Instead of on FieldInstanceTracker instance

Signed-off-by: bboogaard <b.boogaard@auto-interactive.nl>
2014-08-19 10:29:03 +02:00
Carl Meyer
54d915bd4a Bump version to 2.3a1. 2014-07-31 18:57:29 -06:00
Carl Meyer
c62fe9446d Add Changelog entry for revert of GH-130; bump version to 2.2. 2014-07-31 18:16:15 -06:00
Carl Meyer
a127e32217 Revert "Use a signal handler instead of patching save."
This reverts commit 3496fe4291.
2014-07-31 18:08:24 -06:00
Carl Meyer
2b1c7e3757 Merge branch '2.1.x'
* 2.1.x:
  Bump version to 2.1.2a1.
  Bump version to 2.1.1.
  ASCII-fold changelog, again. Fixes GH-141.
  Bump version to 2.1.1a.

Conflicts:
	CHANGES.rst
	model_utils/__init__.py
2014-07-28 10:03:53 -06:00
Carl Meyer
19c9c380df Bump version to 2.1.2a1. 2014-07-28 10:02:39 -06:00
Carl Meyer
bd3787a4a8 Bump version to 2.1.1. 2014-07-28 10:00:40 -06:00
Carl Meyer
abd47ed406 ASCII-fold changelog, again. Fixes GH-141. 2014-07-28 09:59:29 -06:00
Carl Meyer
4ed7eb05e5 Bump version to 2.1.1a. 2014-07-28 09:59:23 -06:00