summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* setup.py: follow PEP0440HEADmasterBenjamin Dauvergne2016-07-011-1/+1
* setup.py: compute version from git tagsBenjamin Dauvergne2015-05-272-4/+92
* Merge tag '0.2.7'Benjamin Dauvergne2015-05-2730-91/+907
|\
| * Preparing release 0.2.70.2.7Bojan Mihelac2015-05-042-2/+2
| * Update changelog.rstBojan Mihelac2015-04-221-1/+3
| * Merge pull request #247 from rhunwicks/fix-140-attribute_inheritanceBojan Mihelac2015-04-222-13/+57
| |\
| | * Remove redundant ResourceOptions.__new__ method - see #140Roger Hunwicks2015-04-221-10/+0
| | * All custom Meta attributes to be inherited - see #140Roger Hunwicks2015-04-222-2/+16
| | * Merge branch 'master' into fix-140-attribute_inheritanceRoger Hunwicks2015-04-224-2/+36
| | |\
| | * | Fix #140 - Attributes aren't inherited by subclassesRoger Hunwicks2015-04-152-3/+43
| * | | Update changelog.rstBojan Mihelac2015-04-221-0/+2
| * | | Merge pull request #248 from rhunwicks/fix-237-make-filename-availableBojan Mihelac2015-04-224-6/+28
| |\ \ \
| | * | | Add user to parameters passed from ImportMixin to import_data - see #237Roger Hunwicks2015-04-221-2/+4
| | * | | Merge branch 'master' into fix-237-make-filename-availableRoger Hunwicks2015-04-224-2/+36
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fix #237 - make file name available to import_data and before_importRoger Hunwicks2015-04-154-6/+26
| | | |/ | | |/|
| * | | Revert "Merge pull request #245 from pkozlov/pkozlov-to_encoding"Bojan Mihelac2015-04-221-2/+0
| | |/ | |/|
| * | Update AUTHORSBojan Mihelac2015-04-221-0/+1
| * | Update changelog.rstBojan Mihelac2015-04-221-0/+2
| * | Merge pull request #245 from pkozlov/pkozlov-to_encodingBojan Mihelac2015-04-221-0/+2
| |\ \
| | * | check is binaryPavel Kozlov2015-04-221-1/+3
| | * | to_encoding functionalityPavel Kozlov2015-04-211-1/+1
| |/ /
| * | Update AUTHORSBojan Mihelac2015-04-151-0/+1
| * | Merge pull request #239 from manelclos/admin_site_headerBojan Mihelac2015-04-151-0/+12
| |\ \
| | * | update context with admin vars. Fixes #213Manel Clos2015-04-151-0/+12
| * | | Merge pull request #241 from manelclos/patch-2Bojan Mihelac2015-04-151-2/+9
| |\ \ \
| | * | | make 'fields' option more explicitManel Clos2015-04-151-2/+9
| | | |/ | | |/|
| * | | Merge pull request #242 from manelclos/patch-3Bojan Mihelac2015-04-151-0/+9
| |\ \ \ | | |/ / | |/| |
| | * | document export_order optionManel Clos2015-04-151-0/+9
| |/ /
| * | Merge pull request #233 from bmihelac/django-1.8-fixesBojan Mihelac2015-04-155-16/+78
| |\ \
| | * | Do not include Django 1.4.x in Python 3.4 testsBojan Mihelac2015-04-081-1/+1
| | * | Update docs/changelog.rstBojan Mihelac2015-04-081-0/+2
| | * | Merge branch 'django-1.8-fixes-enter_transaction_management' into django-1.8-...Bojan Mihelac2015-04-082-10/+34
| | |\ \
| | | * | Do not use private transaction api for Django > 1.6Bojan Mihelac2015-04-082-10/+34
| | * | | Merge branch 'django-1.8-fixes-ForeignObjectRel' into django-1.8-fixesBojan Mihelac2015-04-081-4/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | FIX #200 RelatedObject is removed in Django 1.8Bojan Mihelac2015-04-081-4/+15
| | |/ /
| | * | Merge branch '2xyo-master' into django-1.8-fixesBojan Mihelac2015-04-082-1/+26
| | |\ \
| | | * | Bump to Django 1.8Yohann Lepage2015-04-012-4/+4
| | | * | Add Python 3.4 and Django 1.8c1 to Travis CIYohann Lepage2015-04-011-0/+2
| | | * | Add Python 3.4 and Django 1.8c1 to tox.iniYohann Lepage2015-04-011-1/+24
| | |/ /
| * | | Merge pull request #234 from rda-dev/patch-1Bojan Mihelac2015-04-131-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Update getting_started.rstm0n61an2015-04-131-1/+1
| |/ /
| * | Merge pull request #226 from manelclos/patch-1Bojan Mihelac2015-03-301-1/+1
| |\ \ | | |/ | |/|
| | * fix visual spaceManel Clos2015-03-301-1/+1
| |/
| * Add jbub to AUTHORSBojan Mihelac2015-03-241-0/+1
| * Merge pull request #223 from jbub/slovakBojan Mihelac2015-03-242-0/+107
| |\
| | * add slovak translationjbub2015-03-242-0/+107
| |/
| * add ludwiktrammer to AUTHORSBojan Mihelac2015-03-231-0/+1
| * Merge pull request #222 from ludwiktrammer/masterBojan Mihelac2015-03-232-0/+107
| |\
| | * Polish translationLudwik Trammer2015-03-232-0/+107
| |/
| * Merge pull request #218 from schemacs/trans-zh-hansBojan Mihelac2015-03-092-2/+2
| |\