Commit graph

244 commits

Author SHA1 Message Date
Chris Lawlor
c6c44bbdd0 Implements model save options, issue #110 2013-05-20 08:45:34 -04:00
Daniel Greenfeld
b0abe58121 Changing design notification to warning. I don't want to kill contributor enthusiasm 2013-05-20 10:55:29 +02:00
Daniel Greenfeld
d43ec6818a Changing design notification to warning. I don't want to kill contributor enthusiasm 2013-05-20 10:53:48 +02:00
Daniel Greenfeld
f043b382d5 Changing design notification to warning. I don't want to kill contributor enthusiasm 2013-05-20 10:52:46 +02:00
Daniel Greenfeld
2677ed16a9 documentation version bump 2013-05-20 10:45:37 +02:00
Daniel Greenfeld
89ef5ad0a1 architecture warning 2013-05-20 10:38:08 +02:00
Daniel Greenfeld
77e1e994b2 Add design to contributing 2013-05-20 10:37:29 +02:00
Daniel Greenfeld
339acc4bf3 architecture thoughts 2013-05-20 10:33:31 +02:00
Daniel Greenfeld
999eb32d74 Adding warnings about refactoring 2013-05-20 00:50:41 +02:00
Daniel Greenfeld
38b11f0f61 Change README so people get an idea as to what we want 2013-05-20 00:48:38 +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
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