4e38d91138
Merge pull request #88 from fusionbox/change-view-args
Brandon Taylor
2014-09-05 16:31:10 -04:00
41fa948bb2
ModelAdmin.change_view takes a form_url kwarg
Scott Clark
2014-09-04 14:07:55 -06:00
d3b780593e
Update usage.rst
Brandon Taylor
2014-08-25 09:28:21 -04:00
88bdb3816f
Update usage.rst
Brandon Taylor
2014-08-25 09:27:34 -04:00
ac7e03c611
Update usage.rst
Brandon Taylor
2014-08-25 09:26:08 -04:00
76f3541c0d
Update usage.rst
Brandon Taylor
2014-08-25 09:25:47 -04:00
6c04e3b8df
Update usage.rst
Brandon Taylor
2014-08-25 09:25:19 -04:00
63e123e4fc
Update usage.rst
Brandon Taylor
2014-08-25 09:24:22 -04:00
969ee2f653
Update usage.rst
Brandon Taylor
2014-08-25 09:23:58 -04:00
ed18886e2c
Updated ReadMe
Brandon Taylor
2014-08-21 22:17:14 -04:00
5e307d687b
Version bump to 1.7.1. Added Brazilian Portugese locale. Fixed minor css scoping issue that caused stacked template items that were sortable to not display the 'move' cusor type. Fixed comment line in manage.py for PEP8.
Brandon Taylor
2014-08-21 22:14:36 -04:00
cf490e7918
Changed toctree max depth to 3. Minor refactor on headers for usage docs
Brandon Taylor
2014-08-21 12:32:36 -04:00
67b6cc0713
Added license doc
Brandon Taylor
2014-08-21 00:29:42 -04:00
815477aefa
Added future doc
Brandon Taylor
2014-08-21 00:28:45 -04:00
7485dc0289
Added status docs.
Brandon Taylor
2014-08-21 00:26:25 -04:00
20829d106a
Added known issues docs.
Brandon Taylor
2014-08-21 00:22:53 -04:00
87917cfadb
Added Django CMS docs.
Brandon Taylor
2014-08-21 00:21:03 -04:00
b3c9fffbfa
Added usage docs.
Brandon Taylor
2014-08-21 00:17:36 -04:00
512440f9e5
Added configuration and testing docs.
Brandon Taylor
2014-08-20 23:57:01 -04:00
b031d458cd
Added more information to index
Brandon Taylor
2014-08-20 23:49:26 -04:00
e43d7d67c2
Added more information to index
Brandon Taylor
2014-08-20 23:34:31 -04:00
279ce2e71f
Working on Sphinx docs
Brandon Taylor
2014-08-20 20:47:13 -04:00
5a93437f11
Merge pull request #84 from GabLeRoux/patch-1
Brandon Taylor
2014-07-14 22:49:28 -04:00
29a11af412
Update README.md
Gabriel Le Breton
2014-07-14 22:46:34 -04:00
1b2461444b
Merged Python 2.6 comptaibility features. Version bump. Updated readme.
Brandon Taylor
2014-05-29 10:24:54 -04:00
e19edc7d9e
Merge pull request #81 from EnTeQuAk/feature/python-2.6
Brandon Taylor
2014-05-29 10:22:15 -04:00
6f25684e35
Version bump to 1.6.9. Merged pull request from @kirov to fix multiple exception handling.
Brandon Taylor
2014-05-28 08:15:39 -04:00
10e3dd938a
Merge pull request #82 from kirov/patch-1
Brandon Taylor
2014-05-28 08:13:08 -04:00
1ebf86b4aa
Updated README. Version bump to 1.6.7
Brandon Taylor
2014-04-08 07:52:26 -04:00
29a05bcd63
Merge pull request #79 from jerivas/es-locale
Brandon Taylor
2014-04-08 07:48:29 -04:00
6a09efc8bd
Localized to Spanish.
Eduardo Rivas
2014-04-08 01:08:29 -06:00
13549da827
Removed un-needed format specificity.
Brandon Taylor
2014-03-05 09:24:32 -05:00
5a60408076
Merge pull request #77 from iambrandontaylor/multi-sorting-groups
Brandon Taylor
2014-03-05 09:12:35 -05:00
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.
Brandon Taylor
2014-03-05 09:10:47 -05:00
af6c8f2e15
Merge pull request #76 from immensa/master
Brandon Taylor
2014-02-13 09:14:00 -05:00
bc536509a4
update new version - translate pt_BR
gladson
2014-02-13 02:28:52 -04:00
53df734e15
Fixed jQuery namespace on inline model JavaScript includes. Version bump to 1.6.5. Updated readme.
Brandon Taylor
2014-02-12 16:22:04 -05:00
d5d6f54135
Update README.md
Brandon Taylor
2014-02-05 15:11:49 -05:00
77385bddeb
Update README.md
Brandon Taylor
2014-02-05 15:10:32 -05:00
e80a633edb
Updated README. Version bump to 1.6.4
Brandon Taylor
2014-02-05 11:24:48 -05:00
95e21eea5e
Merge branch 'order-subset'
Brandon Taylor
2014-02-05 11:13:58 -05:00
3e072cf590
Merge branch 'order-subset' of github.com:iambrandontaylor/django-admin-sortable into order-subset
Brandon Taylor
2014-02-05 11:08:09 -05:00
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.
Brandon Taylor
2014-02-05 11:06:15 -05:00
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.
Brandon Taylor
2014-02-05 11:06:15 -05:00
e51f7535ca
Added Person model with ordering_subset and initial data.
Brandon Taylor
2014-02-05 09:36:03 -05:00
2ca19f05c1
Updated string formatting on multiple foreign key exception.
Brandon Taylor
2014-02-05 08:26:22 -05:00
c4c27e1dd1
Merge pull request #73 from ygwain/master
Brandon Taylor
2014-01-13 05:42:36 -08:00
76ff3ae7f9
Merged pull requests 66, 68 and 70. Updated readme. Version bump to 1.6.3
Brandon Taylor
2013-12-03 07:42:32 -05:00
c128d022c2
Merge pull request #70 from Leftfield/master
Brandon Taylor
2013-12-03 04:36:09 -08:00
29eeeaf1e6
Merge pull request #68 from Alp-Phone/master
Brandon Taylor
2013-12-03 04:35:22 -08:00
644583c08f
enable js correctly for generic inlines
João Miguel Neves
2013-12-03 11:32:31 +00:00
e48f461ba3
Merge branch 'master' of github.com:iambrandontaylor/django-admin-sortable
Moritz Pfeiffer
2013-12-03 10:48:45 +01:00
818a231a1a
Reordering with unsaved inlines is faulty and counter intuitive. In this commit I added a javascript alert that prompts the user to save their changes before reordering if unsaved inlines are detected. Please review and let me know if this in compliance with your guidelines.
Moritz Pfeiffer
2013-12-03 10:45:17 +01:00
629bfb058d
Enabled sample project localization to test translations.
Moritz Pfeiffer
2013-12-03 10:43:24 +01:00
ab38988698
Added missing templates
Moritz Pfeiffer
2013-12-03 10:43:00 +01:00
c76f8d0f81
Merge pull request #66 from Alp-Phone/master
Brandon Taylor
2013-11-29 05:38:04 -08:00
ad73a806b3
Added German translation
Moritz Pfeiffer
2013-11-29 10:50:18 +01:00
0e390d8e22
Updated readme with instructions for extending the inline change form templates.
Brandon Taylor
2013-11-25 22:08:08 -05:00
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.
Brandon Taylor
2013-11-25 22:03:20 -05:00
03a3a0a51d
Update README.md
Brandon Taylor
2013-11-25 21:34:51 -05:00
41be929a7d
Fixed path to jQueryUI in change form. Version bump to 1.6.1
Brandon Taylor
2013-11-25 21:32:34 -05:00
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.
Brandon Taylor
2013-11-23 09:32:51 -05:00
85eef4909a
Merge pull request #62 from foonicorn/features/contenttype
Brandon Taylor
2013-11-23 05:48:50 -08:00
10937eb6d8
Replace deprecated mimetype with content_type
Andreas Hug
2013-11-23 12:18:09 +01:00
4aa4a99ff6
Merge pull request #59 from PyKaB/patch-1
Brandon Taylor
2013-11-07 09:18:58 -08:00
6195cd7390
Make fast query with "count(*)" instead selecting all data
Alexei
2013-11-06 13:55:40 +03:00
e7da934c2e
Merge pull request #58 from ygwain/master
Brandon Taylor
2013-11-03 06:26:02 -08:00
b79e806961
Ignore requests with wrong data, e.g. {u'indexes': [u'34,32,35,1,,33,7,5,3,29,27,4,11,14,13,31']}
A.Sichkar
2013-10-31 14:54:28 +02:00
0361755256
Added Django-CMS integration instructions.
Brandon Taylor
2013-09-23 09:10:56 -04:00
b411576059
Merged README. Included previously forgotten js file.
Brandon Taylor
2013-09-23 08:45:18 -04:00
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.
Brandon Taylor
2013-09-23 08:41:10 -04:00
8a7066b248
Update README.md
Brandon Taylor
2013-09-05 15:18:22 -04:00
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.
Brandon Taylor
2013-09-05 14:09:50 -04:00
b8bb4e4d6b
Merge pull request #55 from dokterbob/onemorechange
Brandon Taylor
2013-09-05 04:49:40 -07:00
542f3fc1fc
Patch needed one more change.
Mathijs de Bruin
2013-09-04 22:22:19 +02:00
6e334a2ef9
Merge pull request #54 from dokterbob/iambrandontaylor-csrf
Brandon Taylor
2013-09-04 13:18:33 -07:00
1bf1f96703
Remove CSRF exemption where it did not belong.
Mathijs de Bruin
2013-09-04 22:15:28 +02:00
53291d2fd7
Add CSRF tweak to admin template.
Mathijs de Bruin
2013-09-04 22:14:32 +02:00
e7263ac5d0
Merge pull request #53 from dokterbob/iambrandontaylor
Brandon Taylor
2013-09-04 12:57:23 -07:00
7f043f588b
Added jQuery tool for doing proper CSRF with AJAX.
Mathijs de Bruin
2013-09-04 21:57:04 +02:00
a4dd8c51da
Forgotten little comma causing lots of havoc.
Mathijs de Bruin
2013-09-04 21:44:39 +02:00
2aab380f8a
Bumped version to 1.5.4
Brandon Taylor
2013-08-22 12:18:09 -04:00
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.
Brandon Taylor
2013-08-22 12:17:38 -04:00
5546387733
Merge pull request #51 from foonicorn/features/translation
Brandon Taylor
2013-08-22 08:31:23 -07:00
89629cd80f
Make inline hint translatable
Andreas Hug
2013-08-22 17:01:26 +02:00
e22152ba81
Bumped version to 1.5.3
Brandon Taylor
2013-07-19 08:36:06 -05:00
f1e6198530
Merge pull request #49 from marcelometal/master
Brandon Taylor
2013-07-19 06:32:36 -07:00
9d128ffc79
Removed executable permissions from many files
Marcelo Jorge Vieira
2013-07-18 22:45:22 -03:00
83e275bd20
Merged pull request 44. Updated README to include information about backward-incompatible changes in 1.5.2
Brandon Taylor
2013-06-26 10:05:32 -04:00
37ebbf0dde
Merge pull request #44 from acgray/master
Brandon Taylor
2013-06-26 06:58:34 -07:00
6f279b1b8e
Fix typo
Adam Gray
2013-06-24 18:16:08 +01:00
2354f345dd
Change STATIC_URL to use {% static %} tag
Adam Gray
2013-06-24 18:13:36 +01:00
b3fd59da02
Added an override for the admin add_view to prevent the change form template extends variable from not being populated.
Brandon Taylor
2013-06-20 15:47:41 -04:00
Brandon Taylor