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

86 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gregor Müllegger
06aa019898 Fixing setup.py if django is not installed. 
djadmin2 must not be imported in setup.py because this triggers an import of
django and other dependencies which will obviously fail if they are not
installed.
 2013-05-18 16:50:02 +02:00
Gregor Müllegger
f761b7137d Adding Gregor Müllegger to the CONTRIBUTORS file. 2013-05-18 16:20:45 +02:00
Daniel Greenfeld
64e0254f91 Merge pull request #47 from ludw/master 
Fixed spelling in contributers
 2013-05-18 06:59:09 -07:00
Ludvig Wadenstein
0fecd34f70 Fixed spelling 2013-05-18 15:57:15 +02:00
Daniel Greenfeld
772222ccdb Merge pull request #40 from ludw/testrunner 
Made testrunner work with django
 2013-05-18 06:38:57 -07:00
Ludvig Wadenstein
02cc9abba5 Added documentation for running tests 2013-05-18 15:30:32 +02:00
Ludvig Wadenstein
4d69e5f796 Added testrunner to setup.py 2013-05-18 15:30:32 +02:00
Ludvig Wadenstein
30e6a5b171 Fixed importissue with tests 2013-05-18 15:30:32 +02:00
Ludvig Wadenstein
cc3b60f8c2 Added testrunner that works with django 2013-05-18 15:30:32 +02:00
Daniel Greenfeld
3b7f4d7fe8 Views cleanup during merge. 2013-05-18 15:26:47 +02:00
Raphael Kimmig
5ad895d8eb add me to contributors file 2013-05-18 14:37: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
6454b5833f Adding design to the docs 2013-05-18 13:55:32 +02:00
Daniel Greenfeld
f1a89e1d50 Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 13:53:28 +02:00
Daniel Greenfeld
174894b3ae Adding design to the docs 2013-05-18 13:53:16 +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
52368d9ee1 Give example project models unicode methods 2013-05-18 13:44:00 +02:00
Audrey Roy
6d59986241 Stub out templates for #9 2013-05-18 13:37:46 +02:00
Daniel Greenfeld
7ca17936f1 Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 13:31:02 +02:00
Daniel Greenfeld
e5a140eeb2 Additional documentation 2013-05-18 13:30:45 +02:00
Audrey Roy
e251ab0d05 Merge pull request #37 from audreyr/master 
Expose Post, Comment models in admin of example project
 2013-05-18 04:29:40 -07:00
Audrey Roy
e904f12f8a Merge pull request #36 from RaphaelKimmig/master 
Fix example urls regex
 2013-05-18 04:28:54 -07:00
Audrey Roy
6b892dd1a5 Merge pull request #35 from inglesp/issue10 
Add some tests for views in example app
 2013-05-18 04:28:28 -07:00
Raphael Kimmig
6c187eb978 Fix example urls include regex 2013-05-18 13:27:12 +02:00
Audrey Roy
daf5e1cfb0 Expose Post, Comment models from example in admin 2013-05-18 13:27:10 +02:00
Daniel Greenfeld
3bfac69a9a Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-18 13:26:53 +02:00
Daniel Greenfeld
efe84a46cd Add contributors file 2013-05-18 13:26:33 +02:00
Peter Inglesby
e433228cae Add some tests for views in example app 2013-05-18 13:24:42 +02:00
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