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

126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Raphael Kimmig
f652fd65e5 update readme to reflect implementation 2013-05-18 22:10:49 +02:00
Daniel Greenfeld
6c1a0646fc Merge branch 'admin-core-tests' of git://github.com/inglesp/django-admin2 into inglesp-admin-core-tests 2013-05-18 18:34:31 +02:00
Daniel Greenfeld
e48641cde9 Index work 2013-05-18 18:33:43 +02:00
Peter Inglesby
5223c188c3 Add tests to core 2013-05-18 18:28:31 +02:00
Daniel Greenfeld
f5f94c352c remove confusing comments 2013-05-18 18:24:41 +02:00
Audrey Roy
74c86f9c3b Partial checkin of #61 2013-05-18 18:16:25 +02:00
Daniel Greenfeld
5fb94b69be Document fixing 2013-05-18 18:09:59 +02:00
Daniel Greenfeld
aa89b351b9 Update CONTRIBUTORS.txt 2013-05-18 18:07:02 +02:00
Daniel Greenfeld
55673a8649 Merge 2013-05-18 18:04:40 +02:00
Daniel Greenfeld
869a6a82d6 Merge pull request #59 from audreyr/list-view-model-name 
Display model name in template
 2013-05-18 08:54:51 -07:00
Audrey Roy
a99952375c Display model name in template 2013-05-18 17:52:53 +02:00
Rivo Laks
bea52a38df Merge remote-tracking branch 'upstream/master' into permissions 
Some cleanup as well.
 2013-05-18 17:50:07 +02:00
Rivo Laks
e7861323ca Integrate permissions into views 
Views now ensure that the user has corresponding permissions.
Also, action buttons, e.g. Add, are shown only when the user can actually do that.
 2013-05-18 17:44:56 +02:00
Daniel Greenfeld
191d4d2ff1 Merge pull request #54 from ludw/master 
runtests.py did not include #!
 2013-05-18 08:39:08 -07:00
Daniel Greenfeld
80512305e4 Merge pull request #57 from AndrewIngram/custom-form-classes 
Custom form classes
 2013-05-18 08:23:22 -07:00
Andrew Ingram
6cbf712548 Fix the errors caused by me deleting utils.py 
I'm a bad person.
 2013-05-18 17:20:49 +02:00
Ludvig Wadenstein
dd38701d30 runtests.py can now be executed directly 2013-05-18 17:10:17 +02:00
Andrew Ingram
4c021c4979 remove some lines that are currently unused 2013-05-18 17:09:44 +02:00
Andrew Ingram
63f5cbaa18 fixes modeladmin kwarg not working 2013-05-18 17:08:03 +02:00
Andrew Ingram
1fad491359 Merge remote-tracking branch 'origin/master' into custom-form-classes 2013-05-18 17:05:20 +02:00
Andrew Ingram
24bfdab8a6 custom form class support 
Also sets framework for adding kwargs to any admin2 view
 2013-05-18 16:59:06 +02:00
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