 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 |
|
|
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 |
|
|
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 |
|
|
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
|
242d5bb7ac
|
Merge pull request #136 from avoine/master
js: fix indexes finding for tabular inlines
|
2016-03-10 16:14:37 -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 |
|
|
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 |
|
|
Brandon Taylor
|
5ebcfed2ae
|
Merge pull request #127 from Flimm/document-csrf-cookie-httponly
Document incompatibility with CSRF_COOKIE_HTTPONLY
|
2016-01-28 20:45:26 -05:00 |
|
|
Brandon Taylor
|
bb84c6e2c8
|
Merge pull request #126 from ekinertac/master
Syntax Highlight on README.md
|
2016-01-28 09:55:52 -05:00 |
|
|
Brandon Taylor
|
42224bc626
|
Merge pull request #124 from mexicat/patch-1
Fix typo in warning
|
2016-01-12 10:28:33 -05:00 |
|
|
Brandon Taylor
|
de823d912c
|
Merge pull request #123 from Flimm/setup-py-python-3
Update setup.py to mention both Python 2 and 3
|
2015-12-22 09:41:37 -05:00 |
|
|
Brandon Taylor
|
ba9e477f2f
|
Merge pull request #122 from camilonova/patch-1
Typo. Fixes #116
|
2015-12-21 12:04:12 -05:00 |
|
|
Brandon Taylor
|
114545618a
|
Merge pull request #121 from KuroiDOC/master
Variable jQuery location for Django version 1.9 and above
|
2015-12-21 11:56:32 -05:00 |
|
|
Brandon Taylor
|
9e4396b2b1
|
Merge pull request #113 from itbabu/itbabu-remove-load-url-from-future
Remove `{% load url from future %}`
|
2015-11-14 10:08:44 -05:00 |
|
|
Brandon Taylor
|
5ed9e18e08
|
Merge pull request #112 from Thermondo/master
fix slow get_is_sortable when using with inline admins
|
2015-11-11 12:02:52 -05:00 |
|
|
Brandon Taylor
|
1589680653
|
Merge pull request #111 from zakdoek/master
Fix bug when used with descending order
|
2015-10-20 08:26:49 -04:00 |
|
|
Brandon Taylor
|
72766ab008
|
Merge pull request #110 from jorge-marques/master
Takes inline's show_change_link attribute into account
|
2015-10-16 09:04:19 -04:00 |
|
|
Brandon Taylor
|
27ae0d95e8
|
Merge pull request #103 from TomaszGabrysiak/add-polish-translation
add polish translation
|
2015-04-01 11:59:23 -04:00 |
|
|
Brandon Taylor
|
f09a6b5bff
|
Merge pull request #102 from flyingeek/master
fix sortable function not found
|
2015-03-24 09:04:07 -04:00 |
|
|
Brandon Taylor
|
b8b644b77c
|
Merge pull request #101 from a1tus/master
Refactored import from generic module to get rid of DeprecationWarning in Django 1.8+
|
2015-02-26 09:08:40 -05:00 |
|
|
Brandon Taylor
|
50b113bac1
|
Merge pull request #100 from aptivate/fix_sortable_fk_changelist
Fix sort changelist for objects with sortable fk
|
2015-01-12 22:52:30 -05:00 |
|
|
Brandon Taylor
|
0bff2f893f
|
Merge pull request #99 from mark-ignacio/master
Remove print statements and fix shared/object_rep.html
|
2014-12-27 12:41:32 -05:00 |
|
|
Brandon Taylor
|
936ac0fd34
|
Merge pull request #98 from matt-leach/master
adding travis 1.5.10 test back in
|
2014-12-22 15:59:47 -05:00 |
|
|
Brandon Taylor
|
e83e31cb22
|
Merge pull request #97 from matt-leach/master
Django 1.5.x compatibility updates
|
2014-12-22 10:19:32 -05:00 |
|