 Brandon Taylor
|
a6ea566ee8
|
Merge pull request #238 from genisysram/master
Adding code to run on Powersystem
|
2020-12-09 08:50:15 -05:00 |
|
|
Brandon Taylor
|
757deb302d
|
Merge pull request #233 from alsoicode/develop
Develop
|
2020-07-24 10:11:41 -04:00 |
|
|
Brandon Taylor
|
58e03a5ebf
|
Merge pull request #232 from blag/better-docs
Better docs
|
2020-07-24 10:11:12 -04:00 |
|
|
Brandon Taylor
|
795dc26275
|
Merge pull request #230 from alsoicode/develop
Develop
|
2020-07-21 20:30:11 -04:00 |
|
|
Brandon Taylor
|
7180833e6d
|
Merge pull request #228 from blag/update-gitignore
Add a few more generated things to .gitignore
|
2020-07-21 20:29:46 -04:00 |
|
|
Brandon Taylor
|
e90dc03b2c
|
Merge pull request #229 from blag/fix-saving-with-specified-order-value
Fix saving with specified order value
|
2020-07-21 20:29:34 -04:00 |
|
|
Brandon Taylor
|
7deb73c806
|
Merge pull request #227 from blag/develop
Fixups and improvements
|
2020-05-26 16:30:18 -04:00 |
|
|
Brandon Taylor
|
3263eb0e34
|
Merge pull request #225 from alsoicode/develop
Develop
|
2020-03-01 12:27:04 -05:00 |
|
|
Brandon Taylor
|
e0cdbba528
|
Merge pull request #223 from alsoicode/bugfix/font-awesome-icons-for-inlines
FontAwesome Icons in Inline templates
|
2020-01-14 18:53:48 -05:00 |
|
|
Brandon Taylor
|
f1ea519c90
|
Merge pull request #222 from alsoicode/bugfix/sortable-inline-tabular-selector
Bugfix/sortable inline tabular selector
|
2020-01-14 18:28:44 -05:00 |
|
|
Brandon Taylor
|
45478baa7b
|
Merge pull request #218 from cjtapper/master
Remove deprecated template tag libraries.
|
2019-12-07 17:22:30 -05:00 |
|
|
Brandon Taylor
|
71bd1be135
|
Merge pull request #214 from SerhiyRomanov/ukrainian_translation
Fixed empty django.mo file for Ukrainian translation (sorry for this)
|
2019-07-17 16:44:48 -04:00 |
|
|
Brandon Taylor
|
4b96c03f01
|
Merge pull request #212 from SerhiyRomanov/ukrainian_translation
Add Ukrainian translation
|
2019-06-22 20:38:26 -04:00 |
|
|
Brandon Taylor
|
08ee36ee3e
|
Merge pull request #209 from stephrdev/improve-querystring-filter
Improve querystring filtering.
|
2019-02-22 07:55:56 -05:00 |
|
|
Brandon Taylor
|
723b66f551
|
Update ReadMe
Added Buy Me A Coffee link
|
2018-09-13 20:25:19 -04:00 |
|
|
Brandon Taylor
|
842d748935
|
Merge pull request #191 from timur-orudzhov/change-list-filters-support
add support for django admin filters
|
2018-05-17 12:49:22 -04:00 |
|
|
Brandon Taylor
|
a90449a8a5
|
Merge pull request #189 from lumatijev/croatian-translation
Added Croatian translation
|
2018-03-22 14:13:58 -04:00 |
|
|
Brandon Taylor
|
4eed5b1e2d
|
Merge pull request #188 from rfleschenberg/issue-187
Unlocalize object IDs
|
2018-03-21 09:44:24 -04:00 |
|
|
Brandon Taylor
|
f6522d0a49
|
Merge pull request #185 from ixc/ixc/improve-performance-master
Fixed #162 -- Improve performance of sort view.
|
2018-03-19 21:19:20 -04:00 |
|
|
Brandon Taylor
|
f2df915a13
|
Merge pull request #183 from bashu/patch-1
let there be (correct) colour
|
2018-02-16 16:19:30 -05:00 |
|
|
Brandon Taylor
|
dcee65eab5
|
Merge pull request #182 from peterisb/master
Added Latvian translation.
|
2018-02-08 15:53:00 -05:00 |
|
|
Brandon Taylor
|
7bd6dfdbf8
|
Merge pull request #181 from simenheg/norwegian-translation
Add Norwegian Bokmål translation
|
2018-02-05 11:41:31 -05:00 |
|
|
Brandon Taylor
|
115aad641d
|
Update README.md
Updated Travis urls
|
2017-03-21 15:09:33 -04:00 |
|
|
Brandon Taylor
|
2ec2722c67
|
Merge pull request #168 from jaap3/modernize
Remove fallbacks for Django < 1.8
|
2017-03-21 06:38:17 -04:00 |
|
|
Brandon Taylor
|
9fa1fb13a5
|
Update setup.py
|
2017-03-21 06:10:58 -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 |
|
|
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 |
|
|
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 |
|
|
Brandon Taylor
|
ae8a67bae2
|
Merge pull request #164 from Flimm/badges
Add two PyPI badges
|
2017-03-07 06:22:04 -05: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 |
|
|
Brandon Taylor
|
4d01ec19b5
|
Update README.md
Added note about ordering field name.
|
2016-12-01 21:52:11 -05:00 |
|
|
Brandon Taylor
|
81f2faebc6
|
Merge pull request #157 from yigor/master
Proper context and breadcrumbs
|
2016-11-02 21:16:51 -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 |
|
|
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 |
|
|
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
|
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 |
|