Commit Graph

7267 Commits

Author SHA1 Message Date
Daniel Greenfeld
3680c7b60e Merge pull request #26 from jimfmunro/fix-heroku
add config and moved staticfiles section
2013-09-26 18:59:17 -07:00
Jim Munro
356319c8fe Merge pull request #27 from jimfmunro/about-page-url
correct about-page url
2013-09-26 13:06:16 -07:00
Jim Munro
fc7402f922 correct about-page url 2013-09-26 14:05:42 -06:00
Jim Munro
eeaece5571 add config and moved staticfiles section 2013-09-26 13:23:58 -06:00
Daniel Greenfeld
90e601fc22 Update CONTRIBUTORS.txt 2013-09-23 23:13:09 +02:00
Daniel Greenfeld
c87f627a3b Dupe file 2013-09-23 23:11:46 +02:00
Daniel Greenfeld
212fff9c90 Merge pull request #25 from jimfmunro/default-cache-url-keyword
wont define the cache value unless default keyword is present for argume...
2013-09-22 22:08:35 -07:00
jmunro
baa83a762c wont define the cache value unless default keyword is present for argument 2013-09-22 22:15:37 -06:00
Daniel Greenfeld
918a194096 Merge pull request #24 from jimfmunro/name-fix
fixed mispelling
2013-09-22 06:47:21 -07:00
jmunro
b7d63f9953 fixed mispelling 2013-09-22 07:28:45 -06:00
Daniel Greenfeld
31defe87bd fix the django-model-utils 2013-09-22 15:03:33 +02:00
Daniel Greenfeld
7ab7cf910d Bump South to the stable 0.8.2 release 2013-09-22 14:51:26 +02:00
Daniel Greenfeld
595c75e2f1 Update django-avatar to 2.0 2013-09-22 14:47:34 +02:00
Daniel Greenfeld
836ab00b14 Add Jim Monroe, Audrey Roy, and Jannis Leidel to contributors 2013-09-22 14:43:32 +02:00
Daniel Greenfeld
b57a0aec0a Update CACHE controls to work better with django-configurations 2013-09-22 14:42:56 +02:00
Daniel Greenfeld
14cec10f27 Merge pull request #21 from jimfmunro/add-caches-readme
added config for basic memcache setup
2013-09-22 05:31:06 -07:00
jmunro
f76ef042d1 added config for basic memcache setup 2013-09-21 21:59:53 -06:00
Daniel Greenfeld
a9597cdfd6 Merge pull request #19 from vbabiy/patch-1
Adding myself to AUTHORS
2013-09-20 13:55:03 -07:00
Vitaly Babiy
cb11d428ce Adding myself to AUTHORS 2013-09-20 11:00:02 -04:00
Daniel Greenfeld
d36e80a67c Add Vitaly Babiy 2013-09-20 12:08:21 +02:00
Daniel Greenfeld
31412a20c9 Merge pull request #18 from vbabiy/database-defaults
Fixing the default check on databases setting.
2013-09-20 03:07:45 -07:00
Vitaly Babiy
b32718c955 Fixing the default check on databases setting. 2013-09-19 20:41:12 -04:00
Daniel Greenfeld
a1dff3e976 Basic settings stuff 2013-09-19 12:18:26 +02:00
Daniel Greenfeld
7229f07ea2 Remove dangling exclamation point. 2013-09-19 12:02:46 +02:00
Daniel Greenfeld
7323f87e37 More fixes per @jezdez's oversight 2013-09-17 15:11:22 +02:00
Daniel Greenfeld
527a9b29a1 Bump up the Django version 2013-09-17 14:25:39 +02:00
Daniel Greenfeld
61098877af Update README.rst 2013-09-17 14:21:44 +02:00
Daniel Greenfeld
79cb6a3205 Post @jezdez cleanup 2013-09-17 14:19:31 +02:00
Daniel Greenfeld
cee802c859 Add django-configurations 2013-09-15 15:02:13 +02:00
Daniel Greenfeld
a2070558c9 Adding the other authors 2013-09-15 13:04:31 +02:00
Daniel Greenfeld
8db52ae6bc Add authors file 2013-09-15 13:02:09 +02:00
Daniel Greenfeld
ddf5b58fbf Merge pull request #15 from agamdua/master
Updated Readme to reflect latest results of running cookiecutter
2013-09-15 03:54:13 -07:00
Daniel Greenfeld
ff625f312e Add Agam Dua 2013-09-14 10:01:42 +02:00
Agam Dua
bb0b0f5068 Updated Readme to reflect latest results of running cookiecutter 2013-09-13 16:54:45 +05:30
Daniel Greenfeld
737f14dcc6 Specify bootstrap3 for crispy forms 2013-09-02 11:54:16 +02:00
Daniel Greenfeld
e38e5ce7ab django-crispy-forms now can be pinned 2013-09-02 11:52:32 +02:00
Daniel Greenfeld
bcaeed88c4 Update password_change.html 2013-09-01 19:38:57 +02:00
Daniel Greenfeld
f436dddf71 Update password_reset_from_key.html 2013-09-01 19:38:34 +02:00
Daniel Greenfeld
8def034acf Merge pull request #13 from Bouke/patch-7
Use domain_name variable for Site object
2013-08-29 11:51:42 -07:00
Bouke Haarsma
c01b4a2f9a Use domain_name variable for Site object 2013-08-29 10:04:50 +02:00
Daniel Greenfeld
0914c7a923 Merge pull request #12 from Bouke/patch-6
Typo in cookiecutter variable domain name
2013-08-29 00:38:24 -07:00
Daniel Greenfeld
ff60bda1e0 Add Bouke Haarsma 2013-08-29 09:32:52 +02:00
Daniel Greenfeld
a989165d44 Merge pull request #10 from Bouke/patch-4
Match license name with license text
2013-08-29 00:32:33 -07:00
Bouke Haarsma
aaf7ef9c76 Typo in cookiecutter variable 2013-08-29 09:16:22 +02:00
Bouke Haarsma
60f577e706 License is BSD, not MIT 2013-08-29 08:57:20 +02:00
Daniel Greenfeld
ce98a8f6f2 Merge pull request #8 from Bouke/patch-2
Heroku caching only in production
2013-08-28 04:47:22 -07:00
Daniel Greenfeld
8201f2f713 Merge pull request #9 from Bouke/patch-3
Fix undefined `environ`
2013-08-28 04:46:34 -07:00
Bouke Haarsma
3ac2b7cdbe Fix environ not being defined 2013-08-28 13:37:53 +02:00
Bouke Haarsma
bca3f53b6d Heroku caching only in production 2013-08-28 13:25:42 +02:00
Daniel Greenfeld
cd62e9333e Merge pull request #7 from Bouke/patch-1
Fixes deployment to Heroku
2013-08-28 04:19:01 -07:00