Commit graph

395 commits

Author SHA1 Message Date
Audrey Roy
b3bb9dbf82 Merge pull request #177 from audreyr/develop
Merge in @paurosello's commit
2013-06-03 14:05:39 -07:00
Audrey Roy
938369ef50 Add @paurosello for fixing #173 (ending template blocks). 2013-06-03 22:57:40 +02:00
Audrey Roy
03d5ed03f5 Fix merge conflict. Remove extrajs block. 2013-06-03 22:51:15 +02:00
Daniel Greenfeld
bc3c67f375 Merge pull request #176 from audreyr/constants-to-settings-175
Rename constants module to settings
2013-06-03 13:46:16 -07:00
Audrey Roy
cc6e8467c4 Rename constants module to settings 2013-06-03 22:44:16 +02:00
paurosello
b0a8594990 Trying to fix issue #173.
Every block is finished with it's own name.
2013-06-03 22:28:41 +02:00
Daniel Greenfeld
d140086dd1 fixes #172 2013-06-03 20:46:17 +02:00
Daniel Greenfeld
4ac722add4 Customize the dashboard 2013-06-01 20:04:06 +02:00
Daniel Greenfeld
d52bc0fe15 Document actions 2013-06-01 19:23:15 +02:00
Daniel Greenfeld
c1bb642747 Enhancing documentation 2013-06-01 19:04:51 +02:00
Daniel Greenfeld
7827bf0003 fixes #159 and lays the ground for more things 2013-06-01 18:02:01 +02:00
Daniel Greenfeld
972968b5b1 Move towards internal consistency of URL name definitions 2013-06-01 13:48:53 +02:00
Daniel Greenfeld
26211ac3d2 Merge pull request #169 from audreyr/develop
Fix error on create from model update form.
2013-06-01 03:55:17 -07:00
Audrey Roy
d72d7e4deb Fix error on create from this form. 2013-06-01 12:54:15 +02:00
Audrey Roy
f2c8480a2f Merge pull request #167 from audreyr/develop
Document custom CSS better.
2013-06-01 03:36:36 -07:00
Audrey Roy
68c5f11b85 Document custom CSS better. 2013-06-01 12:35:49 +02:00
Daniel Greenfeld
4e2a45aab9 Merge pull request #164 from audreyr/edit-form-buttons-72
Add delete button to edit form as per issue #72.
2013-05-31 13:22:58 -07:00
Audrey Roy
b389af9bb9 Add delete button to edit form as per issue #72. 2013-05-31 22:21:04 +02:00
Daniel Greenfeld
4cb6f9fc3f Tweaks to the contributing documentation 2013-05-31 21:48:47 +02:00
Daniel Greenfeld
f822eedae9 merge 2013-05-31 17:41:20 +02:00
Daniel Greenfeld
83689f37d6 merge 2013-05-31 17:40:25 +02:00
Daniel Greenfeld
1195f38b84 More work on admin 2013-05-31 17:38:34 +02:00
Daniel Greenfeld
0da6f453b7 For #161, this removes the FBV and implements an easily extendible BaseListAction class 2013-05-31 16:47:25 +02:00
Daniel Greenfeld
1916f7cba4 Change list actions to be list_actions so their nature is more explicit 2013-05-31 15:37:55 +02:00
Gregor Müllegger
0690385b4c Fixes #160 -- Marking a few missed strings as translatable. 2013-05-31 15:37:43 +02:00
Daniel Greenfeld
6a9eb0b3b3 More accurate documentation for how we test merges 2013-05-31 11:42:00 +02:00
Daniel Greenfeld
3ee0bc5da2 Fix setup.py 2013-05-31 10:26:05 +02:00
Daniel Greenfeld
c5153f7707 better 2013-05-31 10:23:11 +02:00
Daniel Greenfeld
16c9b8c3ee prep for v0.3.0 2013-05-31 10:21:02 +02:00
Daniel Greenfeld
be07421d44 Removed admins.py and placed calls to ModelAdmin2 from top namespace 2013-05-31 08:57:25 +02:00
Daniel Greenfeld
bf1657990a replace django.contrib.admin introduced in last pull request with our own native form 2013-05-31 08:49:24 +02:00
Daniel Greenfeld
fd6c0a57b3 Added Roman Gladkov as a contributor, PEP8 and djadmin2 standards fixes 2013-05-31 08:36:09 +02:00
Daniel Greenfeld
9e2349be7f Merge pull request #146 from d1ffuz0r/issue_101
#101 #103 added change password, login, logout views
2013-05-30 23:25:39 -07:00
d1ffuz0r
cff5674539 revert auth tests 2013-05-31 10:37:14 +07:00
d1ffuz0r
db939ef753 fixed names 2013-05-31 08:25:45 +07:00
d1ffuz0r
8dd3cd4133 added tests 2013-05-31 08:21:43 +07:00
d1ffuz0r
b54c28afc1 deleted LoginRequiredMixin 2013-05-31 07:39:58 +07:00
d1ffuz0r
b8413f96e3 change password form dependent from user 2013-05-31 07:24:22 +07:00
d1ffuz0r
2b172fdcc2 merge from develop 2013-05-31 06:55:34 +07:00
d1ffuz0r
6c0978189a login view 2013-05-31 06:20:39 +07:00
d1ffuz0r
17bc5acecf use django-braces for login required views 2013-05-31 06:20:15 +07:00
d1ffuz0r
8ae0644fb9 #101 #103 added change password, logout views 2013-05-31 06:19:33 +07:00
Daniel Greenfeld
9acdf9e2f8 fixes #155, which is moving models.py to types.py. Using admins.py as an alias for the old models.py module 2013-05-30 12:33:00 +02:00
Daniel Greenfeld
096267c674 New immutable object type that is properly frozen. Part of #155 2013-05-30 12:11:49 +02:00
Daniel Greenfeld
b2fb02b976 New immutable object type that is properly frozen. Part of #155 2013-05-30 12:11:19 +02:00
Daniel Greenfeld
30d1abe5d4 PEP-8 work 2013-05-30 11:35:58 +02:00
Ben Tappin
06302a7ed6 Tweak NestedObjects (and tests) comments. 2013-05-29 14:10:56 +01:00
Ben Tappin
f4f400734c Use utils.model_options() in views and change utils import. 2013-05-29 14:09:26 +01:00
Ben Tappin
65de6f148f Use utils.model_options(). 2013-05-29 13:50:07 +01:00
Ben Tappin
11f193ffc9 UI improvements when deleting objects.
Shows nested child objects that will be deleted when deleting a single object or multiple objects.

Includes some hacky tests for NestedObjects in the example app.
2013-05-29 12:38:32 +01:00