794 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel Greenfeld	b44fe10e22	Update AUTHORS.rst	2013-07-30 17:04:37 +02:00
Daniel Greenfeld	466ae1d5b7	Merge pull request #358 from powersurge360/actions-selection-counter ... Actions selection counter	2013-07-30 08:04:05 -07:00
Kevin Diale	eb204104bd	Added some tests.	2013-07-30 10:05:57 -04:00
Kevin Diale	6ff47746df	Added in actions_selection_counter, will add tests/polish next commit.	2013-07-29 14:48:05 -04:00
Andrews Medina	b7b0d9ba8c	added docs about AdminView.	2013-07-27 01:59:48 -03:00
Andrews Medina	3c7fc0fc0e	Merge branch 'develop' into admin_view ... Conflicts: djadmin2/types.py	2013-07-26 17:55:55 -03:00
Andrews Medina	26ba68115f	Using six to set the ModelAdminBase2 metaclass.	2013-07-26 17:41:58 -03:00
Daniel Greenfeld	1b7b803b1b	Update README.rst	2013-07-25 22:36:02 +02:00
Daniel Greenfeld	0210ea8f07	Adding Kenneth Love to authors.	2013-07-22 00:44:15 +02:00
Daniel Greenfeld	45b7aea7f6	Merge pull request #351 from douglasmiranda/fix-issue-348 ... fix: issue #348	2013-07-21 15:42:50 -07:00
Daniel Greenfeld	5f76d84e72	Merge pull request #349 from brack3t/feature/history ... Feature/history - Merging anyway. I'll pull out the auth link tomorrow.	2013-07-21 15:42:30 -07:00
Douglas Miranda	ac0f5da4f6	fix: issue #348 ... Adding djadmin2.themes.djadmin2theme_default on INSTALLED_APPS.	2013-07-21 17:31:11 -04:00
Daniel Greenfeld	be1080c43d	Work on contributing and the FAQ	2013-07-21 13:26:03 +02:00
Chris Jones	4959a095c4	fix merge error.	2013-07-18 17:44:19 -07:00
Kenneth Love	3844a952c0	merge	2013-07-18 17:41:33 -07:00
Kenneth Love	738e3a9dd8	template changes	2013-07-18 17:40:54 -07:00
Chris Jones	e7f8170237	Ooooooooo pretty.	2013-07-18 17:33:19 -07:00
Kenneth Love	af11cb012e	Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history	2013-07-18 17:31:11 -07:00
Kenneth Love	e5f1940f3e	action_type property	2013-07-18 17:31:08 -07:00
Chris Jones	57ef2a428c	Nicer to look at.	2013-07-18 17:30:41 -07:00
Chris Jones	69f2a357f8	Why don't you PEP your 8! Add in change messages.	2013-07-18 17:23:48 -07:00
Kenneth Love	52c337a72c	force_text for object_repr and condition on history link	2013-07-18 17:16:07 -07:00
Kenneth Love	acae0a2620	icons	2013-07-18 17:02:40 -07:00
Kenneth Love	99ae00a0ae	show user that performed action	2013-07-18 16:56:08 -07:00
Kenneth Love	802265b60f	Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history	2013-07-18 16:54:26 -07:00
Kenneth Love	ee2ca9feff	template updates	2013-07-18 16:54:22 -07:00
Chris Jones	ee1c90cd9f	Working model history view.	2013-07-18 16:51:16 -07:00
Kenneth Love	a7951353a8	Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history	2013-07-18 16:38:20 -07:00
Kenneth Love	7dbf50426f	model_history template	2013-07-18 16:38:13 -07:00
Chris Jones	d62b612583	nevermind.	2013-07-18 16:38:00 -07:00
Chris Jones	f7ef575709	Should be a detail view.	2013-07-18 16:37:18 -07:00
Chris Jones	82d9e7ae65	PEP8 love.	2013-07-18 16:36:31 -07:00
Chris Jones	4089ad4aab	PEP8 all the things. Add in new history url.	2013-07-18 16:30:40 -07:00
Chris Jones	555588f13c	PEP8	2013-07-18 16:08:38 -07:00
Chris Jones	ae39a26e13	Use model properties for action ints.	2013-07-18 15:58:31 -07:00
Kenneth Love	598b0a704f	basics for recording history	2013-07-18 13:59:08 -07:00
Chris Jones	14d2a20431	Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history	2013-07-18 13:46:17 -07:00
Chris Jones	6273e68dde	Stealing the logger from the old admin.	2013-07-18 13:46:00 -07:00
Kenneth Love	76ab676530	more html	2013-07-18 13:40:50 -07:00
Kenneth Love	ef77c8242d	Merge branch 'fix-history' of github.com:brack3t/django-admin2 into fix-history	2013-07-18 13:06:04 -07:00
Kenneth Love	4cfe10e645	actual data in history template	2013-07-18 13:05:56 -07:00
Chris Jones	fb0e73a37e	PEP8	2013-07-18 13:04:47 -07:00
Kenneth Love	5ed5123836	started on history	2013-07-18 13:00:14 -07:00
Daniel Greenfeld	9e4d2ec039	Move default theme to it's own app. This way we are following the same pattern that other themes will have to use fix #333	2013-07-18 17:55:08 +02:00
Daniel Greenfeld	82e56bdae5	prep for #273	2013-07-18 16:32:50 +02:00
Daniel Greenfeld	f1f9f6e83e	update the contributing instructions to match what's current	2013-07-18 16:17:20 +02:00
Ludvig Wadenstein	3cc592a906	Inlines separated into stacked and tabular	2013-07-18 15:02:07 +02:00
Daniel Greenfeld	2004df71bb	Pointing coveralls at the develop branch	2013-07-16 23:52:09 +02:00
Daniel Greenfeld	0f7c880907	Merge pull request #338 from z4r/patch-1 ... Excluding tests from coverage	2013-07-16 14:51:17 -07:00
Andrea de Marco	7090d00265	Excluding tests from coverage	2013-07-16 23:45:15 +02:00