Commit graph

31 commits

Author SHA1 Message Date
Daniel Greenfeld
4f08ea2165 PEP-8 before working on #99 2013-05-20 18:09:58 +02:00
Daniel Greenfeld
999eb32d74 Adding warnings about refactoring 2013-05-20 00:50:41 +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
Raphael Kimmig
603db79ca1 rename modeladmin to model_admin fixes #91 2013-05-19 15:16:21 +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
594d6f9b27 Documentation and cleanup of core 2013-05-19 14:38:27 +02:00
Gregor Müllegger
cd625a6046 Fixing a bug that was introduced during rebasing. 2013-05-19 14:26:10 +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
631727d0f0 Tests for the API index view. 2013-05-19 14:23:18 +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
Gregor Müllegger
0e559347d3 Versioning the API. 2013-05-19 14:20:18 +02:00
Gregor Müllegger
d5330e14f6 Adding a detail based view. 2013-05-19 14:19:57 +02:00
Gregor Müllegger
f0c86f10b1 Adding first prototype of a List/Create API view. 2013-05-19 14:19:28 +02:00
Gregor Müllegger
2ad1fce536 Adding first prototype of a List/Create API view. 2013-05-19 14:16:15 +02:00
Audrey Roy
1231048281 Better index view. First part of #81 2013-05-19 13:03:25 +02:00
Daniel Greenfeld
25f3e598f3 Added self.apps in the registration method of core.Admin2 #81 2013-05-19 12:09:12 +02:00
Daniel Greenfeld
28b6a0f72a pep8 of code 2013-05-19 10:09:12 +02:00
Daniel Greenfeld
0fd10cdbb9 Merge pull request #66 from RaphaelKimmig/add-admin2-core-documentation
add some docstrings to core.Admin2
2013-05-19 00:58:44 -07: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
Raphael Kimmig
1818cbe553 fix typos in core docstrings 2013-05-18 23:32:17 +02:00
Raphael Kimmig
684b167d11 Add missing word to Admin2 docstring. 2013-05-18 22:40:35 +02:00
Raphael Kimmig
a45f586e7f add some docstrings to core.Admin2 2013-05-18 21:45:43 +02:00
Peter Inglesby
5223c188c3 Add tests to core 2013-05-18 18:28:31 +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
Andrew Ingram
4c021c4979 remove some lines that are currently unused 2013-05-18 17:09:44 +02:00
Andrew Ingram
24bfdab8a6 custom form class support
Also sets framework for adding kwargs to any admin2 view
2013-05-18 16:59:06 +02:00
Andrew Ingram
8f64972fd5 Add missing newlines at end of files 2013-05-18 16:10: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