Commit Graph

528 Commits (6d5f9e97b493a8d523e00a6076b3446dc0b8bbd5)

Author SHA1 Message Date
Brandon Taylor 15d8f20178 Fixed merged conflict in __init__.py
Removed unused import in admin.py
2016-01-27 11:26:03 -05:00
Brandon Taylor 66c73a6bdc Fixed access of custom order property in model meta, falling back to order for legacy implementations.
Updated readme and version bump to 2.0.10
2016-01-27 10:58:58 -05:00
Brandon Taylor 42224bc626 Merge pull request #124 from mexicat/patch-1
Fix typo in warning
2016-01-12 10:28:33 -05:00
giacomo 84e42720e7 Fix typo in warning
Tabluar -> Tabular
2016-01-12 16:13:15 +01:00
Brandon Taylor 5baec21afe Added example images. 2015-12-27 12:35:56 -05:00
Brandon Taylor aa685a6c8f Minor updates to documentation. 2015-12-27 12:17:21 -05:00
Brandon Taylor 8c30ef88e8 Version bump to 2.0.9 2015-12-23 17:26:53 -05:00
Brandon Taylor b8a5238a09 Removed print debug statement.
Updated readme and generated readme in Restructred Text format for PyPi.
2015-12-23 17:22:53 -05:00
Brandon Taylor 7e9d305c90 Added template tag to get django version to allow flat admin specific classing for Django 1.9 or above. 2015-12-23 17:16:47 -05:00
Brandon Taylor 5dee27e077 Added sorting icons.
Refactored determination of sortability of classes referenced as sortable foreign keys in admin in a more reliable way.
2015-12-23 16:39:45 -05:00
Brandon Taylor de823d912c Merge pull request #123 from Flimm/setup-py-python-3
Update setup.py to mention both Python 2 and 3
2015-12-22 09:41:37 -05:00
David D Lowe 6a442933e2 Update setup.py to mention both Python 2 and 3
This is so sites like djangopackages.com will mark this distribution as being compatible with Python 3.
2015-12-22 15:38:12 +01:00
Brandon Taylor b9e98ea959 Updated travis config to include Django 1.9 2015-12-21 14:15:28 -05:00
Brandon Taylor 698ca136d5 Refactored admin url patterns to be compatible with Django 1.8 or higher.
Refactored sample_project imports to be compatible with Django 1.9
Updated unit tests for get_next/previous.
Version bump to 2.0.8.
Fixed typo in docs.
2015-12-21 14:11:13 -05:00
Brandon Taylor ba9e477f2f Merge pull request #122 from camilonova/patch-1
Typo. Fixes #116
2015-12-21 12:04:12 -05:00
Camilo Nova 1301aad55a Typo. Fixes #116 2015-12-21 11:59:38 -05:00
Brandon Taylor 114545618a Merge pull request #121 from KuroiDOC/master
Variable jQuery location for Django version 1.9 and above
2015-12-21 11:56:32 -05:00
Daniel Otero 11e445d99e Variable jQuery path for Django version 1.9 and above 2015-12-08 22:04:05 +01:00
Brandon Taylor f5c08f4116 Updated readme and version bump to 2.0.7 2015-11-18 09:22:56 -05:00
Brandon Taylor 3757ca98c0 Added extra JS to deterine which element to highlight in the case where all fieldsets of a stacked inline are set to collapse. 2015-11-18 09:20:45 -05:00
Brandon Taylor 2dab294b0c Updated readme.
Version bump to 2.0.6.
Added JS to remove inline style added by jQueryUI when highlighting form rows.
2015-11-18 07:52:18 -05:00
Brandon Taylor 455e5304aa Version bump to 2.0.5.
Updated readme.
2015-11-14 21:34:36 -05:00
Brandon Taylor 9e4396b2b1 Merge pull request #113 from itbabu/itbabu-remove-load-url-from-future
Remove `{% load url from future %}`
2015-11-14 10:08:44 -05:00
Marco Badan a5496fed0b Remove `load url from future`
`{% load url from future %}` can be removed from templates since Django 1.5 and it will be removed from Django in 1.9

