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
Rivo Laks
779c0f3d25 Merge remote-tracking branch 'upstream/master' into permissions 2013-05-18 16:58:51 +02:00
Daniel Greenfeld
bc75454b3a Merge pull request #53 from gregmuellegger/setuppy-fix 
Fixing setup.py if django is not installed.
 2013-05-18 07:57:52 -07:00
Daniel Greenfeld
705110d20a Merge pull request #52 from audreyr/template-fixes 
Fix incorrect templates being extended.
 2013-05-18 07:57:28 -07:00
Daniel Greenfeld
bef21e0129 Merge branch 'issue44' of git://github.com/inglesp/django-admin2 into inglesp-issue44 2013-05-18 16:56:24 +02:00
Audrey Roy
e3836ca986 Fix incorrect template being extended. 2013-05-18 16:53:17 +02:00
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
Peter Inglesby
4bd0e90fd1 Refactor views to use new Admin2Mixin 2013-05-18 16:40:18 +02:00
Daniel Greenfeld
7e0e1ee060 merge 2013-05-18 16:32:22 +02:00
Daniel Greenfeld
4de96d2110 Merge pull request #49 from gregmuellegger/travis-ci 
Implementing Travis CI integration.
 2013-05-18 07:28:10 -07:00
Daniel Greenfeld
ef4b3e1318 merge 2013-05-18 16:27:45 +02:00
Rivo Laks
d8a82edc27 Merge remote-tracking branch 'upstream/master' into permissions 
Conflicts:
	djadmin2/models.py
 2013-05-18 16:22:53 +02:00
Gregor Müllegger
f761b7137d Adding Gregor Müllegger to the CONTRIBUTORS file. 2013-05-18 16:20:45 +02:00
Daniel Greenfeld
674b75042b Merge pull request #48 from AndrewIngram/registry 
Registry
 2013-05-18 07:17:19 -07:00
Andrew Ingram
8f64972fd5 Add missing newlines at end of files 2013-05-18 16:10:17 +02:00
Gregor Müllegger
67e80a7cd9 Add the travis-ci green/red badge to the readme file. 2013-05-18 16:09:10 +02:00
Gregor Müllegger
d38c89235f Adding Travis-CI configuration file. 2013-05-18 16:01:06 +02:00
Daniel Greenfeld
64e0254f91 Merge pull request #47 from ludw/master 
Fixed spelling in contributers
 2013-05-18 06:59:09 -07:00
Andrew Ingram
1bd7a49223 add Andrew Ingram to contributors 2013-05-18 15:57:56 +02:00
Andrew Ingram
0a310f3830 Reformat modeladmin urls 2013-05-18 15:57:42 +02:00
Ludvig Wadenstein
0fecd34f70 Fixed spelling 2013-05-18 15:57:15 +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
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
Rivo Laks
e29767a208 Create view permissions for all models when syncdb is run 
Works exactly the same way as that of the standard add/change/delete permissions
(the code is in fact copied from there).
 2013-05-18 15:09:14 +02:00
Rivo Laks
c4dbe6f735 Implement proper permission checkin in Admin2 
Uses Django's builtin per-model permissions (add/change/delete plus view which we'll add)
and also supports per-object permissions.
 2013-05-18 15:07:34 +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