cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-24 02:24:07 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,203 Commits 13 Branches 582 Tags 25 MiB
3cb828e528
Commit Graph

1203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Krzysztof Szumny
3cb828e528 fix for failng test " raise VersionConflict(dist, req).with_context(dependent_req)" 2016-04-13 01:22:42 +02:00
Jannis Gebauer
86d6d8e423 Update CHANGELOG.md 2016-04-12 15:36:44 +02:00
Jannis Gebauer
1af5977630 celeryworker and celerybeat missing the correct dockerfile 2016-04-12 15:36:13 +02:00
Jannis Gebauer
0954ec8dad switch to named docker volumes 2016-04-08 08:31:02 +02:00
Jannis Gebauer
c521458928 Update CHANGELOG.md 2016-04-07 08:52:01 +02:00
Jannis Gebauer
dec0545ef7 Merge pull request #511 from epileptic-fish/features/readme-licence 
Template license in README.rst based on user's choice.
 2016-04-07 08:49:17 +02:00
Jannis Gebauer
ca508b8b58 adds @noisy to contributors 2016-04-07 08:48:02 +02:00
Jannis Gebauer
b3b7007a44 Update CHANGELOG.md 2016-04-07 08:46:23 +02:00
Jannis Gebauer
e25c5999c0 Merge pull request #507 from SpisTresci/pycharm_support_2 
Pycharm Support (including debugging in Docker)
 2016-04-07 08:45:13 +02:00
William Adams
b5ae65f538 Template license in README.rst based on user's choice. 2016-04-01 10:29:27 +01:00
Krzysztof Szumny
fc1b77104d git related fixes 2016-03-28 17:09:56 +02:00
Krzysztof Szumny
aee5b34f8f post_get hook removes docs for pycharm if it isn't used 2016-03-28 01:43:37 +02:00
Krzysztof Szumny
e897d0af52 pycharm/configuration.rst 2016-03-28 00:43:39 +02:00
Krzysztof Szumny
cd7a817249 requirements/local.txt set as default for Pycharm 2016-03-27 21:46:14 +02:00
Krzysztof Szumny
b4ca4cbaea additionall runConfigurations for tests + pycharm service 2016-03-27 20:53:30 +02:00
Krzysztof Szumny
0e3b879d17 pycharm service 2016-03-27 20:47:43 +02:00
Krzysztof Szumny
9e64d225a2 CR fix 2016-03-27 20:39:29 +02:00
Fabio C. Barrioneuvo da Luz
3d3ec182d7 fix issue #508 2016-03-23 17:38:43 -03:00
Krzysztof Szumny
29e659b57b Example runConfigurations for runserver, migrate, tests 2016-03-23 21:24:53 +01:00
Krzysztof Szumny
5f52f9e7e5 Dockerfile and Dockerfile-dev moved to compose/django/ 2016-03-23 20:45:09 +01:00
Krzysztof Szumny
66e8dc1de7 node_modules marked as excluded directory 2016-03-23 20:14:56 +01:00
Krzysztof Szumny
60593a2cbb Default Python Template Language set to Django instead of Jinja2 
Settings > Languages & Frameworks > Python Template Language
 2016-03-23 19:31:56 +01:00
Krzysztof Szumny
58373e44f9 Django Support Enabled by default (Settings > Language & Frameworks > Django 2016-03-23 19:21:43 +01:00
Krzysztof Szumny
da6ba57f05 use_pycharm variable, post_gen_project hook, {{ cookiecutter.repo_name }}/static marked as webResources 2016-03-23 19:05:24 +01:00
Fabio C. Barrioneuvo da Luz
1616332af6 add @romanosipenko to CONTRIBUTORS list. Update changelog 2016-03-23 09:18:31 -03:00
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