https://docs.djangoproject.com/en/1.8/releases/1.5/#django-1-5-release-notes
https://docs.djangoproject.com/en/dev/releases/1.7/#loading-ssi-and-url-template-tags-from-future-library
2015-11-14 14:04:56 +01:00
Brandon Taylor fda8ec917f Version bump to 2.0.4.
Updated readme.
2015-11-12 08:02:49 -05:00
Brandon Taylor 5ed9e18e08 Merge pull request #112 from Thermondo/master
fix slow get_is_sortable when using with inline admins
2015-11-11 12:02:52 -05:00
Denis Cornehl 4d8091bc5e fix slow get_is_sortable when using with inline admins
the first `if` call did execute the whole `select` query with (perhaps)
millions of records in them, even though the only result needed here
is one record.

The acually used queryset later will be filtered by the parent-model.
2015-11-11 16:03:19 +01:00
Brandon Taylor 5d1a6f5e98 Updated readme.
Version bump to 2.0.3
2015-10-20 09:05:52 -04:00
Brandon Taylor 1589680653 Merge pull request #111 from zakdoek/master
Fix bug when used with descending order
2015-10-20 08:26:49 -04:00
zakdoek 995baee2d3 Fix bug when used with descending order 2015-10-20 14:11:49 +02:00
Brandon Taylor 736454287e Version bump to 2.0.2.
Updated readme.
2015-10-16 09:09:16 -04:00
Brandon Taylor 72766ab008 Merge pull request #110 from jorge-marques/master
Takes inline's show_change_link attribute into account
2015-10-16 09:04:19 -04:00
Jorge Marques feeb4e7910 Updates the stacked and tabular inline templates so that the
"show_change_link" option is taken into account, mimicking the
corresponding templates in Django 1.8
2015-10-13 18:41:51 +01:00
Brandon Taylor 6c44bbb2a5 Added some test data. 2015-09-07 21:41:24 -04:00
Brandon Taylor 2543f02ce7 Fixed a typp in adminsortable/fields.py comments.
Updated readme.
2015-09-07 21:26:36 -04:00
Brandon Taylor bee71e6d40 Refactored order_field_name out of Sortable class, instead deriving from Meta.ordering, since you have to set Meta.ordering to the order field to get the proper Sorting anyway. 2015-09-02 09:38:10 -04:00
Brandon Taylor 74a6cadf8d Added legacy model definition back for seamless backwards compatibility.
Updated readme.
Added sample legacy model implementation.
2015-08-24 12:55:56 -04:00
Brandon Taylor 827f5f092e Removed migrations from sample_project. 2015-08-24 11:48:30 -04:00
Brandon Taylor c8b1211ddd Changed travis config to only develop branch. 2015-08-24 11:43:01 -04:00
Brandon Taylor 51033ea8f6 Updated travis config. 2015-08-24 09:19:58 -04:00
Brandon Taylor c50541aa74 Version bump to 1.8.5.
Updated readme.
2015-08-24 09:18:54 -04:00
Brandon Taylor 6c5a9058fe Minor PEP8, text and formatting tweaks. 2015-08-24 08:18:22 -04:00
Brandon Taylor 64b8b9dc39 Added model with custom order field and inline model with custom order field example. 2015-08-24 08:04:05 -04:00
Brandon Taylor 43fef78876 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. 2015-08-23 22:25:55 -04:00
Brandon Taylor b14d747f82 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. 2015-08-23 22:23:45 -04:00
Brandon Taylor 422343ff93 Updated readme. 2015-07-05 23:13:03 -04:00
Brandon Taylor 100177f11d Version bump to 1.8.4 2015-07-05 23:04:03 -04:00
Brandon Taylor 3fd7d4aff3 Re-organized setup. 2015-07-05 23:04:03 -04:00
Brandon Taylor 51ed60a127 Refactored unit test. 2015-07-05 23:03:59 -04:00
Brandon Taylor bfcd11f072 Added setup.cfg 2015-07-05 23:02:23 -04:00