Briq/django-admin-sortable-fixwin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
330 Commits 1 Branch 0 Tags
51ed60a127137234305ca1e8e6f0054e3c05bb6f
Commit Graph
85 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Taylor ef05c0f7cb Version bump to 1.8.3. 
Updated readme with 1.8.3 information.
Updated travis configuration to remove deprecated config settings.
 2015-04-08 22:16:20 -04:00
Brandon Taylor ad09081ab4 Added exception handling for get_queryset attribute. 2015-04-08 22:06:14 -04:00
Brandon Taylor a5c1c53400 Added Polish translations. 
Version bump to 1.8.2
 2015-04-01 12:01:16 -04:00
Brandon Taylor 4f16fd266c Version bump to 1.8.1. 
Updated readme.
 2015-03-24 09:19:58 -04:00
Brandon Taylor ca6d4ee8ed Removed debugging information. 2015-03-24 09:13:33 -04:00
Brandon Taylor 0af13803fb Version bump to 1.8.0. 
Updated readme.
 2015-01-12 22:56:38 -05:00
Brandon Taylor a64d86a219 Merged PR 99. 
Bumped version to 1.7.9.1
 2014-12-27 12:45:49 -05:00
Brandon Taylor 740d3fff15 Version bump to 1.7.9. 
Updated README.
 2014-12-22 10:37:44 -05:00
Brandon Taylor 34e5d62245 Fixed merge conflict. 2014-12-22 10:30:56 -05:00
Brandon Taylor a3c1f4457a Fixed merge conflicts. 2014-12-22 10:27:46 -05:00
Brandon Taylor 01403f1b8c Merged pull request 97 2014-12-22 10:25:35 -05:00
Brandon Taylor 15e3fb88bf Changed homepage for project. 2014-05-23 22:38:34 -04:00
Brandon Taylor e7e74983a2 Version bump to 1.6.8. 
Updated README.
 2014-05-23 08:05:20 -04:00
Brandon Taylor 1ebf86b4aa Updated README. 
Version bump to 1.6.7
 2014-04-08 07:52:26 -04:00
Brandon Taylor 13549da827 Removed un-needed format specificity. 2014-03-05 09:24:32 -05:00
Brandon Taylor 80bdaafdc3 Refactored sorting_filters into a tuple and moved logic for retrieving sorting filters into the sort_view versus changelist_view. 
Updated readme.
Updated sample project to leverage new sorting_filters on Person model and admin.
Removed custom change list template for Person admin.
 2014-03-05 09:10:47 -05:00
Brandon Taylor 53df734e15 Fixed jQuery namespace on inline model JavaScript includes. 
Version bump to 1.6.5.
Updated readme.
 2014-02-12 16:22:04 -05:00
Brandon Taylor e80a633edb Updated README. 
Version bump to 1.6.4
 2014-02-05 11:24:48 -05:00
Brandon Taylor 95e21eea5e Merge branch 'order-subset' 2014-02-05 11:13:58 -05:00
Brandon Taylor 3e072cf590 Merge branch 'order-subset' of github.com:iambrandontaylor/django-admin-sortable into order-subset 2014-02-05 11:08:09 -05:00
Brandon Taylor 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
Brandon Taylor 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
Brandon Taylor e51f7535ca Added Person model with ordering_subset and initial data. 2014-02-05 09:36:03 -05:00
Brandon Taylor 2ca19f05c1 Updated string formatting on multiple foreign key exception. 2014-02-05 08:26:22 -05:00
Brandon Taylor 76ff3ae7f9 Merged pull requests 66, 68 and 70. 
Updated readme.
Version bump to 1.6.3
 2013-12-03 07:42:32 -05:00
Brandon Taylor c128d022c2 Merge pull request #70 from Leftfield/master 
enable js correctly for generic inlines
 2013-12-03 04:36:09 -08:00
Brandon Taylor 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
Brandon Taylor c76f8d0f81 Merge pull request #66 from Alp-Phone/master 
Added German translation
 2013-11-29 05:38:04 -08:00
