Commit Graph

4914 Commits

Author SHA1 Message Date
Daniel Greenfeld
d8b7e785f5 Added cookiecutter version warning 2015-01-13 08:41:08 -08:00
Daniel Greenfeld
32bee30d6a Corrected 'repo_name' so it's not on my personal branch 2015-01-13 08:39:10 -08:00
Daniel Greenfeld
b54309c48f Switched to using cookiecutter 0.9.0 Jinjafied cookiecutter.json 2015-01-13 08:37:28 -08:00
Daniel Greenfeld
7a73edd752 Merge pull request #174 from hairychris/patch-1
Update django-allauth 0.18.0 --> 0.19.0
2015-01-05 09:53:42 -08:00
Chris Franklin
4412abd588 Update django-allauth 0.18.0 --> 0.19.0 2015-01-04 23:26:34 +00:00
Fábio C. Barrionuevo da Luz
9346057b29 Merge pull request #173 from zcho/patch-1
Fix lost import
2015-01-04 13:03:15 -03:00
zcho
12aa741b31 Update CONTRIBUTORS.txt 2015-01-04 17:07:27 +03:00
Fábio C. Barrionuevo da Luz
3c6cbd53b9 Update CONTRIBUTORS.txt 2015-01-04 10:46:09 -03:00
zcho
a3ceb4c9f5 Fix lost import
Return lost import for 
raise forms.ValidationError(self.error_messages['duplicate_username'])
2015-01-04 13:59:38 +03:00
Saurabh Kumar
67eeeeab6c Merge pull request #172 from Phyxsius/patch-3
Patch 3
2015-01-04 12:54:02 +05:30
Andy
bdb2147590 Fixed typo 2015-01-03 16:56:01 -06:00
Andy
a81ffdc87d Fixed typo 2015-01-03 16:54:35 -06:00
Saurabh Kumar
16f55a389d upgrade to django 1.7.2 2015-01-03 11:45:06 +05:30
Saurabh Kumar
920dfc2ebb chore(requirements): update pillow 2.6.1 -> 2.7.0
see: http://pillow.readthedocs.org/releasenotes/2.7.0.html
2015-01-02 16:27:34 +05:30
Saurabh Kumar
6009b70bbc Merge pull request #171 from chrishepner/patch-2
Update default year to 2015. Thanks @chrisfranklin
2015-01-02 16:22:18 +05:30
Chris Hepner
93b0f57a16 Update default year to 2015. 2015-01-01 12:27:26 -08:00
Fábio C. Barrionuevo da Luz
b5054f4cc8 Merge pull request #168 from Phyxsius/patch-1
Fixed typo [skip ci]
2014-12-31 17:54:05 -03:00
Fábio C. Barrionuevo da Luz
3f782d1bf9 Merge pull request #169 from Phyxsius/patch-2
Fixed typo and case change
2014-12-31 17:05:02 -03:00
Andy
23fb0572c3 Update CONTRIBUTORS.txt 2014-12-31 12:24:00 -06:00
Andy
f712016bf7 Fixed typo and case change 2014-12-31 11:27:37 -06:00
Andy
69fb567787 Fixed typo 2014-12-24 00:13:23 -06:00
Fábio C. Barrionuevo da Luz
e68479a502 Merge pull request #166 from luzfcb/force-travis-not-send-email
force travis-ci not send email with "build status" to github repo owner
2014-12-19 06:23:50 -03:00
Saurabh Kumar
a4568173f6 fix boto==2.34.1 not available, update dep to latest 2014-12-19 14:41:23 +05:30
Saurabh Kumar
a162aa4c98 Merge pull request #156 from martinblech/django-extensions
Added django-extensions to local configuration
2014-12-19 14:32:30 +05:30
Martin Blech
a362c4041a Added django-extensions to local configuration
It's one of the recommended apps in Two Scoops of Django. `runserver_plus` and
`shell_plus` are real time-savers!
2014-12-18 18:29:02 -03:00
Daniel Greenfeld
ec3a480595 Merge pull request #158 from martinblech/atomic-requests
Added ATOMIC_REQUESTS=True to default DB setup
2014-12-18 09:12:34 -08:00
Saurabh Kumar
7b09ef5090 Merge pull request #157 from martinblech/replace-yourapp
Replaced `yourapp` with `repo_name` template var.
2014-12-18 22:35:44 +05:30
Daniel Greenfeld
10beba8a61 Tiny whitespace fix to force travis to fire 2014-12-18 08:39:27 -08:00
Fabio C. Barrioneuvo da Luz
ce76e5a871 force travis-ci not send email with "build status" to github repo owner 2014-12-18 12:32:41 -03:00
Fábio C. Barrionuevo da Luz
5838d71083 Merge pull request #165 from luzfcb/update-requirements
update requirements
2014-12-18 12:23:11 -03:00
Fabio C. Barrioneuvo da Luz
c35b810aa4 update requirements 2014-12-18 12:19:56 -03:00
Fábio C. Barrionuevo da Luz
214f9cfdf7 Merge pull request #163 from chrisfranklin/patch-3
Fix quote marks in common config to be consistent.
2014-12-15 01:22:25 -03:00
Fábio C. Barrionuevo da Luz
0a73f6990b fix travis badget on README.rst 2014-12-03 12:35:34 -03:00
Chris Franklin
e0cf4337d2 Fix quote marks in common config to be consistent. 2014-12-03 15:07:22 +00:00
Fábio C. Barrionuevo da Luz
38b29c23c8 Merge pull request #159 from chrisfranklin/patch-3
Few minor cleanups
2014-12-03 12:06:23 -03:00
Chris Franklin
9ee47dab78 Fix quote marks 2014-12-03 15:04:52 +00:00
Chris Franklin
7e048c8942 Fix spelling mistakes in production config 2014-12-03 15:02:52 +00:00
Martin Blech
96d053c866 Added ATOMIC_REQUESTS=True to default DB setup
Quoting Two Scoops of Django:
> Use `ATOMIC_REQUESTS` as long as the performance overhead is bearable. That
> means "forever" on most sites.
2014-12-02 17:30:46 -03:00
Daniel Greenfeld
3fb367b477 Add @martinblech to contributors 2014-12-01 17:05:15 -08:00
Daniel Greenfeld
9d268f4e10 Merge pull request #155 from martinblech/vagrant-gateway
Added default Vagrant gateway to INTERNAL_IPS
2014-12-01 17:04:28 -08:00
Martin Blech
f1c53656bc Replaced yourapp with repo_name template var.
No need to ask the user to replace it by hand, cookiecutter can do it for them.
2014-12-01 21:09:28 -03:00
Martin Blech
48a1ddd48c Added default Vagrant gateway to INTERNAL_IPS
Makes Django Debug Toolbar show up too when running inside the Vagrant VM.
2014-12-01 20:54:48 -03:00
Matt Warren
d87d332ef2 add myself to contributors.rst 2014-11-26 00:22:00 +05:30
Matt Warren
e29879d813 addresses issue mentioned here: https://code.djangoproject.com/ticket/19353
adding users in admin resulted in reference to auth.User
2014-11-26 00:21:25 +05:30
Fábio C. Barrionuevo da Luz
c243085d8c Merge pull request #153 from arruda/fix-setup-django-version
Fixing setup.py django version
2014-11-17 20:39:17 -02:00
Felipe Arruda Pontes
3624aae692 adding myself to contributors 2014-11-13 00:35:54 -02:00
Felipe Arruda Pontes
811c1a3336 bumping version of Django in setup.py to correspond to requirements/base.txt 2014-11-13 00:31:17 -02:00
Daniel Greenfeld
57eeef37d0 Merge pull request #149 from benjaminabel/check-pep8
Check for pep8 errors using travis
2014-10-30 16:20:33 -07:00
Benjamin ABEL
8a3c2ff2a9 Set max line lenght to 120 for pep8 2014-10-30 22:26:17 +01:00
Daniel Greenfeld
0aefa073c7 Merge pull request #150 from benjaminabel/patch-1
Explain database configuration in README.rst
2014-10-30 13:39:42 -07:00