Commit Graph

  • 686ed6338a Merge pull request #149 from MagicSolutions/fix/sorted-icons-placement Brandon Taylor 2016-06-24 08:09:55 -07:00
  • 684864be33 Update sample project for latest django versions Venelin Stoykov 2016-06-24 14:06:54 +03:00
  • c59617e004 Fix sorted icons placement Venelin Stoykov 2016-06-24 14:04:06 +03:00
  • 0065e4780c Merged develop into master Brandon Taylor 2016-06-23 22:04:27 -04:00
  • ee857c7403 [bt] Release 2.0.17 Brandon Taylor 2016-06-23 22:04:07 -04:00
  • 54482b3bb3 Merge branch 'master' into develop Brandon Taylor 2016-06-23 21:48:45 -04:00
  • 7788b8e405 Merge pull request #146 from MagicSolutions/fix/change_form_template-selection Brandon Taylor 2016-06-23 18:36:02 -07:00
  • 59109d340d Merge pull request #147 from MagicSolutions/fix/stacked-inline-icons Brandon Taylor 2016-06-23 08:26:53 -07:00
  • 262ec1b49b Fix stacked inline icons placement Venelin Stoykov 2016-06-23 18:25:11 +03:00
  • 2697422497 Play nice with other apps which dynamically choose change_form_template Venelin Stoykov 2016-06-23 16:02:01 +03:00
  • a479198799 Use separate URLs per model in administration to do the sorting Venelin Stoykov 2016-06-16 12:16:42 +03:00
  • 344927a393 Version 2.0.16 Changes Brandon Taylor 2016-06-15 20:55:42 -04:00
  • 6ffbb9b358 Merge branch 'master' into develop Brandon Taylor 2016-06-15 20:40:48 -04:00
  • 79f5aeded2 Merge pull request #141 from MagicSolutions/feature/djangocms-admin-style Brandon Taylor 2016-06-15 17:34:03 -07:00
  • 9fb9023139 Merge pull request #140 from MagicSolutions/cleanup/admin-urls Brandon Taylor 2016-06-15 17:33:27 -07:00
  • 307db84b66 Testing admin url cleanup Brandon Taylor 2016-06-15 20:25:56 -04:00
  • 7c235308b8 Fix UI when djangocms-admin-style is used Venelin Stoykov 2016-06-15 17:53:35 +03:00
  • fb6e1118db Simplify SortableAdmin.get_urls Venelin Stoykov 2016-06-15 16:54:07 +03:00
  • be29289d30 Bumping version due to PyPi error during upload. Brandon Taylor 2016-03-14 11:40:25 -04:00
  • 557d2d457d Fixed merge conflicts. Brandon Taylor 2016-03-14 11:36:41 -04:00
  • b888063f11 Fixed bad merge. Brandon Taylor 2016-03-14 11:12:01 -04:00
  • f004d97bf1 Refactored exception handling for order_field_name Brandon Taylor 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. Brandon Taylor 2016-03-10 16:41:23 -05:00
  • f44220c3de Fixed missing semicolon. Brandon Taylor 2016-03-10 16:36:26 -05:00
  • 837a25268d [bt] Updated selector for index value on sortable tabular inlines. Brandon Taylor 2016-03-10 16:21:08 -05:00
  • 242d5bb7ac Merge pull request #136 from avoine/master Brandon Taylor 2016-03-10 16:14:37 -05:00
  • 33074d8f65 js: fix indexes finding for tabular inlines Patrick 2016-03-10 14:43:44 -05:00
  • 70549b2517 Version bump to 2.0.12. Updated docs. Brandon Taylor 2016-02-23 13:35:21 -05:00
  • 80719bace9 Merge branch 'master' into develop Brandon Taylor 2016-02-23 13:29:45 -05:00
  • 08025503e1 Merge pull request #132 from Hovercross/master Brandon Taylor 2016-02-23 12:34:19 -05:00
  • bbb88d57ab Removed extra comma Adam M. Peacock 2016-02-23 12:29:59 -05:00
  • 3ef33043d7 Passed csrf_cookie_name into the changelist_form extra_context to support variable CSRF_COOKIE_NAME Adam M. Peacock 2016-02-23 12:25:18 -05:00
  • e5b533848b Merge pull request #131 from endeav/develop Brandon Taylor 2016-02-19 09:44:41 -05:00
  • ce091c34c6 Use pk instead of id endeav 2016-02-19 15:27:50 +01:00
  • c891f25bdf Merge branch 'develop' Brandon Taylor 2016-02-16 09:59:50 -05:00
  • c1181b0e52 Support CSRF_COOKIE_NAME Brandon Taylor 2016-02-16 08:48:32 -05:00
  • 5ebcfed2ae Merge pull request #127 from Flimm/document-csrf-cookie-httponly Brandon Taylor 2016-01-28 20:45:26 -05:00
  • 6547a478a9 Document incompatibility with CSRF_COOKIE_HTTPONLY David D Lowe 2016-01-28 16:26:19 +01:00
  • bb84c6e2c8 Merge pull request #126 from ekinertac/master Brandon Taylor 2016-01-28 09:55:52 -05:00
  • f25c7efa1c add syntax coloring to README.md Ekin Ertaç 2016-01-28 14:37:45 +02:00
  • 1afbc08704 Update README.md Ekin Ertaç 2016-01-28 14:26:07 +02:00
  • 5823af8047 Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable Brandon Taylor 2016-01-27 12:05:12 -05:00
  • 1e6a2b1f07 Merged develop and fixed merge conflict. Brandon Taylor 2016-01-27 12:05:04 -05:00
  • a7a6c12deb Refactored check for ordering information to keep backwards compatibility with Django 1.5.x Brandon Taylor 2016-01-27 11:50:42 -05:00
  • 15d8f20178 Fixed merged conflict in __init__.py Removed unused import in admin.py Brandon Taylor 2016-01-27 11:26:03 -05:00
  • 66c73a6bdc Fixed access of custom order property in model meta, falling back to order for legacy implementations. Updated readme and version bump to 2.0.10 Brandon Taylor 2016-01-27 10:58:58 -05:00
  • 42224bc626 Merge pull request #124 from mexicat/patch-1 Brandon Taylor 2016-01-12 10:28:33 -05:00
  • 84e42720e7 Fix typo in warning giacomo 2016-01-12 16:13:15 +01:00
  • 5baec21afe Added example images. Brandon Taylor 2015-12-27 12:35:56 -05:00
  • aa685a6c8f Minor updates to documentation. Brandon Taylor 2015-12-27 12:17:21 -05:00
  • 8c30ef88e8 Version bump to 2.0.9 Brandon Taylor 2015-12-23 17:26:53 -05:00
  • b8a5238a09 Removed print debug statement. Updated readme and generated readme in Restructred Text format for PyPi. Brandon Taylor 2015-12-23 17:22:53 -05:00
  • 7e9d305c90 Added template tag to get django version to allow flat admin specific classing for Django 1.9 or above. Brandon Taylor 2015-12-23 17:16:47 -05:00
  • 5dee27e077 Added sorting icons. Refactored determination of sortability of classes referenced as sortable foreign keys in admin in a more reliable way. Brandon Taylor 2015-12-23 16:39:45 -05:00
  • de823d912c Merge pull request #123 from Flimm/setup-py-python-3 Brandon Taylor 2015-12-22 09:41:37 -05:00
  • 6a442933e2 Update setup.py to mention both Python 2 and 3 David D Lowe 2015-12-22 15:38:12 +01:00
  • b9e98ea959 Updated travis config to include Django 1.9 Brandon Taylor 2015-12-21 14:15:28 -05:00
  • 698ca136d5 Refactored admin url patterns to be compatible with Django 1.8 or higher. Refactored sample_project imports to be compatible with Django 1.9 Updated unit tests for get_next/previous. Version bump to 2.0.8. Fixed typo in docs. Brandon Taylor 2015-12-21 14:11:13 -05:00
  • ba9e477f2f Merge pull request #122 from camilonova/patch-1 Brandon Taylor 2015-12-21 12:04:12 -05:00
  • 1301aad55a Typo. Fixes #116 Camilo Nova 2015-12-21 11:59:38 -05:00
  • 114545618a Merge pull request #121 from KuroiDOC/master Brandon Taylor 2015-12-21 11:56:32 -05:00
  • 11e445d99e Variable jQuery path for Django version 1.9 and above Daniel Otero 2015-12-08 22:04:05 +01:00
  • f5c08f4116 Updated readme and version bump to 2.0.7 Brandon Taylor 2015-11-18 09:22:56 -05:00
  • 3757ca98c0 Added extra JS to deterine which element to highlight in the case where all fieldsets of a stacked inline are set to collapse. Brandon Taylor 2015-11-18 09:20:45 -05:00
  • 2dab294b0c Updated readme. Version bump to 2.0.6. Added JS to remove inline style added by jQueryUI when highlighting form rows. Brandon Taylor 2015-11-18 07:52:18 -05:00
  • 455e5304aa Version bump to 2.0.5. Updated readme. Brandon Taylor 2015-11-14 21:34:36 -05:00
  • 9e4396b2b1 Merge pull request #113 from itbabu/itbabu-remove-load-url-from-future Brandon Taylor 2015-11-14 10:08:44 -05:00
  • a5496fed0b Remove load url from future Marco Badan 2015-11-14 14:04:56 +01:00
  • fda8ec917f Version bump to 2.0.4. Updated readme. Brandon Taylor 2015-11-12 08:02:49 -05:00
  • 5ed9e18e08 Merge pull request #112 from Thermondo/master Brandon Taylor 2015-11-11 12:02:52 -05:00
  • 4d8091bc5e fix slow get_is_sortable when using with inline admins Denis Cornehl 2015-11-11 16:03:19 +01:00
  • 5d1a6f5e98 Updated readme. Version bump to 2.0.3 Brandon Taylor 2015-10-20 09:05:52 -04:00
  • 1589680653 Merge pull request #111 from zakdoek/master Brandon Taylor 2015-10-20 08:26:49 -04:00
  • 995baee2d3 Fix bug when used with descending order zakdoek 2015-10-20 14:11:49 +02:00
  • 736454287e Version bump to 2.0.2. Updated readme. Brandon Taylor 2015-10-16 09:09:16 -04:00
  • 72766ab008 Merge pull request #110 from jorge-marques/master Brandon Taylor 2015-10-16 09:04:19 -04:00
  • feeb4e7910 Updates the stacked and tabular inline templates so that the "show_change_link" option is taken into account, mimicking the corresponding templates in Django 1.8 Jorge Marques 2015-10-13 18:41:51 +01:00
  • 6c44bbb2a5 Added some test data. Brandon Taylor 2015-09-07 21:41:24 -04:00
  • 2543f02ce7 Fixed a typp in adminsortable/fields.py comments. Updated readme. Brandon Taylor 2015-09-07 21:26:36 -04:00
  • bee71e6d40 Refactored order_field_name out of Sortable class, instead deriving from Meta.ordering, since you have to set Meta.ordering to the order field to get the proper Sorting anyway. Brandon Taylor 2015-09-02 09:38:10 -04:00
  • 74a6cadf8d Added legacy model definition back for seamless backwards compatibility. Updated readme. Added sample legacy model implementation. Brandon Taylor 2015-08-24 12:55:56 -04:00
  • 827f5f092e Removed migrations from sample_project. Brandon Taylor 2015-08-24 11:48:30 -04:00
  • c8b1211ddd Changed travis config to only develop branch. Brandon Taylor 2015-08-24 11:43:01 -04:00
  • 51033ea8f6 Updated travis config. Brandon Taylor 2015-08-24 09:19:58 -04:00
  • c50541aa74 Version bump to 1.8.5. Updated readme. Brandon Taylor 2015-08-24 09:18:54 -04:00
  • 6c5a9058fe Minor PEP8, text and formatting tweaks. Brandon Taylor 2015-08-24 08:18:22 -04:00
  • 64b8b9dc39 Added model with custom order field and inline model with custom order field example. Brandon Taylor 2015-08-24 08:04:05 -04:00
  • 43fef78876 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. Brandon Taylor 2015-08-23 22:25:55 -04:00
  • b14d747f82 Work in progress on refactoring the Sortable class into a non-obtrusive mixin. Brandon Taylor 2015-08-23 22:23:45 -04:00
  • 422343ff93 Updated readme. Brandon Taylor 2015-07-05 23:13:03 -04:00
  • 100177f11d Version bump to 1.8.4 Brandon Taylor 2015-07-05 23:03:37 -04:00
  • 3fd7d4aff3 Re-organized setup. Brandon Taylor 2015-07-05 23:03:24 -04:00
  • 51ed60a127 Refactored unit test. Brandon Taylor 2015-07-05 23:02:44 -04:00
  • bfcd11f072 Added setup.cfg Brandon Taylor 2015-07-05 23:02:23 -04:00
  • da0da5e690 Fixes: Bug in get_previous() method #108 Added ordering to _filter_objects internal method to correctly select previous object. Brandon Taylor 2015-07-05 22:37:20 -04:00
  • d7e0ec45fa Refactored test for get_previous and get_next to iterate through all records for people. Brandon Taylor 2015-06-29 23:43:41 -04:00
  • ef05c0f7cb Version bump to 1.8.3. Updated readme with 1.8.3 information. Updated travis configuration to remove deprecated config settings. Brandon Taylor 2015-04-08 22:16:20 -04:00
  • ad09081ab4 Added exception handling for get_queryset attribute. Brandon Taylor 2015-04-08 22:06:14 -04:00
  • a5c1c53400 Added Polish translations. Version bump to 1.8.2 Brandon Taylor 2015-04-01 12:01:16 -04:00
  • 27ae0d95e8 Merge pull request #103 from TomaszGabrysiak/add-polish-translation Brandon Taylor 2015-04-01 11:59:23 -04:00