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

405 commits

This branch
This branch
All branches
Author SHA1 Message Date
Audrey Roy
ee7431e34d Merge pull request #33 from RaphaelKimmig/master 
Use relative import for models in example project
 2013-05-18 04:24:32 -07:00
Audrey Roy
62dc5c78fb Merge pull request #32 from gregmuellegger/master 
Fixes #14 -- documentation layout
 2013-05-18 04:20:04 -07:00
Audrey Roy
361fd2faca Merge pull request #34 from audreyr/master 
Get example project working with /admin/ and /admin2/ urls
 2013-05-18 04:19:27 -07:00
Audrey Roy
c464645cc3 Enabled admin at admin/ in example. Put admin2 at admin2/. 2013-05-18 13:17:15 +02:00
Raphael Kimmig
f756b16ce8 use relative imports in example 2013-05-18 13:12:12 +02:00
Gregor Müllegger
2dedab2a84 Short introduction paragraph and integrating the contributing page into the TOC. 2013-05-18 13:05:19 +02:00
Gregor Müllegger
4fb2059561 Basic sphinx documentation layout. 2013-05-18 13:00:51 +02:00
Daniel Greenfeld
e140ab94cc Merge branch 'ludw-master' 2013-05-18 13:00:45 +02:00
Daniel Greenfeld
58b9d01bca Merge branch 'master' of git://github.com/ludw/django-admin2 into ludw-master 2013-05-18 12:57:40 +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
b7087aa320 Merge pull request #30 from audreyr/master 
index.html now extends base.html
 2013-05-18 03:52:05 -07:00
Audrey Roy
4b21cc701c Breakout index/base templates 2013-05-18 12:49:08 +02:00
Ludvig Wadenstein
274a188bdc Added test-suite to setup.py 2013-05-18 12:48:29 +02:00
Audrey Roy
721e582d9d Merge pull request #28 from audreyr/master 
Merge - Add Bootstrap theme static dir
 2013-05-18 03:38:15 -07:00
Audrey Roy
5c864d37b1 Ignore and remove .db files from SQLite 2013-05-18 12:34:57 +02:00
Audrey Roy
88f51fceb7 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:33:31 +02:00
Daniel Greenfeld
c6bdd24f79 Merge pull request #26 from AndrewIngram/master 
Make example project import admin2 urls
 2013-05-18 03:28:54 -07:00
Andrew Ingram
7918000ff9 Merge branch 'master' of github.com:AndrewIngram/django-admin2 2013-05-18 12:24:41 +02:00
Audrey Roy
2179d3e338 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:24:30 +02:00
Andrew Ingram
e1e3f51291 Root URL access djadmin2 index 2013-05-18 12:24:17 +02:00
Audrey Roy
8a082f1ec0 Merge pull request #25 from rivol/master 
Merge - Don't import url patterns from deprecated module
 2013-05-18 03:22:49 -07:00
Rivo Laks
3247380382 Don't import url patterns from deprecated module 2013-05-18 12:19:47 +02:00
Audrey Roy
d537a8d7d9 Merge remote-tracking branch 'upstream/master' 2013-05-18 12:17:24 +02:00
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