Brandon Taylor 0e390d8e22 Updated readme with instructions for extending the inline change form templates. 2013-11-25 22:08:08 -05:00
Brandon Taylor 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
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
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
Brandon Taylor e7da934c2e Merge pull request #58 from ygwain/master 
Ignore requests with wrong data
 2013-11-03 06:26:02 -08: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
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
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
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
Brandon Taylor f1e6198530 Merge pull request #49 from marcelometal/master 
Removed executable permissions from many files
 2013-07-19 06:32:36 -07: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
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
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
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
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 014f6d1660 Added support for queryset() overrides on admin classes and inline admin classes. 
Updated version to 1.4.5.
Updated README with explanation of requirements for overriding queryset() on inline models.
Added extra models to sample project to demonstrate sortable models with custom querysets.
Improved JavaScript of sortables to be more efficient with better comparison checking.
Fixed highlighting of stacked inlines on sort finish.
 2013-04-27 22:58:02 -04:00
Brandon Taylor b6e68fa367 Removed url template tags and put in relative paths for sorting urls for Django <= 1.4.x and Django 1.5.x compatibility. 2013-04-27 13:10:53 -04:00
Brandon Taylor 7d0555cc62 Merge pull request #32 from knyazz/master 
Not works with cyrillic verbose_name_plural
 2013-04-23 04:49:59 -07:00
Brandon Taylor b804f25585 Updated README to include information on generic inline imports. 2013-03-15 07:39:35 -04:00
Brandon Taylor ece9876a47 Minor PEP8 improvements. 
Updated version to 1.4.1.
Updated README.
 2013-03-15 07:31:14 -04:00
Brandon Taylor 893759f7d0 Merge pull request #30 from Hedde/master 
Added support for generic inlines
 2013-03-15 04:23:06 -07:00
Brandon Taylor ddbeca7177 Improved documentation for adding Sortable to an existing model. 2013-03-10 21:05:10 -04:00
Brandon Taylor e10d653d3a Improved documentation for adding Sortable to an existing model. 2013-03-10 21:04:32 -04:00
Brandon Taylor 9cb756e3ea Improved documentation for adding Sortable to an existing model. 2013-03-10 21:03:55 -04:00
Brandon Taylor a8fcabc328 Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable 2013-03-10 20:53:32 -04:00
Brandon Taylor a54e81434f Minor modifications for Django 1.5.x and 1.4.x backward-compatibility. 
Added new sample project.
Improved documentation.
Refactored CSS selector for inlines that are sortable.
 2013-03-10 20:53:05 -04:00
Brandon Taylor ac2cecf291 Updated documentation formatting and information for 1.4 release. 2013-03-08 13:45:15 -05:00
Brandon Taylor 66752d309f Merge pull request #29 from smacker/master 
8662eba fix
 2013-03-01 02:49:48 -08:00
Brandon Taylor cffbd8534e Working on updating documentation and sample project 2013-02-28 22:07:16 -05:00
Brandon Taylor 8662ebae88 Merged changes from return1-django-v1.5 master 2013-02-28 21:52:07 -05:00
Brandon Taylor 1614e77b75 Updated readme and version 2012-11-19 00:10:40 -05:00
Brandon Taylor e206dfc30c Fixed application of CSS class 'sortable' to stacked inline elements that are sortable which was somehow excluded from the previous release. 2012-11-02 13:49:30 -04:00
Brandon Taylor 9145da6a23 Updated version to 1.3.6, which also somehow didn't make it into the previous release 2012-11-02 13:38:19 -04:00
Brandon Taylor a66757d728 Fixed the changed to the get_do_sorting_url template tag that somehow didn't make it into the previous release. 2012-11-02 13:33:55 -04:00
Brandon Taylor 7a000f1724 Fixed version in __init__ 2012-04-23 23:18:37 -05:00
Brandon Taylor 98320aefe9 Incremented version to 1.3.1 2012-04-23 23:13:35 -05:00
Brandon Taylor e6e0d728d7 Removed initial_data which was breaking unit tests. 2012-04-23 23:11:11 -05:00
Brandon Taylor 49b7d7d0e3 Added south field triple to SortableForeignKey field 2012-03-07 21:52:57 -06:00
Brandon Taylor 09f86f83bb Fixed IndexError 2012-02-24 22:56:47 -06:00
Brandon Taylor 4e918cbe4b Updated README to provide example of usage of SortableForeignKey. 2012-02-24 22:51:22 -06:00
Brandon Taylor 0eb5c86dc8 Updated README to reflect changes present in 1.3 2012-02-24 22:47:44 -06:00
Brandon Taylor 37f91cce97 Added SortableForeignKey field to replace sortable_by model property. 
Refactored how the sortable_by properties get populated by looping over the model fields until we get to the SortableForeignKey, then grabbing properties from the field and its related data.
 2012-02-24 22:35:30 -06:00