48 commits

Author	SHA1	Message	Date
Daniel Greenfeld	ce835ffc79	Merge branch 'feature/save-options' of git://github.com/chrislawlor/django-admin2 into chrislawlor-feature/save-options	2013-05-21 23:18:53 +02:00
Andrew Ingram	262c759604	Merge remote-tracking branch 'origin/develop' into rename-templatetag-module	2013-05-21 00:05:25 +01:00
Andrew Ingram	3dcaeb4023	rename admin2_urls to admin2_tags	2013-05-20 23:45:22 +01:00
Audrey Roy	55168a0ea0	Fix delete text to match original admin.	2013-05-20 23:33:37 +02:00
Chris Lawlor	f9a1540e09	Add 'title' and 'page_title' template blocks. ... Makes template page title styling consistent across all templates.	2013-05-20 16:17:44 -04:00
Chris Lawlor	32f5e4802f	Adds page title to model create page	2013-05-20 09:07:19 -04:00
Chris Lawlor	c6c44bbdd0	Implements model save options, issue #110	2013-05-20 08:45:34 -04: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
Audrey Roy	b19b477888	Edit form improvement - part of #72	2013-05-19 17:13:20 +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
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
Gregor Müllegger	dc0ecdfe0c	Adding a link to the API from the admin frontend.	2013-05-19 14:23:19 +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
Audrey Roy	1231048281	Better index view. First part of #81	2013-05-19 13:03:25 +02:00
Daniel Greenfeld	a076cca859	Merge pull request #64 from audreyr/list-view-frontend-work ... List view frontend work	2013-05-19 01:03:51 -07:00
Daniel Greenfeld	774b49ed9f	merge	2013-05-19 10:01:50 +02:00
Daniel Greenfeld	29fc882c4b	merge from @rivo	2013-05-19 09:53:37 +02:00
Daniel Greenfeld	e963553361	merge in from @AndrewIngram for #58	2013-05-19 09:47:42 +02:00
Audrey Roy	3722523f0d	Merge remote-tracking branch 'upstream/master' into list-view-frontend-work	2013-05-19 09:38:37 +02:00
Audrey Roy	9e647ae4ee	More of #61	2013-05-18 18:37:20 +02:00
Daniel Greenfeld	e48641cde9	Index work	2013-05-18 18:33:43 +02:00
Audrey Roy	0938f570c1	Display model count/name at bottom	2013-05-18 18:25:36 +02:00
Audrey Roy	74c86f9c3b	Partial checkin of #61	2013-05-18 18:16:25 +02:00
Daniel Greenfeld	55673a8649	Merge	2013-05-18 18:04:40 +02: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
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
Audrey Roy	e3836ca986	Fix incorrect template being extended.	2013-05-18 16:53:17 +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
Raphael Kimmig	cf01b720e0	add initial views	2013-05-18 14:36:14 +02:00
Audrey Roy	9f435fc595	Getting admin2 to use the bootstrap theme properly.	2013-05-18 13:57:22 +02:00
Audrey Roy	6d59986241	Stub out templates for #9	2013-05-18 13:37:46 +02:00
Daniel Greenfeld	44ae271a2e	Merge branch 'master' of github.com:pydanny/django-admin2	2013-05-18 12:57:11 +02:00
Daniel Greenfeld	7773816c07	getting the views to work	2013-05-18 12:57:01 +02:00
Audrey Roy	4b21cc701c	Breakout index/base templates	2013-05-18 12:49:08 +02:00
Peter Inglesby	7c5e7e6883	Rename package to djadmin2	2013-05-18 11:52:03 +02:00