Commit Graph

568 Commits (bee77a28db6c7df67edaa4dcadf7c2a906723fec)

Author SHA1 Message Date
Jaap Roes e0a85c554b Remove django.conf.urls import fallback 2017-03-16 16:21:58 +01:00
Jaap Roes cc5fc81da9 Add tox.ini to test and collect combined coverage data of multiple Python and Django versions 2017-03-16 16:21:58 +01:00
Brandon Taylor 1990e6653e [bt] Version 2.0.22 Release Notes
Updated readme files with new version information and credits.
Version bump to 2.0.22.
2017-03-14 22:04:23 -04:00
Brandon Taylor 60ac42cd2b Merge pull request #167 from camilonova/patch-2
Update to django 1.11
2017-03-14 08:47:12 -04:00
Camilo Nova 9b51e83537 Update to django 1.11
Fixes `TypeError, context must be a dict rather than RequestContext.`

As seen in https://docs.djangoproject.com/en/1.11/ref/templates/upgrading/#django-template-loader
2017-03-13 11:57:38 -05:00
Brandon Taylor 0d92d5c1a1 Merge pull request #166 from sushifan/save-only-order-field
Only update the order field when saving objects; omit unnecessary db queries
2017-03-11 13:30:24 -05:00
Anton Shevchenko eb5f14fe22 Clarify comment. 2017-03-11 11:20:16 -05:00
Anton Shevchenko eb5a9e0a8a Avoid unnecessary db queries: perform the update iff the order field has changed. 2017-03-08 23:28:40 -05:00
Anton Shevchenko f2f5daf831 Use 'update_fields' to limit the object's save() method to just the order field, so that other fields are not accidentally overwritten with stale data. 2017-03-08 22:14:48 -05:00
Brandon Taylor 99530d3ba4 Merge pull request #165 from Flimm/context-processor-fix
Update instructions about context processor static
2017-03-07 20:29:55 -05:00
David D Lowe d0813e7a56 Update instructions about context processor static 2017-03-07 13:57:31 +01:00
Brandon Taylor ae8a67bae2 Merge pull request #164 from Flimm/badges
Add two PyPI badges
2017-03-07 06:22:04 -05:00
David D Lowe 11ef0e51d8 Add two PyPI badges 2017-03-07 11:10:00 +01:00
Brandon Taylor 0e464ca7bb Merge pull request #163 from deluge/master
add more notes in readme for different versions
2017-02-01 05:43:20 -05:00
Benjamin Banduhn b2ea957c4a
add more notes in readme for different versions 2017-02-01 10:48:39 +01:00
Brandon Taylor 4d01ec19b5 Update README.md
Added note about ordering field name.
2016-12-01 21:52:11 -05:00
Brandon Taylor d1911519ed Added version check for 1.7 to create context dict. 2016-11-02 21:29:31 -04:00
Brandon Taylor 81f2faebc6 Merge pull request #157 from yigor/master
Proper context and breadcrumbs
2016-11-02 21:16:51 -04:00
Igor Sobolev 12fbb62302 Proper context and breadcrumbs 2016-11-02 12:47:36 -04:00
Brandon Taylor b96896d890 Merge branch 'develop' 2016-10-30 11:39:17 -04:00
Brandon Taylor 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
Brandon Taylor 020dfe89dd Merge pull request #155 from stvnw/fix
Raise NotImplementedError instead of NotImplemented
2016-10-26 15:18:08 -04:00
Steven Wood 686ddae81c Raise NotImplementedError instead of NotImplemented 2016-10-23 10:20:45 -04:00
Brandon Taylor 8df41a9533 Added Django 1.10 to Travis config 2016-10-12 22:35:15 -04:00
Brandon Taylor 3f12b10926 Changed version check back to old-style for backwards compatibility. 2016-10-12 22:23:38 -04:00
Brandon Taylor 6e6b92d759 Skipped UUID-pk model if Django less than 1.8 2016-10-12 22:14:22 -04:00
Brandon Taylor bf75b85190 Skipped UUI import for Django less than 1.8 2016-10-12 22:07:54 -04:00
Brandon Taylor 76378483ff Skipped UUID pk test for less than Django 1.8 2016-10-12 22:03:22 -04:00
Brandon Taylor fcf2829633 Skipped UUID pk test if less than Django 1.7 2016-10-12 21:50:42 -04:00
Brandon Taylor 32726cdcae Version 2.0.20
Bumped version up.
Updated README.
2016-10-12 06:09:49 -04:00
Brandon Taylor 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
Ruben Dura Tari e4355d84bc Adds test 2016-10-11 19:47:17 +01:00
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