Commit Graph

600 Commits (7ed44fa84b129271d015ffb9e2ca72462e65f185)

Author SHA1 Message Date
Brandon Taylor ada42c84de Version bump to 2.0.13.
Updated readme.
Slight refactor on JS to avoid extra function call.
Fixed missing semicolon.
2016-03-10 16:41:23 -05:00
Brandon Taylor f44220c3de Fixed missing semicolon. 2016-03-10 16:36:26 -05:00
Brandon Taylor 837a25268d [bt] Updated selector for index value on sortable tabular inlines. 2016-03-10 16:21:08 -05:00
Brandon Taylor 242d5bb7ac Merge pull request #136 from avoine/master
js: fix indexes finding for tabular inlines
2016-03-10 16:14:37 -05:00
Patrick 33074d8f65 js: fix indexes finding for tabular inlines
js: fix indexes finding for tabular inlines

Not sure with but unless I change the code the line 30 finds <i> tags instead of the input.
2016-03-10 14:43:44 -05:00
Brandon Taylor 70549b2517 Version bump to 2.0.12.
Updated docs.
2016-02-23 13:35:21 -05:00
Brandon Taylor 80719bace9 Merge branch 'master' into develop 2016-02-23 13:29:45 -05:00
Brandon Taylor 08025503e1 Merge pull request #132 from Hovercross/master
Fix inline sorting after support for custom CSRF_COOKIE_NAME
2016-02-23 12:34:19 -05:00
Adam M. Peacock bbb88d57ab Removed extra comma 2016-02-23 12:29:59 -05:00
Adam M. Peacock 3ef33043d7 Passed csrf_cookie_name into the changelist_form extra_context to support variable CSRF_COOKIE_NAME 2016-02-23 12:25:18 -05:00
Brandon Taylor e5b533848b Merge pull request #131 from endeav/develop
Use pk instead of id in save method
2016-02-19 09:44:41 -05:00
endeav ce091c34c6 Use pk instead of id 2016-02-19 15:27:50 +01:00
Brandon Taylor c891f25bdf Merge branch 'develop'
Adds custom CSRF_COOKIE_NAME support.
2016-02-16 09:59:50 -05:00
Brandon Taylor c1181b0e52 Support CSRF_COOKIE_NAME
Added support for custom CSRF_COOKIE_NAME by refactoring the jquery.django-csrf.js file into a separate .html file that can be used as an include, passing in the CSRF_COOKIE_NAME from settings.
2016-02-16 08:48:32 -05:00
Brandon Taylor 5ebcfed2ae Merge pull request #127 from Flimm/document-csrf-cookie-httponly
Document incompatibility with CSRF_COOKIE_HTTPONLY
2016-01-28 20:45:26 -05:00
David D Lowe 6547a478a9 Document incompatibility with CSRF_COOKIE_HTTPONLY
jquery.django-csrf.js relies on `csrftoken` cookie being accessible
through `document.cookie`, so we need to document that or fix it.
2016-01-28 16:26:19 +01:00
Brandon Taylor bb84c6e2c8 Merge pull request #126 from ekinertac/master
Syntax Highlight on README.md
2016-01-28 09:55:52 -05:00
Ekin Ertaç f25c7efa1c add syntax coloring to README.md 2016-01-28 14:37:45 +02:00
Ekin Ertaç 1afbc08704 Update README.md 2016-01-28 14:26:07 +02:00
Brandon Taylor 5823af8047 Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable 2016-01-27 12:05:12 -05:00
Brandon Taylor 1e6a2b1f07 Merged develop and fixed merge conflict. 2016-01-27 12:05:04 -05:00
Brandon Taylor a7a6c12deb Refactored check for ordering information to keep backwards compatibility with Django 1.5.x 2016-01-27 11:50:42 -05:00
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