50227131fd
Upgrade tox configuration
...
Add supported Django versions
Add supported python versions
Use openpyxl==2.4.11 as 2.5.x drops support for python 3.3
2018-02-06 21:17:24 +01:00
5794ab8fbb
Update next release in CHANGELOG
2018-02-06 17:53:37 +01:00
e6d9be730b
Merge branch 'mgrdcm-require-django-1-8'
2018-02-06 17:50:28 +01:00
9b69dbf88d
Updated documentation regardign declaring fields.
2018-01-29 15:24:37 +01:00
4db2615059
Use 'verbose_name' in breadcrumbs to match Django default.
2018-01-28 00:11:47 -05:00
87afec415b
Merge branch 'master' of https://github.com/django-import-export/django-import-export into require-django-1-8
2018-01-27 23:47:59 -05:00
318208cddd
Back to development: 0.7.1
2018-01-17 08:06:23 +01:00
7eb60565d9
Preparing release 0.7.0
2018-01-17 08:05:54 +01:00
4a9bd312a9
Merge pull request #727 from bmihelac/prepare-0.7.0
...
prepare 0.7.0
2018-01-17 08:04:48 +01:00
5e143d40f2
prepare 0.7.0
2018-01-11 13:59:44 +01:00
fc6ef3e615
Merge pull request #702 from int-ua/master
...
skip_row override example, adding myself to AUTHORS
2018-01-11 09:23:44 +01:00
70f236f36d
custom js for action form also handles grappelli
2017-12-29 04:07:52 +01:00
0d08f30468
Merge branch 'master' into master
2017-12-28 21:56:15 +02:00
d0157e2a6b
Merge pull request #705 from bmihelac/fix-548-zip-false
...
discourage installation as a zipped eggs, thanks @machakux (#548 )
2017-12-13 08:16:45 +01:00
bcd63661a0
Merge branch 'master' into fix-548-zip-false
2017-12-13 08:16:19 +01:00
7c175af129
Merge pull request #709 from django-import-export/travis-remove-django-2.0-allowed-failure
...
Testing against Django 2.0 should not fail
2017-12-13 08:15:37 +01:00
9a32c6e08b
Merge pull request #690 from bmihelac/refactor-transaction-handling
...
Refactor transaction handling
2017-12-13 08:15:07 +01:00
62994a445e
Django 2.0 is the last version to support Python 3.4
2017-12-12 20:23:53 +01:00
08588ea837
Testing against Django 2.0 should not fail
2017-12-12 19:45:59 +01:00
1ba6790bdb
Merge pull request #707 from bmihelac/fix-saving-m2m-after-695
...
fix saving m2m in Django<1.9 after #695
2017-12-11 13:35:27 +01:00
bc3f439e7e
fix saving m2m in Django<1.9 after #695
2017-12-11 13:16:19 +01:00
e7a41ad014
Merge pull request #695 from gnucoop/fix-django2-m2m-import
...
use ManyToManyRelatedManager.set method to save m2m fields
2017-12-11 12:44:49 +01:00
3ea4316615
Merge pull request #697 from gnucoop/fix-django2-middleware-settings
...
MIDDLEWARE_CLASSES django setting removed in 2.x
2017-12-11 12:41:06 +01:00
d9768ae30d
Merge branch 'master' into fix-django2-middleware-settings
2017-12-11 12:40:50 +01:00
db2dc519ab
Merge branch 'master' into fix-django2-middleware-settings
2017-12-11 12:40:14 +01:00
ca9dbe44a1
Merge pull request #704 from krishraghuram/fix-703-fields-shadow
...
Resolves #703 fields shadowed
2017-12-11 09:39:59 +01:00
00198d3376
Added myself to AUTHORS
2017-12-11 14:09:18 +05:30
05983497e4
discourage installation as a zipped eggs, thanks @machakux ( #548 )
2017-12-11 09:23:34 +01:00
b54b501b10
Resolves #703
2017-12-11 13:40:43 +05:30
c939cf9563
skip_row override example, adding myself to AUTHORS that also stripped an unneeded space
2017-12-10 08:06:19 +02:00
d36a43b914
update changelog and authors
2017-12-08 20:11:10 +01:00
95dd3040cb
add import m2m failing test case
2017-12-06 17:49:54 +01:00
c03e3ae6c0
MIDDLEWARE_CLASSES django setting removed in 2.x
2017-12-06 17:29:32 +01:00
42daa5b022
use ManyToManyRelatedManager.set method to save m2m fields
...
fixes #694
2017-12-06 17:16:50 +01:00
dd1c0852ba
Refactor transaction handling
...
Add `atomic_if_using_transaction` context manager and use it instead of
if/else statements.
Wrap `before_import`, `import_row`, `after_import` calls into
`atomic_if_using_transaction`.
Add tests.
Refs: #609 , #399 , #610
2017-12-04 14:51:12 +01:00
859641a61f
Back to development: 0.6.2
2017-12-04 11:58:47 +01:00
f185eac177
Preparing release 0.6.1
2017-12-04 11:58:23 +01:00
028b2df910
Merge pull request #688 from bmihelac/prepare-0.6.1
...
Prepare changelog for 0.6.1
2017-12-04 11:58:01 +01:00
ec18234534
updates changelog
2017-12-04 11:56:33 +01:00
62f0e16b36
Merge pull request #682 from mgrdcm/copyright-2017
...
Update documentation copyright date through 2017.
2017-12-03 10:11:31 +01:00
1181c73caf
Merge pull request #691 from mgrdcm/travis-django-2
...
Travis tests for Django 2.0.x
2017-12-03 10:08:44 +01:00
216b697306
Travis tests for Django 2.0.x
...
2.0 not completely supported by this package yet, but at least wanted to get them into the list.
2017-12-02 18:02:58 -05:00
fa1d0653fd
Prepare changelog for 0.6.1
2017-11-28 16:11:35 +01:00
abf65a0f50
Merge branch 'master' of https://github.com/django-import-export/django-import-export into require-django-1-8
2017-11-28 08:30:39 -05:00
af3583544c
Merge pull request #686 from mgrdcm/test-django-1-11-with-python3-6
...
Travis tests for Python 3.6 on Django >= 11
2017-11-28 13:50:24 +01:00
77e20b5c7b
Merge pull request #632 from jdufresne/keys
...
Remove unnecessary calls to dict.keys()
2017-11-28 13:44:48 +01:00
deb26257c6
Don't need to test Django 1.10 in Python 3.6.
2017-11-24 16:49:11 -05:00
a7397fe349
Travis tests for Python 3.6 on Django >= 11
...
Django 1.11 and newer support Python 3.6.
2017-11-24 14:49:45 -05:00
046d77295e
Update README to note requires Django 1.8+
2017-11-24 11:09:41 -05:00
65dfa18ddf
Only support Python >=2.7 which will have NullHandler logger.
2017-11-24 11:03:57 -05:00
Bojan Mihelac
Gustaf Elbander
Dan Moore
Fran Hrženjak
Serhiy Zahoriya
Manel Clos
Raghuram Krishnaswami
trik