Commit graph

557 commits

Author SHA1 Message Date
Daniel Greenfeld
ecb5ea2bf9 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 12:21:21 +02:00
Daniel Greenfeld
7db738d469 friendlier way of handling django_extensions 2013-07-06 12:21:02 +02:00
Daniel Greenfeld
0f3cfed915 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 12:09:28 +02:00
Daniel Greenfeld
d407d804b0 Add coverage badge per #222 2013-07-06 12:09:13 +02:00
Daniel Greenfeld
dab5e36c10 Merge branch 'dbrgn-iss236' into develop 2013-07-06 12:09:13 +02:00
Daniel Greenfeld
cf77eb0ec5 Merge branch 'iss236' of git://github.com/dbrgn/django-admin2 into develop 2013-07-06 12:07:54 +02:00
Daniel Greenfeld
aa6d246fac Merge pull request #249 from dbrgn/coverage
Coverage
2013-07-06 03:07:21 -07:00
Danilo Bargen
8217789e11 Prepared travis.yml for coveralls 2013-07-06 11:57:57 +02:00
Danilo Bargen
142f33f2f6 Added .coveragerc 2013-07-06 11:56:29 +02:00
Daniel Greenfeld
fd6eec2a54 Adding Ignasi Fosch Alonso to Authors 2013-07-06 11:56:18 +02:00
Danilo Bargen
ce5566be82 Show verbose column name in list view (fixes #236) 2013-07-06 11:53:46 +02:00
Daniel Greenfeld
653dac411d Merge branch 'iss236' of git://github.com/dbrgn/django-admin2 into dbrgn-iss236 2013-07-06 11:52:48 +02:00
Daniel Greenfeld
4205660251 Merge pull request #246 from ifosch/test-improvements
djadmin2.actions.get_description test implemented
2013-07-06 02:43:54 -07:00
Daniel Greenfeld
fa94f81e7f Merge 2013-07-06 11:36:42 +02:00
Danilo Bargen
3e31974b39 Added model_attr_verbose_name template filter.
Renamed the model_field_verbose_name to model_attr_verbose_name in
order to handle both fields and methods.
2013-07-06 11:32:57 +02:00
Danilo Bargen
973996cfe0 Show verbose column name in list view (fixes #236) 2013-07-06 11:32:57 +02:00
Danilo Bargen
6331b94a81 Added model_method_verbose_name util function 2013-07-06 11:32:57 +02:00
Danilo Bargen
56b26fb190 Added new template filter: model_field_verbose_name 2013-07-06 11:32:57 +02:00
Daniel Greenfeld
3796d312e3 Add index links for permissions 2013-07-06 11:18:38 +02:00
Ignasi Fosch
7c6f6a7b4a djadmins.actions lines cut out to 80 characters long 2013-07-06 11:17:12 +02:00
Ignasi Fosch
793cec7828 djadmins.actions lines cut out to 80 characters long 2013-07-06 11:16:13 +02:00
Daniel Greenfeld
745f2750fa Add django-debug-toolbar to example2 2013-07-06 11:15:41 +02:00
Audrey Roy
1a860031ee Better example project home. Close #241. 2013-07-06 11:15:41 +02:00
Daniel Greenfeld
80aa636e82 Indexing actions 2013-07-06 11:15:41 +02:00
Daniel Greenfeld
7e96b27c5f Index test 2013-07-06 11:15:41 +02:00
Daniel Greenfeld
7e0a676ad9 fix #234, this adds formal install instructions to the docs and includes reorganization of the docs 2013-07-06 11:15:40 +02:00
Audrey Roy
f65d7e3722 Simpler way to pull upstream changes, with optional rebase for advanced git users. 2013-07-06 11:15:40 +02:00
Daniel Greenfeld
9fad9ff9d1 Add Danilo Bargen to authors 2013-07-06 11:15:40 +02:00
Danilo Bargen
4f904e73fd PEP8 2013-07-06 11:15:40 +02:00
Daniel Greenfeld
19e2bac445 Update AUTHORS.rst 2013-07-06 11:14:34 +02:00
Daniel Greenfeld
0fe07d4002 Merge branch 'better-example' of git://github.com/audreyr/django-admin2 into audreyr-better-example 2013-07-06 11:08:46 +02:00
Daniel Greenfeld
6589fef693 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 11:08:23 +02:00
Daniel Greenfeld
9e8efcd218 Add django-debug-toolbar to example2 2013-07-06 11:08:11 +02:00
Ignasi Fosch
1bea34ac1a djadmin2.actions.get_description test implemented 2013-07-06 11:00:03 +02:00
Audrey Roy
807b3776fb Better example project home. Close #241. 2013-07-06 10:57:00 +02:00
Audrey Roy
a5d03899a9 Merge pull request #239 from audreyr/fix-contributor-instructions
Simpler way to pull upstream changes, with optional rebase for advanced ...
2013-07-06 01:04:36 -07:00
Daniel Greenfeld
9492c8372a Indexing actions 2013-07-06 10:03:54 +02:00
Daniel Greenfeld
0de830abf9 Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 09:59:01 +02:00
Daniel Greenfeld
2ef846a8fa Index test 2013-07-06 09:58:47 +02:00
Daniel Greenfeld
1d254c8cae Merge branch 'develop' of github.com:twoscoops/django-admin2 into develop 2013-07-06 09:55:35 +02:00
Daniel Greenfeld
12579fdd0e fix #234, this adds formal install instructions to the docs and includes reorganization of the docs 2013-07-06 09:55:29 +02:00
Audrey Roy
c4120fa22a Simpler way to pull upstream changes, with optional rebase for advanced git users. 2013-07-06 09:55:06 +02:00
Daniel Greenfeld
da4cf6deb9 Add Danilo Bargen to authors 2013-07-06 09:53:24 +02:00
Daniel Greenfeld
a826c5e186 Merge pull request #238 from dbrgn/pep8
PEP8
2013-07-06 00:51:11 -07:00
Danilo Bargen
39aaacccb6 PEP8 2013-07-06 09:37:25 +02:00
Daniel Greenfeld
4aec1a3836 Update AUTHORS.rst 2013-07-06 08:13:51 +02:00
Daniel Greenfeld
033e0124cf Merge pull request #233 from chrisjones-brack3t/develop
Quick and dirty install/setup docs.
2013-07-05 22:59:27 -07:00
Chris Jones
433fb51b6a Add one more thing for rest framework 2013-07-05 17:06:07 -07:00
Chris Jones
1d037f27a2 Quick and dirty install/setup docs. 2013-07-05 13:59:46 -07:00
Daniel Greenfeld
ca93b5ea97 Update README.rst 2013-07-05 16:53:41 +02:00