Commit Graph

556 Commits (d22d4d174cde4d03d8db168928252e8703b8eb81)

Author SHA1 Message Date
Brandon Taylor 03a3a0a51d Update README.md 2013-11-25 21:34:51 -05:00
Brandon Taylor 41be929a7d Fixed path to jQueryUI in change form.
Version bump to 1.6.1
2013-11-25 21:32:34 -05:00
Brandon Taylor 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
Brandon Taylor 85eef4909a Merge pull request #62 from foonicorn/features/contenttype
Replace deprecated mimetype with content_type
2013-11-23 05:48:50 -08:00
Andreas Hug 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
Brandon Taylor 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
Alexei 6195cd7390 Make fast query with "count(*)" instead selecting all data 2013-11-06 13:55:40 +03:00
Brandon Taylor e7da934c2e Merge pull request #58 from ygwain/master
Ignore requests with wrong data
2013-11-03 06:26:02 -08:00
A.Sichkar 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
Brandon Taylor 0361755256 Added Django-CMS integration instructions. 2013-09-23 09:10:56 -04:00
Brandon Taylor b411576059 Merged README.
Included previously forgotten js file.
2013-09-23 08:45:18 -04:00
Brandon Taylor 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
Brandon Taylor 8a7066b248 Update README.md
Removed jQuery as a requirement.
2013-09-05 15:18:22 -04:00
Brandon Taylor 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
Brandon Taylor b8bb4e4d6b Merge pull request #55 from dokterbob/onemorechange
Patch needed one more change.
2013-09-05 04:49:40 -07:00
Mathijs de Bruin 542f3fc1fc Patch needed one more change. 2013-09-04 22:22:19 +02:00
Brandon Taylor 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
Mathijs de Bruin 1bf1f96703 Remove CSRF exemption where it did not belong. 2013-09-04 22:15:28 +02:00
Mathijs de Bruin 53291d2fd7 Add CSRF tweak to admin template. 2013-09-04 22:14:32 +02:00
Brandon Taylor e7263ac5d0 Merge pull request #53 from dokterbob/iambrandontaylor
README: Forgotten little comma causing lots of havoc.
2013-09-04 12:57:23 -07:00
Mathijs de Bruin 7f043f588b Added jQuery tool for doing proper CSRF with AJAX. 2013-09-04 21:57:04 +02:00
Mathijs de Bruin a4dd8c51da Forgotten little comma causing lots of havoc. 2013-09-04 21:44:39 +02:00
Brandon Taylor 2aab380f8a Bumped version to 1.5.4 2013-08-22 12:18:09 -04:00
Brandon Taylor 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
Brandon Taylor 5546387733 Merge pull request #51 from foonicorn/features/translation
Make inline hint translatable
2013-08-22 08:31:23 -07:00
Andreas Hug 89629cd80f Make inline hint translatable 2013-08-22 17:05:22 +02:00
Brandon Taylor e22152ba81 Bumped version to 1.5.3 2013-07-19 08:36:06 -05:00
Brandon Taylor f1e6198530 Merge pull request #49 from marcelometal/master
Removed executable permissions from many files
2013-07-19 06:32:36 -07:00
Marcelo Jorge Vieira 9d128ffc79 Removed executable permissions from many files 2013-07-18 22:45:22 -03:00
Brandon Taylor 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 37ebbf0dde Merge pull request #44 from acgray/master
Use {% static %} tag instead of STATIC_URL, which no longer exists in Django 1.5
2013-06-26 06:58:34 -07:00
Adam Gray 6f279b1b8e Fix typo 2013-06-24 18:16:08 +01:00
Adam Gray 2354f345dd Change STATIC_URL to use {% static %} tag 2013-06-24 18:13:36 +01:00
Brandon Taylor b3fd59da02 Added an override for the admin add_view to prevent the change form template extends variable from not being populated. 2013-06-20 15:47:41 -04:00
Brandon Taylor 8a0a52eca7 Updated version to 1.5.
Updated README
2013-06-18 07:52:45 -04:00
Brandon Taylor 71f6be48ad Removed certain database values 2013-06-18 07:51:16 -04:00
Brandon Taylor 49865b4228 Merge pull request #42 from immensa/master
add trans - block title and block breadcrumbs in change_list.html
2013-06-09 10:43:14 -07:00
gladson c4bedcd8cf add trans block title and block breadcrumbs in change_list 2013-06-08 22:19:54 -07:00
gladson 27c2ccffc7 add trans block title and block breadcrumbs in change_list 2013-06-08 22:11:48 -07:00
Brandon Taylor ea3e4948a0 Merged pull request for pt_BR locale and added south to requirements.txt 2013-05-20 21:17:29 -04:00
Brandon Taylor 44abe9e7d8 Merge branch 'patch-1' of https://github.com/sethwoodworth/django-admin-sortable 2013-05-20 21:15:43 -04:00
Seth Woodworth ee7c2bc485 adding south to requirements.txt in the sample project 2013-05-20 20:15:39 -03:00
gladson 201cc27001 Add locale pt_BR 2013-05-20 13:31:57 -07:00
Brandon Taylor 274a79dcd1 Merged pull request #37.
Updated version to 1.4.8.
Updated README.
2013-05-11 10:37:13 -04:00
Brandon Taylor 724f073f38 Merge pull request #37 from gugu/master
Python 3 support for indexes posted in do_sortting_view. map in Python3 returns an instance of Map instead of a list.
2013-05-11 07:34:49 -07:00
Andrii Kostenko bb6c625f62 Python 3 support 2013-05-11 15:18:01 +03:00
Brandon Taylor 8bcf2bfb2e Fixed check for sortable inline models which prevented JavaScript from loading correctly. 2013-05-07 09:22:40 -04:00
Brandon Taylor 6f2e667e6c Updated version to 1.4.7.
Updated README with JavaScript fixes.
2013-05-04 15:03:30 -04:00
Brandon Taylor 7f3bbbed4c Updated jQuery to 1.9.1 and jQueryUI to 1.10.2.
Added create function handler to unbind events from sortable that were being applied to checkboxes within a sortable item. This was preventing the delete checkbox for inline models from being checked.
Updated JavaScript inlcudes to not include unnecessary files.
2013-05-04 15:00:23 -04:00
Brandon Taylor a49bb81e1b Added index error exception handling. 2013-05-03 08:54:02 -04:00