b96896d890
Merge branch 'develop'
2016-10-30 11:39:17 -04:00
863ff69719
Fix Sorting by ForeignKey
...
Removed do_inline_sorting_url and get_object_or_404 check in admin. The model_type_id should *always* be passed in.
Removed test that asserted that Categories weren't sortable as part of the Project admin. Categories *should* be sortable as part of Project admin as they are a Sortable ForeignKey.
Fixed object_rep template to pass in model_type_id again.
Updated README.
Version bump to 2.0.21
2016-10-30 11:33:20 -04:00
020dfe89dd
Merge pull request #155 from stvnw/fix
...
Raise NotImplementedError instead of NotImplemented
2016-10-26 15:18:08 -04:00
686ddae81c
Raise NotImplementedError instead of NotImplemented
2016-10-23 10:20:45 -04:00
8df41a9533
Added Django 1.10 to Travis config
2016-10-12 22:35:15 -04:00
3f12b10926
Changed version check back to old-style for backwards compatibility.
2016-10-12 22:23:38 -04:00
6e6b92d759
Skipped UUID-pk model if Django less than 1.8
2016-10-12 22:14:22 -04:00
bf75b85190
Skipped UUI import for Django less than 1.8
2016-10-12 22:07:54 -04:00
76378483ff
Skipped UUID pk test for less than Django 1.8
2016-10-12 22:03:22 -04:00
fcf2829633
Skipped UUID pk test if less than Django 1.7
2016-10-12 21:50:42 -04:00
32726cdcae
Version 2.0.20
...
Bumped version up.
Updated README.
2016-10-12 06:09:49 -04:00
c2ca9db931
Merge pull request #153 from rubendura/master
...
Enables support for primary keys that are not AutoFields.
2016-10-12 06:00:14 -04:00
e4355d84bc
Adds test
2016-10-11 19:47:17 +01:00
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
0e4a5b11e4
Excluded Django 1.7.7 from Pyton 3.5 config
2016-08-08 21:55:29 -04:00
66e63a29c2
Version bump to 2.0.19.
...
Updated readme.
2016-08-08 21:48:11 -04:00
f5cda8ded9
Updated Font Awesome to 4.6.3
2016-08-08 21:35:43 -04:00
b29590a185
Minor formatting tweaks
2016-08-08 21:34:53 -04:00
ec03f8d17b
Updated change_list template for Django 1.10 compatibility.
2016-08-08 21:34:41 -04:00
b52761274a
Dropped Django 1.5.x test configuration
2016-08-08 20:44:03 -04:00
5566faed5b
Update sortable inline templates for Django 1.10.x compatibility.
2016-08-08 20:36:35 -04:00
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
fc58ee51f0
Updated readme.
...
Version bump to 2.0.18
2016-07-09 18:26:00 -04:00
3c7a012f5f
Merge pull request #150 from shjohnson-pi/master
...
Fix missing icons in Django 1.9
2016-07-09 18:16:30 -04:00
f850e639c9
Add help text to test tabular icons between django 1.8 and 1.9
2016-07-09 16:31:36 -04:00
76a49cc082
Fix missing admin icon for django 1.9
2016-07-09 16:26:45 -04:00
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
686ed6338a
Merge pull request #149 from MagicSolutions/fix/sorted-icons-placement
...
Fix sorted icons placement
2016-06-24 08:09:55 -07:00
684864be33
Update sample project for latest django versions
2016-06-24 14:06:54 +03:00
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
0065e4780c
Merged develop into master
2016-06-23 22:04:27 -04:00
ee857c7403
[bt] Release 2.0.17
...
Merged Pull Requests #146 and #147
2016-06-23 22:04:07 -04:00
54482b3bb3
Merge branch 'master' into develop
2016-06-23 21:48:45 -04:00
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
59109d340d
Merge pull request #147 from MagicSolutions/fix/stacked-inline-icons
...
Fix stacked inline icons placement
2016-06-23 08:26:53 -07:00
262ec1b49b
Fix stacked inline icons placement
...
Fixes #138
2016-06-23 18:25:11 +03:00
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
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
344927a393
Version 2.0.16 Changes
...
Updated readme.
Version bump to 2.0.16
2016-06-15 20:57:10 -04:00
6ffbb9b358
Merge branch 'master' into develop
2016-06-15 20:40:48 -04:00
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
9fb9023139
Merge pull request #140 from MagicSolutions/cleanup/admin-urls
...
Simplify `SortableAdmin.get_urls`
2016-06-15 17:33:27 -07:00
307db84b66
Testing admin url cleanup
2016-06-15 20:25:56 -04:00
7c235308b8
Fix UI when djangocms-admin-style is used
2016-06-15 17:53:35 +03:00
fb6e1118db
Simplify SortableAdmin.get_urls
...
Preserve compatibility
2016-06-15 16:54:07 +03:00
be29289d30
Bumping version due to PyPi error during upload.
2016-03-14 11:40:25 -04:00
557d2d457d
Fixed merge conflicts.
2016-03-14 11:36:41 -04:00
b888063f11
Fixed bad merge.
2016-03-14 11:12:01 -04:00
f004d97bf1
Refactored exception handling for order_field_name
2016-03-14 11:09:18 -04:00
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
Brandon Taylor
Steven Wood
Ruben Dura Tari
Brandon Taylor
Steven H Johnson
Venelin Stoykov