cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-16 22:57:05 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,583 Commits 12 Branches 578 Tags 24 MiB
00bac8eb68
Commit Graph

7583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fábio C. Barrionuevo da Luz
a115d28608 Merge pull request #506 from django-stars/master 
Update LICENSE template
 2016-03-23 13:53:36 +02:00
Roman Osipenko
3f7f8a3868 Update LICENSE 
Fix condition check in LICENSE file, which prevent cookiecutter to generate this file.
 2016-03-23 13:16:12 +02:00
Jannis Gebauer
572de69658 Update CHANGELOG.md 2016-03-16 20:26:01 +01:00
Jannis Gebauer
8d233805fb Merge pull request #503 from calculuscowboy/master 
Add POSTGRES_USER environment variable to django service.
 2016-03-16 20:23:39 +01:00
calculuscowboy
0a33611c30 Add POSTGRES_USER environment variable to django service. 2016-03-16 12:06:48 -04:00
Saurabh Kumar
eca82b5aff fix(contributors): fix wrong attribution for @catherinedevlin 2016-03-14 09:36:29 +05:30
Saurabh Kumar
b589120b65 Make sure all github handles have proper url 2016-03-14 09:30:00 +05:30
Saurabh Kumar
4567ef60f1 Add @ChrisPappalardo to list of contributors, update changelog 2016-03-14 09:22:04 +05:30
Saurabh Kumar
852ab76e1e Merge pull request #499 from catherinedevlin/master 
Protect from bad (non-importable) repo names, like those with dashes
 2016-03-14 09:12:43 +05:30
Jannis Gebauer
9a4c149765 adds postgres backup controls to production config 2016-03-08 10:48:31 +01:00
Jannis Gebauer
ec0062dd75 add changes to changelog 2016-03-08 10:45:47 +01:00
Jannis Gebauer
57f296b56a adds @aeikenberry and @menzenski to contributors 2016-03-08 10:45:30 +01:00
Jannis Gebauer
5b1b6ae4aa added docker database backups documentation 2016-03-08 10:42:46 +01:00
Jannis Gebauer
eb4092c159 adds docker database controls 2016-03-08 10:41:58 +01:00
Jannis Gebauer
93c65590ee adds a default postgres user during development 2016-03-08 10:15:05 +01:00
Jannis Gebauer
982b21d61b move from links to depends_on 2016-03-08 10:12:55 +01:00
Jannis Gebauer
1d7fd94ab1 adds documentation for docker 1.10 2016-03-08 10:09:46 +01:00
Jannis Gebauer
acafdc6508 Merge branch 'aeikenberry-docker-compose-v2' 2016-03-08 10:09:30 +01:00
Jannis Gebauer
5ea6258d0d Merge branch 'docker-compose-v2' of https://github.com/aeikenberry/cookiecutter-django into aeikenberry-docker-compose-v2 2016-03-08 10:09:06 +01:00
Jannis Gebauer
9b5f91efb3 updates docs for docker 1.10 2016-03-08 10:07:48 +01:00
Jannis Gebauer
d78df9880d Merge pull request #496 from cdvv7788/issues/254 
Make sure that STATIC_URL != MEDIA_URL
 2016-03-08 10:04:33 +01:00
Jannis Gebauer
ec0e629c1c Merge pull request #492 from menzenski/master 
fix minor typos in project README
 2016-03-08 10:03:24 +01:00
Catherine Devlin
3573272952 Protect from bad (non-importable) repo names, like those with dashes 2016-03-06 05:05:24 -05:00
Fabio C. Barrioneuvo da Luz
8a3d36fe40 update requirements 2016-03-06 01:30:27 -03:00
Aaron Eikenberry
49d1399425 Merge pull request #1 from aeikenberry/docker-compose-v2-tests 
update docker-engine on travis
 2016-03-03 09:50:32 -06:00
Aaron Eikenberry
8f5af542c5 update docker-engine on travis 2016-03-03 09:20:20 -06:00
Aaron Eikenberry
5659cf302c Trying with hard-coded version :( 2016-03-02 22:52:00 -06:00
Aaron Eikenberry
c084e6e905 fixes typo in travis.yml 2016-03-02 22:46:49 -06:00
Aaron Eikenberry
76e23d2cf5 customize docker-compose version on travis-ci 2016-03-02 22:43:17 -06:00
Aaron Eikenberry
45bbd27f39 updates docker-compose format to version 2 #483 2016-03-02 22:16:25 -06:00
Cristian Vargas
bd39eddf77 Update file storages and put them in separate folders 2016-03-02 16:02:28 -05:00
Cristian Vargas
b368dd7e36 Make sure that STATIC_URL != MEDIA_URL 2016-03-02 09:49:34 -05:00
Fábio C. Barrionuevo da Luz
1d731ae48a Merge pull request #494 from pydanny/update-requirements 
Update requirements
 2016-03-01 23:10:29 -03:00
Fabio C. Barrioneuvo da Luz
018560e27a update Hitch test requirements 2016-03-01 22:47:38 -03:00
Fabio C. Barrioneuvo da Luz
047c497113 update django version in setup.py 2016-03-01 22:16:36 -03:00
Fabio C. Barrioneuvo da Luz
9ea65968c1 update requirements 2016-03-01 22:13:07 -03:00
Daniel Roy Greenfeld
1407f8a491 Merge pull request #489 from juliancantillo/master 
Added NEW_RELIC_APP_NAME env var for app.json
 2016-02-29 21:51:54 -08:00
solvire
04f852ca65 pylint-django gets "no-member" error: known issue: implemented suggested workaround 
A known issue with pylint-django

https://github.com/landscapeio/pylint-django/issues/53

2939cb1d1a

Tested on:
pylint==1.5.4
pylint-django==0.7.1
 2016-02-28 01:18:33 -08:00
Matt Menzenski
260bbb0a30 fix minor typos in project README 2016-02-27 21:27:27 -06:00
Fábio C. Barrionuevo da Luz
528423fe67 Merge pull request #491 from Eraldo/patch-3 
Fixed missing closing tag for container on user_list.html
 2016-02-24 18:53:36 -03:00
Eraldo Energy
2e5e361c13 Fixed missing closing tag for container. 2016-02-24 22:50:32 +01:00
Daniel Roy Greenfeld
084d187b7b Fixed borked pytest-sugar requirement 2016-02-24 12:49:06 -08:00
Daniel Roy Greenfeld
05abf3582c Added beginning support for py.test 2016-02-24 12:22:22 -08:00
Jannis Gebauer
d614351d12 Update CHANGELOG.md 2016-02-18 21:49:25 +01:00
Jannis Gebauer
1d6edb6f2b resolved merge conflict 2016-02-18 21:44:08 +01:00
Jannis Gebauer
af9baa50eb Merge pull request #488 from Eraldo/patch-2 
Environment aware registration switch setting
 2016-02-18 21:38:43 +01:00
Julian Andres Cantillo
893ccec900 Merge pull request #1 from juliancantillo/juliancantillo-patch-1 
Added NEW_RELIC_APP_NAME env var for app.json
 2016-02-18 15:22:21 -05:00
Julian Andres Cantillo
6ef60301d1 Added NEW_RELIC_APP_NAME env var for app.json 
When using the one-click deployment to Heroku the building process fails if the app uses NewRelic.
 2016-02-18 15:21:47 -05:00
Eraldo Energy
c7627f4c54 Added account registration switch to env example 2016-02-18 00:46:45 +01:00
Eraldo Energy
22acc55bcc Update settings.rst 2016-02-16 19:07:20 +01:00