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

113 commits

Author SHA1 Message Date
Chris Lawlor
3d2b347063 Adds model name to AdminModel2Mixin template context. 
All views subclassing AdminModel2Mixin will need the model
name in their template context, so moving it to the base
class so child views don't all have to override
get_context_data.
 2013-05-20 10:34:35 -04:00
Daniel Greenfeld
999eb32d74 Adding warnings about refactoring 2013-05-20 00:50:41 +02:00
Daniel Greenfeld
a2f73e0fb5 Merge pull request #108 from ludw/headerui 
Header UI style
 2013-05-19 15:46:32 -07:00
Daniel Greenfeld
83eb8da62a Merge pull request #107 from ludw/master 
Fixed small issue in modellistview
 2013-05-19 15:45:57 -07:00
Ludvig Wadenstein
7c08296772 Fixed bug with modellist if more than one item 2013-05-19 20:56:41 +02:00
Ludvig Wadenstein
36491b4894 Replaced change password and logout links with dropdown 2013-05-19 20:46:14 +02:00
Daniel Greenfeld
234d2a9a6f Prep for version 0.2.0 2013-05-19 17:23:58 +02:00
Daniel Greenfeld
6a351eb466 Merge pull request #104 from audreyr/edit-form-enhancements-72 
Edit form improvement - part of #72
 2013-05-19 08:18:57 -07:00
Daniel Greenfeld
4d44d3e534 warnings in models 2013-05-19 17:19:18 +02:00
Audrey Roy
b19b477888 Edit form improvement - part of #72 2013-05-19 17:13:20 +02:00
Daniel Greenfeld
0859342ae4 Merge pull request #97 from RaphaelKimmig/rename-modeladmin-model_admin 
rename modeladmin to model_admin fixes #91
 2013-05-19 07:30:40 -07:00
Raphael Kimmig
973ec97b2e Merge remote-tracking branch 'upstream/master' into rename-modeladmin-model_admin 
Conflicts:
	djadmin2/core.py
	djadmin2/templates/admin2/bootstrap/index.html
	djadmin2/views.py
 2013-05-19 15:45:24 +02:00
Gregor Müllegger
e745291445 Fixing issue that permissions cannot be hyperlinked from users and group API resource. 2013-05-19 15:32:51 +02:00
Raphael Kimmig
603db79ca1 rename modeladmin to model_admin fixes #91 2013-05-19 15:16:21 +02:00
Daniel Greenfeld
4f5eb65d5c Merge pull request #92 from ludw/modellistui 
Modellist UI cleaned up, #78
 2013-05-19 06:05:57 -07:00
Daniel Greenfeld
0c1238dff6 Merge pull request #90 from gregmuellegger/rest-api-integration 
Rest api integration
 2013-05-19 05:48:51 -07:00
Daniel Greenfeld
7597e045a3 fix a merge mistake by yours truly. 2013-05-19 14:46:35 +02:00
Daniel Greenfeld
b4d4a6bde7 merge of @RaphaelKimmig's work 2013-05-19 14:44:27 +02:00
Daniel Greenfeld
594d6f9b27 Documentation and cleanup of core 2013-05-19 14:38:27 +02:00
Ludvig Wadenstein
bff0269729 Replaced edit detail delete with just a link to edit 2013-05-19 14:32:58 +02:00
Ludvig Wadenstein
ed9f1c3b69 More style changes on model list 2013-05-19 14:29:29 +02:00
Daniel Greenfeld
0e63bc8e7e Merge branch 'master' of github.com:pydanny/django-admin2 2013-05-19 14:26:54 +02:00
Gregor Müllegger
cd625a6046 Fixing a bug that was introduced during rebasing. 2013-05-19 14:26:10 +02:00
Daniel Greenfeld
539dac9957 remove unnecessary exceptions file 2013-05-19 14:26:03 +02:00
Gregor Müllegger
dc0ecdfe0c Adding a link to the API from the admin frontend. 2013-05-19 14:23:19 +02:00
Gregor Müllegger
0da7584e99 We don't need detail pages for apps in the API. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
fe140bbf39 Integrating the new app registry so that the API can generate a nice index page. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
4e03b7ce16 Fixing called function for API index view kwargs. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
bc899a9389 Adding support for pagination. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
8ea3b97786 Using django's TestCase and instead of the one from unittest. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
631727d0f0 Tests for the API index view. 2013-05-19 14:23:18 +02:00
Gregor Müllegger
09dd2095e3 Fixing names for views beeing more consistent and tests for API views. 2013-05-19 14:22:50 +02:00
Gregor Müllegger
73a41f5632 Fixing tests for API. 2013-05-19 14:22:18 +02:00
Gregor Müllegger
68d6b96f84 Adding an index resource for the API. 2013-05-19 14:21:57 +02:00
Gregor Müllegger
a16faccade Hyperlinking the API. 2013-05-19 14:21:21 +02:00
Gregor Müllegger
c7014282dc Renaming 'api-index' view to 'api-list' makes more sense, since the index will be a list of all available models. 2013-05-19 14:21:21 +02:00
Gregor Müllegger
58e5f7b54c Using admin views mixin for API views. 2013-05-19 14:21:03 +02:00
Gregor Müllegger
dae15811ee Fixing urls. 2013-05-19 14:21:02 +02:00
Gregor Müllegger
0e559347d3 Versioning the API. 2013-05-19 14:20:18 +02:00
Gregor Müllegger
8e2aebcc09 Renaming a few things to make more sense and to stick to conventions. 2013-05-19 14:19:57 +02:00
Gregor Müllegger
d5330e14f6 Adding a detail based view. 2013-05-19 14:19:57 +02:00
Gregor Müllegger
f0c86f10b1 Adding first prototype of a List/Create API view. 2013-05-19 14:19:28 +02:00
Gregor Müllegger
7754cae894 Fixing tests for API urls. 2013-05-19 14:17:06 +02:00
Gregor Müllegger
9db48cf0d9 Adding a detail based view. 2013-05-19 14:17:06 +02:00
Gregor Müllegger
2ad1fce536 Adding first prototype of a List/Create API view. 2013-05-19 14:16:15 +02:00
Ludvig Wadenstein
c543c57f15 Merge remote-tracking branch 'upstream/master' into modellistui 2013-05-19 14:10:51 +02:00
Audrey Roy
e50f26947b Change model from index. Stub for Add. Close #81. 2013-05-19 14:06:27 +02:00
Raphael Kimmig
56135460ea fix add links on index page 2013-05-19 13:47:51 +02:00
Audrey Roy
547fb77c24 Stub out more UI parts for #81 2013-05-19 13:29:28 +02:00
Ludvig Wadenstein
e0151c28a4 Changed the modellist action bar around a bit 2013-05-19 13:14:07 +02:00