95e21eea5e
Merge branch 'order-subset'
2014-02-05 11:13:58 -05:00
3e072cf590
Merge branch 'order-subset' of github.com:iambrandontaylor/django-admin-sortable into order-subset
2014-02-05 11:08:09 -05:00
1b4730fef9
Added Person model with sorting_filters set to only order people who are board members.
...
Added custom template override to specify which people are sortable in change list.
Added initial data fixture for people.
2014-02-05 11:08:02 -05:00
3970105ce5
Removed un-needed properties on script tags for JS imports.
...
Refactored sorting filters from class method into a model property with a default of an empty dictionary.
Refactored sortable admin class to not make two calls to determine sortability and also to get objects for sorting.
Added sorting_filters to sortable admin queryset.
2014-02-05 11:06:15 -05:00
e51f7535ca
Added Person model with ordering_subset and initial data.
2014-02-05 09:36:03 -05:00
2ca19f05c1
Updated string formatting on multiple foreign key exception.
2014-02-05 08:26:22 -05:00
c4c27e1dd1
Merge pull request #73 from ygwain/master
...
Python 2.6.x compatibility fix (unindexed str.format in admin.py
2014-01-13 05:42:36 -08:00
cadf41dd1d
Python 2.6.x compatibility fix (unindexed str.format in admin.py
2014-01-13 15:35:23 +02:00
76ff3ae7f9
Merged pull requests 66, 68 and 70.
...
Updated readme.
Version bump to 1.6.3
2013-12-03 07:42:32 -05:00
c128d022c2
Merge pull request #70 from Leftfield/master
...
enable js correctly for generic inlines
2013-12-03 04:36:09 -08:00
29eeeaf1e6
Merge pull request #68 from Alp-Phone/master
...
Javascript alert to prompt before reordering unsaved inlines.
2013-12-03 04:35:22 -08:00
644583c08f
enable js correctly for generic inlines
2013-12-03 11:32:31 +00:00
e48f461ba3
Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable
2013-12-03 10:48:45 +01:00
818a231a1a
Reordering with unsaved inlines is faulty and counter intuitive.
...
In this commit I added a javascript alert that prompts the user to save their changes before reordering if unsaved inlines are detected.
Please review and let me know if this in compliance with your guidelines.
2013-12-03 10:45:17 +01:00
629bfb058d
Enabled sample project localization to test translations.
2013-12-03 10:43:24 +01:00
ab38988698
Added missing templates
2013-12-03 10:43:00 +01:00
c76f8d0f81
Merge pull request #66 from Alp-Phone/master
...
Added German translation
2013-11-29 05:38:04 -08:00
ad73a806b3
Added German translation
2013-11-29 10:50:18 +01:00
0e390d8e22
Updated readme with instructions for extending the inline change form templates.
2013-11-25 22:08:08 -05:00
469e7d5d4d
Added new stacked and tabular change form templates for inlines from Django 1.6.
...
Added backwards compatibility changes for the setting of the edit inline template to use.
2013-11-25 22:03:20 -05:00
03a3a0a51d
Update README.md
2013-11-25 21:34:51 -05:00
41be929a7d
Fixed path to jQueryUI in change form.
...
Version bump to 1.6.1
2013-11-25 21:32:34 -05:00
30f13aedff
Added latest jQuery UI and added namespace fix so that jQueryUI can leverage jQuery included with Django admin.
...
Merged pull request 62 to replace depracated mimetype handling.
Bumped version to 1.6 to coincide with the release of Django 1.6.
Merged pull request 59 to improve query count speed by leveraging .count() instead of len().
Merged pull request 58 to ignore bad indexes.
2013-11-23 09:32:51 -05:00
85eef4909a
Merge pull request #62 from foonicorn/features/contenttype
...
Replace deprecated mimetype with content_type
2013-11-23 05:48:50 -08:00
10937eb6d8
Replace deprecated mimetype with content_type
...
Passing `mimetype` to an HttpResponse object is deprecated
since Django 1.5 and will throw an error in Django 1.7.
`content_type` is supported since Django 1.0.
2013-11-23 12:18:09 +01:00
4aa4a99ff6
Merge pull request #59 from PyKaB/patch-1
...
Make fast query with "count(*)" instead selecting all data
2013-11-07 09:18:58 -08:00
6195cd7390
Make fast query with "count(*)" instead selecting all data
2013-11-06 13:55:40 +03:00
e7da934c2e
Merge pull request #58 from ygwain/master
...
Ignore requests with wrong data
2013-11-03 06:26:02 -08:00
b79e806961
Ignore requests with wrong data, e.g. {u'indexes': [u'34,32,35,1,,33,7,5,3,29,27,4,11,14,13,31']}
2013-10-31 14:54:28 +02:00
0361755256
Added Django-CMS integration instructions.
2013-09-23 09:10:56 -04:00
b411576059
Merged README.
...
Included previously forgotten js file.
2013-09-23 08:45:18 -04:00
8f64f6ea76
Bumped version to 1.5.5.
...
Fixed namespacing of so sorting urls.
Changed namespacing of sortable() calls.
Removed unit test to check for javascript include template, which has been eliminated.
2013-09-23 08:41:10 -04:00
8a7066b248
Update README.md
...
Removed jQuery as a requirement.
2013-09-05 15:18:22 -04:00
1bf917da61
Bumped version to 1.5.4.
...
Replaced jQuery loaded from CDN with jQuery included with Django Admin.
Replaced jQuery UI from CDN with django.jQuery namespaced jQueryUI 1.8.11.
Implemented static includes using {% static %} template tag.
Removed documentation concerning override of sortable inlines whose parent doesn't inherit from sortable until a consistent workaround can be achieved.
Added CSRF protection for sort views.
2013-09-05 14:09:50 -04:00
b8bb4e4d6b
Merge pull request #55 from dokterbob/onemorechange
...
Patch needed one more change.
2013-09-05 04:49:40 -07:00
542f3fc1fc
Patch needed one more change.
2013-09-04 22:22:19 +02:00
6e334a2ef9
Merge pull request #54 from dokterbob/iambrandontaylor-csrf
...
Added jQuery tool for doing proper CSRF with AJAX
2013-09-04 13:18:33 -07:00
1bf1f96703
Remove CSRF exemption where it did not belong.
2013-09-04 22:15:28 +02:00
53291d2fd7
Add CSRF tweak to admin template.
2013-09-04 22:14:32 +02:00
e7263ac5d0
Merge pull request #53 from dokterbob/iambrandontaylor
...
README: Forgotten little comma causing lots of havoc.
2013-09-04 12:57:23 -07:00
7f043f588b
Added jQuery tool for doing proper CSRF with AJAX.
2013-09-04 21:57:04 +02:00
a4dd8c51da
Forgotten little comma causing lots of havoc.
2013-09-04 21:44:39 +02:00
2aab380f8a
Bumped version to 1.5.4
2013-08-22 12:18:09 -04:00
ea2291699c
Merged pull request 5546387733.
...
Updated README with instructions for adding the necessary JS and CSS files to enable sortable inline modesl whose parent does not inherit from Sortable.
2013-08-22 12:17:38 -04:00
5546387733
Merge pull request #51 from foonicorn/features/translation
...
Make inline hint translatable
2013-08-22 08:31:23 -07:00
89629cd80f
Make inline hint translatable
2013-08-22 17:05:22 +02:00
e22152ba81
Bumped version to 1.5.3
2013-07-19 08:36:06 -05:00
f1e6198530
Merge pull request #49 from marcelometal/master
...
Removed executable permissions from many files
2013-07-19 06:32:36 -07:00
9d128ffc79
Removed executable permissions from many files
2013-07-18 22:45:22 -03:00
83e275bd20
Merged pull request 44.
...
Updated README to include information about backward-incompatible changes in 1.5.2
2013-06-26 10:05:32 -04:00
Brandon Taylor
Brandon Taylor
A.Sichkar
João Miguel Neves
Moritz Pfeiffer
Andreas Hug
Alexei
Mathijs de Bruin
Brandon Taylor
Marcelo Jorge Vieira