Commit Graph

1982 Commits

Author SHA1 Message Date
Daniel Greenfeld
73b55998b5 Update README.rst 2014-09-03 13:58:48 -07:00
Daniel Greenfeld
401f5431d7 Adding @alb3rto to contributors since he gave us support for 1.7!! 2014-09-03 13:57:42 -07:00
Daniel Greenfeld
e84c9daea4 Merge pull request #128 from talpor/master
Yay! Update django to 1.7 👍 👍 👍 👍 👍
2014-09-03 13:55:21 -07:00
Alberto Sanchez
6ee808bd2c Update README 2014-09-03 16:03:02 -04:30
Alberto Sanchez
ce85e8b6dc fix sites migrations 2014-09-03 15:07:36 -04:30
Alberto Sanchez
a5402511b0 change migrations from south to new django format 2014-09-03 12:53:06 -04:30
Alberto Sanchez
6c3828cb4e update django to 1.7 2014-09-03 12:51:27 -04:30
Alberto Sanchez
eefdf06fb0 remove south 2014-09-03 12:49:34 -04:30
Daniel Greenfeld
c82d020ea1 Update requirements 2014-09-03 10:05:57 -07:00
Daniel Greenfeld
94bca534b0 Merge pull request #124 from theskumar/patch-2
update pillow 2.5.2 => 2.5.3
2014-08-25 15:55:17 -07:00
Saurabh Kumar
8a56273cec update pillow 2.5.2 => 2.5.3
- A security release update for pillow.
2014-08-24 20:47:06 +05:30
Daniel Greenfeld
03c34c547a Updated Django for 1.6.6 security release 2014-08-21 20:41:48 -03:00
Daniel Greenfeld
f8cfc8aa3f Merge pull request #105 from theskumar/refractor-settings
refactor(settings): break up the settings into one module per configuration
2014-08-18 14:42:58 -03:00
Saurabh Kumar
81576069f8 refractor(settings): break up the settings into one module per configuration
- moves urls.py to project_root
- moves wsgi.py to project_root
- 'config.settings' is replaced by 'config', selectively applicable
  configs are imported in '__init__.py'

