Commit graph

18 commits

Author SHA1 Message Date
Daniel Greenfeld
3b7f4d7fe8 Views cleanup during merge. 2013-05-18 15:26:47 +02:00
Raphael Kimmig
cf01b720e0 add initial views 2013-05-18 14:36:14 +02:00
Daniel Greenfeld
e59857d955 Merge pull request #39 from audreyr/master
Now using the Bootstrap theme stub as per #9
2013-05-18 05:00:45 -07:00
Audrey Roy
9f435fc595 Getting admin2 to use the bootstrap theme properly. 2013-05-18 13:57:22 +02:00
Daniel Greenfeld
5e7c9df2e0 Merge pull request #38 from audreyr/master
Give unicode methods to models in example project
2013-05-18 04:51:32 -07:00
Daniel Greenfeld
bbfc8ebe36 Design documenting 2013-05-18 13:45:31 +02:00
Audrey Roy
6d59986241 Stub out templates for #9 2013-05-18 13:37:46 +02:00
Audrey Roy
c464645cc3 Enabled admin at admin/ in example. Put admin2 at admin2/. 2013-05-18 13:17:15 +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
Audrey Roy
2179d3e338 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:24:30 +02:00
Rivo Laks
3247380382 Don't import url patterns from deprecated module 2013-05-18 12:19:47 +02:00
Audrey Roy
100d475e26 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:13:13 +02:00
Audrey Roy
4885b27110 Add Bootstrap theme files. 2013-05-18 12:10:10 +02:00
Rivo Laks
04be286884 Fix the admin2 -> djadmin2 package rename 2013-05-18 12:07:27 +02:00
Daniel Greenfeld
62abced904 Merge branch 'issue2' of git://github.com/inglesp/django-admin2 into inglesp-issue2 2013-05-18 11:56:16 +02:00
Peter Inglesby
7c5e7e6883 Rename package to djadmin2 2013-05-18 11:52:03 +02:00