Commit graph

531 commits

Author SHA1 Message Date
Audrey Roy
86f60f8b8e Merge pull request #24 from inglesp/issue11
Merge - Add example app
2013-05-18 03:17:05 -07:00
Audrey Roy
100d475e26 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:13:13 +02:00
Peter Inglesby
b9495b6781 Add example app 2013-05-18 12:12:57 +02:00
Audrey Roy
87b701e92d Merge pull request #23 from rivol/master
Merge - Fix the admin2 -> djadmin2 package rename
2013-05-18 03:12:12 -07: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
Daniel Greenfeld
2b03ee279e fixing seriously broken views.py 2013-05-18 10:47:53 +02:00
Daniel Greenfeld
2c759931ab Update contributing.rst 2013-05-18 10:14:26 +03:00
Daniel Greenfeld
6f2c080670 Update contributing.rst 2013-05-18 10:13:14 +03:00
Daniel Greenfeld
3157fa6d3f Update contributing.rst 2013-05-18 09:12:17 +02:00
Daniel Greenfeld
114e7e8f96 Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 09:06:55 +02:00
Daniel Greenfeld
3b2001c6a0 Prep for #16 2013-05-18 09:06:40 +02:00
Daniel Greenfeld
d3d1d07642 Update README.rst 2013-05-18 09:44:31 +03:00
Daniel Greenfeld
8eb4c0d4c0 Update README.rst 2013-05-18 01:17:56 +03:00
Daniel Greenfeld
9cd1fc74b0 Adding more boilerplate for tomorrow 2013-05-18 00:15:45 +02:00
Daniel Greenfeld
a2aa05e53a More work to try and get the initial index working. Not sure why this works with Mongonaut but not here 2013-05-17 23:40:04 +02:00
Daniel Greenfeld
0beeabdcca Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-17 13:00:13 +02:00
Daniel Greenfeld
da03c6769f fix djangorestframework dependency 2013-05-17 12:59:38 +02:00
Daniel Greenfeld
fa5ef8b32b cleanup 2013-05-17 12:38:39 +02:00
Daniel Greenfeld
b20f0f7881 Merge pull request #1 from gregmuellegger/master
;)
2013-05-16 22:50:42 -07:00
Gregor Müllegger
db48190b44 Fixing @pydanny's email in contributers file. 2013-05-17 00:27:37 +02:00
Daniel Greenfeld
0d9681f2fc Work on stuff 2013-05-14 16:56:29 +02:00
Daniel Greenfeld
b3485503d2 Should work, right? 2013-05-14 14:59:12 +02:00
Daniel Greenfeld
8fcbcfecbd moar definitions of how this is going to work 2013-05-14 14:44:02 +02:00
Daniel Greenfeld
4aeb55be89 moar definitions of how this is going to work 2013-05-14 14:42:40 +02:00
Daniel Greenfeld
80451d7c73 More conversion work 2013-05-14 14:37:11 +02:00
Daniel Greenfeld
cdd51bce7f boilerplate and early urls code 2013-05-14 14:28:43 +02:00
Daniel Greenfeld
7d46cc0da6 boilerplate 2013-05-14 14:24:31 +02:00
Daniel Greenfeld
568f436d7e first commit 2013-05-14 14:12:32 +02:00