Commit Graph

688 Commits

Author SHA1 Message Date
Audrey Roy Greenfeld
e794fc1a84 Add "Built with Cookiecutter Django" badge to project README 2016-04-17 11:45:23 -07:00
Bo Lopker
a300f1190d Quote consistency 2016-04-15 23:29:04 -07:00
Audrey Roy Greenfeld
abb41d4dff Merge pull request #516 from pydanny/project-cleanup
Major Project Generation Cleanup
2016-04-15 19:08:42 -07:00
Daniel Roy Greenfeld
72405f2ec9 Merge pull request #493 from solvire/master
pylint-django gets "no-member" error: known issue
2016-04-13 20:29:48 -07:00
Fábio C. Barrionuevo da Luz
6c44ac54d6 upgrade pillow version to 3.2.0 2016-04-14 00:19:15 -03:00
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
1af5977630 celeryworker and celerybeat missing the correct dockerfile 2016-04-12 15:36:13 +02:00
Jannis Gebauer
327d0c2038 major project cleanup 2016-04-08 09:45:09 +02:00
Jannis Gebauer
0954ec8dad switch to named docker volumes 2016-04-08 08:31:02 +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
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
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
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
calculuscowboy
0a33611c30 Add POSTGRES_USER environment variable to django service. 2016-03-16 12:06:48 -04:00
Jannis Gebauer
9a4c149765 adds postgres backup controls to production config 2016-03-08 10:48:31 +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
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
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
Fabio C. Barrioneuvo da Luz
8a3d36fe40 update requirements 2016-03-06 01:30:27 -03: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
Fabio C. Barrioneuvo da Luz
018560e27a update Hitch test requirements 2016-03-01 22:47:38 -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
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
1d6edb6f2b resolved merge conflict 2016-02-18 21:44:08 +01: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
96a4ae33b5 Environment aware registration switch setting
The status of the registration (open or closed) is now read from the project environment instead of hardcoded in the common settings file.
2016-02-16 18:53:37 +01:00