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

531 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Daniel Greenfeld
657aead2bf Merge pull request #102 from gregmuellegger/rest-api 
Rest api fixes
 2013-05-19 07:28:01 -07:00
Gregor Müllegger
155f19db52 Adding smoke tests for User and Group API resources. 2013-05-19 16:01:30 +02:00
Ludvig Wadenstein
0d8bfd1914 Merge remote-tracking branch 'upstream/master' 2013-05-19 15:52:05 +02: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
Daniel Greenfeld
4083dfe4b2 More README work 2013-05-19 15:36:16 +02:00
Daniel Greenfeld
8dea82eb70 Add warning message to email 2013-05-19 15:35:33 +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
Daniel Greenfeld
805a9dda40 Add warning message to email 2013-05-19 15:31:58 +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
f416998e27 Merge pull request #94 from audreyr/design-goals-18 
Outline UI goals - part of issue #18
 2013-05-19 06:05:32 -07:00
Daniel Greenfeld
c638a8503b Merge pull request #93 from audreyr/theming-89 
Write theming docs. Close issue #89.
 2013-05-19 06:04:49 -07:00
Audrey Roy
1a0a030b03 Outline UI goals - part of issue #18 2013-05-19 15:04:13 +02:00
Daniel Greenfeld
26cb6f1594 Example project home page 2013-05-19 15:00:10 +02:00
Audrey Roy
4f8e6b4c29 Write theming docs. Close issue #89. 2013-05-19 14:51:43 +02: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
Ludvig Wadenstein
ff54b31abf Merge remote-tracking branch 'upstream/master' 2013-05-19 14:44:30 +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
Ludvig Wadenstein
09a1f2465f Added test for detail view in api 2013-05-19 14:21:22 +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
Ludvig Wadenstein
585d4d9e8e Just commiting to be able to merge 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
Ludvig Wadenstein
6cc5b5e18a Added test for unicode field in rest api 2013-05-19 14:20:18 +02:00
Gregor Müllegger
0e559347d3 Versioning the API. 2013-05-19 14:20:18 +02:00
Gregor Müllegger
944a846eb3 Adding rest_framework to the INSTALLED_APPS so that the explorable API browser works. 2013-05-19 14:20:17 +02:00
Gregor Müllegger
c7f935cd1c Adding a quick hint to the API in the documentation. 2013-05-19 14:19:58 +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