Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-25 02:20: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
Peter Inglesby
8b6b56a1a8 Add messages to base.html 2013-05-22 11:32:01 +01:00
Peter Inglesby
88c0ce4e9f Remove stray closing tag. 2013-05-22 11:32:01 +01:00
Audrey Roy
0d6ab93b84 Remove unused Admin2Form class. 2013-05-22 10:38:23 +02:00
Andrew Ingram
5abe25e4c2 Fix broken tests 2013-05-22 01:22:39 +01:00
Andrew Ingram
a1ce27d4c2 Improve the rendering of inline form sets 2013-05-22 01:06:25 +01:00
Andrew Ingram
05f69775b2 Merge remote-tracking branch 'origin/develop' into inline-formsets 
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_add_form.html
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
	djadmin2/views.py
 2013-05-22 00:58:53 +01:00
Audrey Roy
b79523c659 Refactor duplicate model add/edit forms. 2013-05-21 15:45:08 -07:00
Daniel Greenfeld
5836a1cb97 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into develop 2013-05-22 00:38:24 +02:00
Daniel Greenfeld
192229e513 Fix admin2_tags templatetag reference that was bad 2013-05-22 00:37:14 +02:00
Audrey Roy
cdc8f3b53b Merge branch 'develop' of github.com:twoscoops/django-admin1 into Admin2ModelFormMixin 2013-05-21 23:55:01 +02:00
Audrey Roy
16ceca0dfe Model edit form now reuses save logic 2013-05-21 23:50:50 +02:00
Daniel Greenfeld
1a669cac59 django-debug-toolbar no longer interrupts on form redirects 2013-05-21 23:47:35 +02:00
Daniel Greenfeld
e9fd0abb2f merge 2013-05-21 23:28:28 +02:00
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
Daniel Greenfeld
dda18504d8 Merge branch 'develop' of https://github.com/twoscoops/django-admin2 into develop 2013-05-21 23:15:41 +02:00
Chris Lawlor
f66ffe8c86 Use admin2_url, redirect create form to index view. 
Uses the template tag admin2_url to create namespaced view names
from inside of views.

Create model form now redirects to the model index page, as
django.contrib.admin. does.

Removed get_success_url from ModelListView, as generic.ListView
does not call this method.
 2013-05-21 14:01:30 -04:00
Daniel Greenfeld
a437aceee9 Match master to develop 2013-05-21 12:45:10 +03:00
Andrew Ingram
c051b8807a Merge remote-tracking branch 'origin/develop' into inline-formsets 2013-05-21 00:11:28 +01: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
Daniel Greenfeld
0e03d7a5b0 bike shedding 2013-05-21 00:25:38 +02: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
Daniel Greenfeld
ef8afcbb7e Adding @chrislawlor to the list of authors. 2013-05-20 20:40:16 +03:00
Daniel Greenfeld
21a4f94359 Merge pull request #115 from chrislawlor/feature/template-context-refactor 
Adds model name to AdminModel2Mixin template context.
 2013-05-20 10:38:19 -07:00
Daniel Greenfeld
2b4449a769 Merge pull request #117 from chrislawlor/feature/model-create-page-title 
Adds page title to model create page
 2013-05-20 10:37:47 -07:00
Daniel Greenfeld
648d5e8d5b Change to git-flow 2013-05-20 19:10:33 +02:00
Daniel Greenfeld
baf573bf11 Added immutable admin object per #99 2013-05-20 18:45:59 +02:00
Daniel Greenfeld
4f08ea2165 PEP-8 before working on #99 2013-05-20 18:09:58 +02:00
Daniel Greenfeld
b9ca57bd00 PEP-8 before working on #99 2013-05-20 18:04:51 +02:00
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
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
e0d1ed7c22 More design thoughts 2013-05-20 12:35:26 +02:00
Daniel Greenfeld
47b4171bd7 bullets to points 2013-05-20 12:19:34 +02: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
Andrew Ingram
c625a80eaa Merge remote-tracking branch 'origin/master' into inline-formsets 
Conflicts:
	djadmin2/templates/admin2/bootstrap/model_edit_form.html
 2013-05-19 19:17:51 +01:00
Daniel Greenfeld
234d2a9a6f Prep for version 0.2.0 2013-05-19 17:23:58 +02:00