fixes: #47
2014-08-18 22:26:16 +05:30
Daniel Greenfeld
1701aed142 Updated South and added badge 2014-08-17 11:23:19 -03:00
Daniel Greenfeld
5a9ddc586a Update requirements 2014-08-17 11:22:19 -03:00
Daniel Greenfeld
93fb8f8698 merge 2014-08-17 11:20:05 -03:00
Daniel Greenfeld
d7f16a4d14 Adding now value 2014-08-17 11:18:53 -03:00
Daniel Greenfeld
b15e8f91f9 Merge pull request #122 from slafs/linting
add flake8 and setup.cfg for linting
2014-08-16 14:58:12 -03:00
Sławek Ehlert
6da07492bd added myself to CONTRIBUTORS.txt 2014-08-07 21:27:50 +02:00
Sławek Ehlert
10e3e8f6ab add flake8 and setup.cfg for linting
some changes to pass flake8 linting. added setup.cfg for flake8
configuration. Ignoring E265 can be added to this file because
config/settings.py is flooded with this error. After #105 gets
merged it'll be OK.
2014-08-07 21:10:26 +02:00
Daniel Greenfeld
3719db26de Merge pull request #102 from russelldavies/pydanny#75
Updated wsgi to default to Production configuration
2014-07-19 09:13:15 -07:00
Russell Davies
cfb9466778 Updated CONTRIBUTORS.txt 2014-07-19 16:05:08 +01:00
Russell Davies
596b2e8df8 Updated wsgi to default to Production configuration
Prevents the application server from running in Local configuration if
DJANGO_CONFIGURATION variable is not set.  Related to: pydanny#75
2014-07-19 16:03:02 +01:00
Daniel Greenfeld
ae71813dd2 Merge pull request #119 from glarrain/patch-2
settings: fix indentation for `CACHES`
2014-07-18 09:45:43 -07:00
Daniel Greenfeld
0fa22a0b2d Merge pull request #118 from glarrain/patch-1
README: remove set config variables for SendGrid
2014-07-18 09:45:22 -07:00
Daniel Greenfeld
1cbf2c9e37 Merge pull request #116 from glarrain/master
README: remove redundant settings option
2014-07-18 09:39:38 -07:00
German Larrain
a2116e721e settings: fix indentation for CACHES 2014-07-17 20:54:49 -04:00
German Larrain
5a78cf98cd README: remove set config variables for SendGrid
Fix https://github.com/pydanny/cookiecutter-django/issues/117
2014-07-17 20:46:42 -04:00
German Larrain
529b85e518 README: remove redundant settings option
Of the three `heroku run python ... manage.py ...` commands, two specified `--settings=config.settings`, which is redundant with what is in `manage.py`, and there is no reason for those two to have that option and for the third not to.
2014-07-17 20:41:00 -04:00
Daniel Greenfeld
a2eecedaa0 Merge pull request #115 from mattlinares/master
Expand regex match on users/urls.py UserDetailView
2014-07-13 14:24:34 -07:00
Matt Linares
ad5857c955 Expand regex match on users/urls.py UserDetailView 2014-07-13 22:56:38 +02:00
Daniel Greenfeld
24cb80c0f3 Create CONTRIBUTING.rst 2014-07-11 08:32:45 -07:00
Daniel Greenfeld
abce2444c7 Merge pull request #113 from Tavistock/patch-2
updating contrib
2014-07-09 22:18:13 -07:00
Daniel Greenfeld
1b667ff9e5 Merge pull request #110 from Tavistock/patch-1
Changed page_title block to be html in the content block
2014-07-09 22:18:06 -07:00
Travis McNeill
ad9b8ada79 updating contrib 2014-07-10 00:44:56 -04:00
Daniel Greenfeld
7b9686fbd4 Merge pull request #112 from ikkebr/patch-3
Update CONTRIBUTORS.txt
2014-07-09 14:11:33 -07:00
Daniel Greenfeld
612aa160de Merge pull request #107 from ikkebr/patch-2
Added a default LOGIN_URL
2014-07-09 14:11:07 -07:00
Daniel Greenfeld
38cf9e4514 Merge pull request #106 from ikkebr/patch-1
Updated external links
2014-07-09 14:10:44 -07:00
Henrique Pereira
4473b24b85 Update CONTRIBUTORS.txt
Added my name as requested in #106 and #107
2014-07-09 17:12:11 -03:00
Travis McNeill
6e0f1da0a2 Changed page_title block to be html in the content block
base.html has no page_title block
2014-07-09 14:40:56 -04:00
Daniel Greenfeld
464d0ee9b3 Update CONTRIBUTORS.txt 2014-06-04 10:19:34 -07:00
Daniel Greenfeld
d6d6a344a6 Merge pull request #108 from mozillazg/remove_django-discover-runner
Remove django-discover-runner app
2014-06-04 10:18:33 -07:00
Mozillazg
52a2c555ca Remove django-discover-runner app.
Because it has been added to Django 1.6 as the default test runner.
2014-06-04 11:19:59 +08:00
Henrique Pereira
78894b85cf Added a default LOGIN_URL
Added "account_login" as the default LOGIN_URL in settings.py.

This fixes a problem where the application will throw a 404 on the login page if you changed allauth from "/accounts" to anything else.
2014-05-28 14:36:43 -03:00
Henrique Pereira
52e2261f3f Updated external links
Updated Bootstrap, jQuery and Angular external links
2014-05-28 11:16:08 -03:00
Daniel Greenfeld
fdff60d930 Added @kevinastone to contributors 2014-05-23 09:22:09 -07:00
Daniel Greenfeld
86c8343ddc Merge pull request #104 from kevinastone/master
Added a simple Vagrantfile for setting up a development virtual machine.
2014-05-23 09:21:16 -07:00
Kevin Stone
37e3059d65 Added a simple Vagrantfile for setting up a development virtual machine. 2014-05-21 21:14:07 -07:00
Daniel Greenfeld
02f03e3d56 Merge pull request #103 from luzfcb/master
upgrade dependencies to latest versions available
2014-05-15 11:52:01 -07:00