Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-05-12 09:13:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
964 commits 3 branches 11 tags 3.7 MiB
Commit graph

472 commits

Author SHA1 Message Date
Kamil Gałuszka
6144278a9e fix for py3 basestring problem with six 2014-10-10 22:19:04 -05:00
Kamil Gałuszka
03ebd91f78 fixing django 1.7 errors 2014-10-10 22:19:04 -05:00
Kamil Gałuszka
2f43a66055 fixing possible errors on pypy2 2014-10-10 22:19:03 -05:00
Kamil Gałuszka
84bf9f2073 fixing test with modelforms 2014-10-10 22:19:03 -05:00
Kamil Gałuszka
b341d763f0 many fixes to django-admin2 with py3 
and django 1.7 compatybility
 2014-10-10 22:19:02 -05:00
Mosson, Andrew
5ff619979f fix for django-braces>=1.4.0 
braces 1.3 views exported AccessMixin
in braces 1.4 this was moved views._access and not exported in views
not sure if this was the intent of braces or an oversight
if intent - should look at AccessMixin vs. using a more specific mixin

tested against django-braces 1.3.1 and django-braces 1.4.0
 2014-06-19 10:12:13 -07:00
Daniel Greenfeld
2079a7be9b bump to 0.6.1 2014-02-26 10:21:56 -08:00
Douglas Miranda
af82d2b9b1 Fix: "there are no" instead "there isn't" on the empty form message. 2013-12-17 23:43:49 -03:00
Germano Gabbianelli
606db2fe7a Added tests for pull-request #386 
1. Custom views should be prepended to the 'views' list, otherwise they
   could be shadowed by views of the superclass.
2. Custom views should not be added to the superclass 'views' list.
   Instead a new list should be created and assigned to the class.
 2013-12-05 12:48:55 +01:00
Germano Gabbianelli
4c35c506a7 Fixed ModelAdminBase2 to allow overriding existent views. 2013-12-03 11:34:05 +01:00
Germano Gabbianelli
4a4b11176e "djadmin2theme_default" should not be hard-coded in templatetags. 2013-12-03 11:33:39 +01:00
Gregor Müllegger
4072d4c009 Fixing failing tests, that only occured on Travis. You cannot use a plane, generic View in the Admin since it always needs to be a model based one. At least unless you overwrite the get_*_kwargs method. 2013-11-28 18:11:12 +01:00
Gregor Müllegger
34b98fb8ac Better error messages for admin views that fail to instantiate. 2013-11-28 18:11:04 +01:00
Gregor Müllegger
ca86c60499 Django 1.6 changed the MultiWidget.needs_multipart_form attribute into a property. We didn't plan for that in floppify code yet. We check now for properties which makes it compatible with Django 1.6 and more futureproof. Part of a Fix for #387. 2013-11-28 13:12:50 +01:00
Gregor Müllegger
d9530074e4 Django 1.6 changed the widgets its using for IntegerFields, this needed adjustment in the floppifying rule for those fields. Part of a Fix for #387. 2013-11-28 13:12:50 +01:00
Douglas Miranda
2f8f890ce0 A nice margin for a nice message. :) 2013-09-27 00:52:51 -04:00
Douglas Miranda
b169d28653 Show a nice message if the have no visible fields. 2013-09-27 00:52:18 -04:00
Douglas Miranda
ff721a2ef6 Adding View Descriptions for "registry" and "app_verbose_names". 2013-09-24 03:27:38 -04:00
Daniel Greenfeld
a7feb05ca4 bump to 0.6.0rc1 2013-09-12 16:44:33 +02:00
Daniel Greenfeld
cfce0f4afb Add @yarbelk to authors and update the history file 2013-09-11 22:13:00 +02:00
yarbelk
690401d604 Fix missing enctype="multipart/form-data" when needed 
- add app example.files with tests, based on example2.
- add check in base update template which checks if
  form.is_multitype and adds the encoding for it
- update gitignore to ignore the uploaded media folder
- add test to blog to ensure that the create form is not
  multipart encoded
 2013-09-11 22:20:38 +08:00
Douglas Miranda
087a918542 fix TypeError - the right way () 2013-08-26 20:20:09 -04:00
Daniel Greenfeld
33b83ead5f Merge pull request #366 from douglasmiranda/implementing-app-verbose-name 
Implementing "app verbose name"
 2013-08-13 16:51:09 -07:00
