Commit Graph

536 Commits (de393db7c404211f55a85ceebe21cbbe7f3eea2e)

Author SHA1 Message Date
Ruben Dura Tari 3c2935776e Enables support for primary keys that are not AutoFields.
Specially useful when using UUIDs as primary keys.
2016-10-11 18:53:45 +01:00
Brandon Taylor 0e4a5b11e4 Excluded Django 1.7.7 from Pyton 3.5 config 2016-08-08 21:55:29 -04:00
Brandon Taylor 66e63a29c2 Version bump to 2.0.19.
Updated readme.
2016-08-08 21:48:11 -04:00
Brandon Taylor f5cda8ded9 Updated Font Awesome to 4.6.3 2016-08-08 21:35:43 -04:00
Brandon Taylor b29590a185 Minor formatting tweaks 2016-08-08 21:34:53 -04:00
Brandon Taylor ec03f8d17b Updated change_list template for Django 1.10 compatibility. 2016-08-08 21:34:41 -04:00
Brandon Taylor b52761274a Dropped Django 1.5.x test configuration 2016-08-08 20:44:03 -04:00
Brandon Taylor 5566faed5b Update sortable inline templates for Django 1.10.x compatibility. 2016-08-08 20:36:35 -04:00
Brandon Taylor e9b03a3a4f Merge pull request #143 from MagicSolutions/fix/admin-urs
Use separate URLs per model in administration to do the sorting
2016-08-03 10:06:29 -04:00
Brandon Taylor fc58ee51f0 Updated readme.
Version bump to 2.0.18
2016-07-09 18:26:00 -04:00
Brandon Taylor 3c7a012f5f Merge pull request #150 from shjohnson-pi/master
Fix missing icons in Django 1.9
2016-07-09 18:16:30 -04:00
Steven H Johnson f850e639c9 Add help text to test tabular icons between django 1.8 and 1.9 2016-07-09 16:31:36 -04:00
Steven H Johnson 76a49cc082 Fix missing admin icon for django 1.9 2016-07-09 16:26:45 -04:00
Brandon Taylor 4182468d2f Merge pull request #148 from MagicSolutions/fix/sample-project
Update sample project for latest django versions
2016-06-24 08:10:08 -07:00
Brandon Taylor 686ed6338a Merge pull request #149 from MagicSolutions/fix/sorted-icons-placement
Fix sorted icons placement
2016-06-24 08:09:55 -07:00
Venelin Stoykov 684864be33 Update sample project for latest django versions 2016-06-24 14:06:54 +03:00
Venelin Stoykov c59617e004 Fix sorted icons placement
- Move icons to the header of the row. By this way they will play nicely with custom
admin themes (like djangocms-admin-style).
- Also fix icons for Django 1.5 (now the admin looks the same as with Django >= 1.6)
2016-06-24 14:04:06 +03:00
Brandon Taylor 0065e4780c Merged develop into master 2016-06-23 22:04:27 -04:00
Brandon Taylor ee857c7403 [bt] Release 2.0.17
Merged Pull Requests #146 and #147
2016-06-23 22:04:07 -04:00
Brandon Taylor 54482b3bb3 Merge branch 'master' into develop 2016-06-23 21:48:45 -04:00
Brandon Taylor 7788b8e405 Merge pull request #146 from MagicSolutions/fix/change_form_template-selection
Play nice with other apps which dynamically choose `change_form_template`
2016-06-23 18:36:02 -07:00
Brandon Taylor 59109d340d Merge pull request #147 from MagicSolutions/fix/stacked-inline-icons
Fix stacked inline icons placement
2016-06-23 08:26:53 -07:00
Venelin Stoykov 262ec1b49b Fix stacked inline icons placement
Fixes #138
2016-06-23 18:25:11 +03:00
Venelin Stoykov 2697422497 Play nice with other apps which dynamically choose `change_form_template`
If other app admin class is using `property` for `change_form_template` adminsortable fails.
2016-06-23 16:02:01 +03:00
Venelin Stoykov a479198799 Use separate URLs per model in administration to do the sorting
- Correctly check if current user has permissions to made the change

Fixes #142
2016-06-16 14:41:03 +03:00
Brandon Taylor 344927a393 Version 2.0.16 Changes
Updated readme.
Version bump to 2.0.16
2016-06-15 20:57:10 -04:00
Brandon Taylor 6ffbb9b358 Merge branch 'master' into develop 2016-06-15 20:40:48 -04:00
Brandon Taylor 79f5aeded2 Merge pull request #141 from MagicSolutions/feature/djangocms-admin-style
Fix UI when djangocms-admin-style is used
2016-06-15 17:34:03 -07:00
Brandon Taylor 9fb9023139 Merge pull request #140 from MagicSolutions/cleanup/admin-urls
Simplify `SortableAdmin.get_urls`
2016-06-15 17:33:27 -07:00
Brandon Taylor 307db84b66 Testing admin url cleanup 2016-06-15 20:25:56 -04:00
Venelin Stoykov 7c235308b8 Fix UI when djangocms-admin-style is used 2016-06-15 17:53:35 +03:00
Venelin Stoykov fb6e1118db Simplify SortableAdmin.get_urls
Preserve compatibility
2016-06-15 16:54:07 +03:00
Brandon Taylor be29289d30 Bumping version due to PyPi error during upload. 2016-03-14 11:40:25 -04:00
Brandon Taylor 557d2d457d Fixed merge conflicts. 2016-03-14 11:36:41 -04:00
Brandon Taylor b888063f11 Fixed bad merge. 2016-03-14 11:12:01 -04:00
Brandon Taylor f004d97bf1 Refactored exception handling for order_field_name 2016-03-14 11:09:18 -04:00
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