Commit graph

23 commits

Author SHA1 Message Date
Daniel Greenfeld
a076cca859 Merge pull request #64 from audreyr/list-view-frontend-work
List view frontend work
2013-05-19 01:03:51 -07:00
Daniel Greenfeld
774b49ed9f merge 2013-05-19 10:01:50 +02:00
Daniel Greenfeld
29fc882c4b merge from @rivo 2013-05-19 09:53:37 +02:00
Daniel Greenfeld
e963553361 merge in from @AndrewIngram for #58 2013-05-19 09:47:42 +02:00
Audrey Roy
3722523f0d Merge remote-tracking branch 'upstream/master' into list-view-frontend-work 2013-05-19 09:38:37 +02:00
Audrey Roy
9e647ae4ee More of #61 2013-05-18 18:37:20 +02:00
Daniel Greenfeld
e48641cde9 Index work 2013-05-18 18:33:43 +02:00
Audrey Roy
0938f570c1 Display model count/name at bottom 2013-05-18 18:25:36 +02:00
Audrey Roy
74c86f9c3b Partial checkin of #61 2013-05-18 18:16:25 +02:00
Daniel Greenfeld
55673a8649 Merge 2013-05-18 18:04:40 +02:00
Audrey Roy
a99952375c Display model name in template 2013-05-18 17:52:53 +02:00
Rivo Laks
bea52a38df Merge remote-tracking branch 'upstream/master' into permissions
Some cleanup as well.
2013-05-18 17:50:07 +02:00
Rivo Laks
e7861323ca Integrate permissions into views
Views now ensure that the user has corresponding permissions.
Also, action buttons, e.g. Add, are shown only when the user can actually do that.
2013-05-18 17:44:56 +02:00
Andrew Ingram
6cbf712548 Fix the errors caused by me deleting utils.py
I'm a bad person.
2013-05-18 17:20:49 +02:00
Audrey Roy
e3836ca986 Fix incorrect template being extended. 2013-05-18 16:53:17 +02:00
Andrew Ingram
88418efc7b Added django admin style registration (for now)
Big changes to how things are structured, ModelAdmin2 handles its views and urls
2013-05-18 15:43:44 +02:00
Raphael Kimmig
cf01b720e0 add initial views 2013-05-18 14:36:14 +02:00
Audrey Roy
9f435fc595 Getting admin2 to use the bootstrap theme properly. 2013-05-18 13:57:22 +02:00
Audrey Roy
6d59986241 Stub out templates for #9 2013-05-18 13:37:46 +02:00
Daniel Greenfeld
44ae271a2e Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 12:57:11 +02:00
Daniel Greenfeld
7773816c07 getting the views to work 2013-05-18 12:57:01 +02:00
Audrey Roy
4b21cc701c Breakout index/base templates 2013-05-18 12:49:08 +02:00
Peter Inglesby
7c5e7e6883 Rename package to djadmin2 2013-05-18 11:52:03 +02:00