Douglas Miranda
cfba14384e Tests for the "app verbose name". 2013-08-05 03:39:17 -04:00
Douglas Miranda
08f38c26c2 Showing the app verbose names on the templates. 2013-08-05 03:36:37 -04:00
Douglas Miranda
7f830c8aeb Registering and making the app verbose names accessible into the views. 2013-08-05 03:35:03 -04:00
Kevin Diale
35cb0bcc75 "only_selected" flag exists to specify whether it should affect the 
whole queryset or just those that are selected.
 2013-08-02 13:58:57 -04:00
Daniel Greenfeld
fa86f85afc Remove accidental dependency on django.contrib.admin 2013-08-02 12:52:38 +02:00
Kevin Diale
1aa4ee36d6 Implemented ordering, tests in the next commit. 2013-08-01 12:00:03 -04:00
Daniel Greenfeld
7c3bc1e0b0 merge 2013-08-01 12:39:21 +02:00
Daniel Greenfeld
68cc955fce Merge branch 'admin-date-hierarchy' of git://github.com/powersurge360/django-admin2 into powersurge360-admin-date-hierarchy 2013-08-01 12:31:38 +02:00
Daniel Greenfeld
3b0526b335 Merge branch 'develop' of github.com:pydanny/django-admin2 into develop 2013-08-01 12:28:39 +02:00
Kevin Diale
03261fa461 Should be ready to go! 2013-07-31 17:43:05 -04:00
Kevin Diale
bb127c9483 Added unit tests. 2013-07-31 17:31:23 -04:00
Kevin Diale
bab18c97c1 Interface is most of the way there. 2013-07-31 14:58:08 -04:00
Kevin Diale
966e549ace Basic interface done. 2013-07-31 12:57:48 -04:00
the5fire
6f531ea09f Test for the ModelAdmin2 get_index_kwargs 2013-07-31 07:17:07 +08:00
Kevin Diale
8dc0821539 Left in a wee bit of debugging code. 2013-07-30 17:20:27 -04:00
Kevin Diale
29eaa661d5 Drilling down works on a functional level. Gotta set up interface and 
tests.

On a related note, TAKE THAT DJANGO FILTERS.
 2013-07-30 16:28:24 -04:00
Kevin Diale
6ff47746df Added in actions_selection_counter, will add tests/polish next commit. 2013-07-29 14:48:05 -04:00
the5fire
e8c5e9ec52 add admin model list pagination template 2013-07-28 11:19:05 +08:00
the5fire
ee0c1b0031 fix list_per_page can't enable in model list view 2013-07-28 10:26:08 +08:00
Andrews Medina
3c7fc0fc0e Merge branch 'develop' into admin_view 
Conflicts:
	djadmin2/types.py
 2013-07-26 17:55:55 -03:00
Andrews Medina
26ba68115f Using six to set the ModelAdminBase2 metaclass. 2013-07-26 17:41:58 -03:00
Chris Jones
4959a095c4 fix merge error. 2013-07-18 17:44:19 -07:00
Kenneth Love
3844a952c0 merge 2013-07-18 17:41:33 -07:00
Kenneth Love
738e3a9dd8 template changes 2013-07-18 17:40:54 -07:00
Chris Jones
e7f8170237 Ooooooooo pretty. 2013-07-18 17:33:19 -07:00
Kenneth Love
af11cb012e Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 17:31:11 -07:00
Kenneth Love
e5f1940f3e action_type property 2013-07-18 17:31:08 -07:00
Chris Jones
57ef2a428c Nicer to look at. 2013-07-18 17:30:41 -07:00
Chris Jones
69f2a357f8 Why don't you PEP your 8! Add in change messages. 2013-07-18 17:23:48 -07:00
Kenneth Love
52c337a72c force_text for object_repr and condition on history link 2013-07-18 17:16:07 -07:00
Kenneth Love
acae0a2620 icons 2013-07-18 17:02:40 -07:00
Kenneth Love
99ae00a0ae show user that performed action 2013-07-18 16:56:08 -07:00
Kenneth Love
802265b60f Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 16:54:26 -07:00
Kenneth Love
ee2ca9feff template updates 2013-07-18 16:54:22 -07:00
Chris Jones
ee1c90cd9f Working model history view. 2013-07-18 16:51:16 -07:00
Kenneth Love
a7951353a8 Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 16:38:20 -07:00
Kenneth Love
7dbf50426f model_history template 2013-07-18 16:38:13 -07:00
Chris Jones
d62b612583 nevermind. 2013-07-18 16:38:00 -07:00
Chris Jones
f7ef575709 Should be a detail view. 2013-07-18 16:37:18 -07:00
Chris Jones
82d9e7ae65 PEP8 love. 2013-07-18 16:36:31 -07:00
Chris Jones
4089ad4aab PEP8 all the things. Add in new history url. 2013-07-18 16:30:40 -07:00
Chris Jones
555588f13c PEP8 2013-07-18 16:08:38 -07:00
Chris Jones
ae39a26e13 Use model properties for action ints. 2013-07-18 15:58:31 -07:00
Kenneth Love
598b0a704f basics for recording history 2013-07-18 13:59:08 -07:00
Chris Jones
14d2a20431 Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 13:46:17 -07:00
Chris Jones
6273e68dde Stealing the logger from the old admin. 2013-07-18 13:46:00 -07:00
Kenneth Love
76ab676530 more html 2013-07-18 13:40:50 -07:00
Kenneth Love
ef77c8242d Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history 2013-07-18 13:06:04 -07:00
Kenneth Love
4cfe10e645 actual data in history template 2013-07-18 13:05:56 -07:00
Chris Jones
fb0e73a37e PEP8 2013-07-18 13:04:47 -07:00
Kenneth Love
5ed5123836 started on history 2013-07-18 13:00:14 -07:00
Daniel Greenfeld
9e4d2ec039 Move default theme to it's own app. This way we are following the same pattern that other themes will have to use fix #333 2013-07-18 17:55:08 +02:00
Daniel Greenfeld
82e56bdae5 prep for #273 2013-07-18 16:32:50 +02:00
Ludvig Wadenstein
3cc592a906 Inlines separated into stacked and tabular 2013-07-18 15:02:07 +02:00
Daniel Greenfeld
9957e782c3 This should help with migration efforts and related documentation like #284 2013-07-16 20:13:11 +02:00
Ludvig Wadenstein
116ae29dab Removed some duplication of savebutton markup in templates 2013-07-15 22:47:10 +02:00
Daniel Greenfeld
854832accd Fix setup.py issue 2013-07-14 15:29:20 +02:00
Daniel Greenfeld
54c4bcf933 prep for release of 0.5.1. 2013-07-14 11:50:13 +02:00
d1ffuz0r
ae0ab23b12 unused attribute was removed 2013-07-10 10:59:39 +07:00
Daniel Greenfeld
c545912561 Merge pull request #322 from douglasmiranda/fix-fixed-height 
fixing the fixed height of .change_form
 2013-07-09 05:55:56 -07:00
Danilo Bargen
bed88973d7 Compiled all messages. Ready for release. Fixes #314, refs #317 2013-07-09 12:22:36 +02:00
Danilo Bargen
783401415d Added updated translation files from transifex 2013-07-09 12:21:07 +02:00
Danilo Bargen
aeb8a84726 Pulled new translations 2013-07-09 11:34:40 +02:00
Douglas Miranda
90342afba2 fixing the fixed height of .change_form in order to provide an "auto height" 2013-07-09 03:04:28 -04:00
d1ffuz0r
8def10b2da Fixed #292 added missing default columns and filters 2013-07-09 13:10:48 +07:00
Daniel Greenfeld
c6e077250e update release to 0.5.0 for #317 2013-07-08 19:28:04 +02:00
Daniel Greenfeld
da6ff9f3ce Tweaks to make #308 work 2013-07-08 19:14:19 +02:00
Daniel Greenfeld
a909ab1517 Merge of #308 2013-07-08 19:08:18 +02:00
Daniel Greenfeld
2ec6441de3 Merge pull request #309 from dbrgn/actions_on_top_bottom 
Implemented actions_on_top and actions_on_bottom
 2013-07-08 09:58:12 -07:00
Danilo Bargen
f178f2fccd Compiled messages for German and Slovak 2013-07-08 16:16:02 +02:00
Danilo Bargen
ec0300fa32 Added translated locales for Slovak 2013-07-08 10:57:39 +02:00
Danilo Bargen
18fda874b0 Added translated locales for German 2013-07-08 10:54:32 +02:00
Eleonore9
3ca4fa394f for #308 this styles the save_on_top 2013-07-07 18:19:33 +02:00
bootandy
06c2e81392 allow sort by field 2013-07-07 16:48:21 +02:00
Danilo Bargen
4977f269b5 Implemented actions_on_top and actions_on_bottom (fixes #267, #268) 2013-07-07 16:46:59 +02:00
Daniel Greenfeld
47df410c07 merge 2013-07-07 16:13:48 +02:00
Daniel Greenfeld
e2f6bb859e Add page_title link 2013-07-07 15:50:55 +02:00