Commit Graph

229 Commits

Author SHA1 Message Date
Bruno Alla
9e7320ea1b Merge branch 'master' into fix_upgrade_py39
# Conflicts:
#	README.rst
#	{{cookiecutter.project_slug}}/.gitlab-ci.yml
#	{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
#	{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
2021-04-08 18:43:54 +01:00
areski
b2fa8b1b18 Update Readme for support Django 3.1 2021-02-04 19:07:31 +01:00
areski
a1d551d067 Update from Python3.8 to Python3.9 2021-01-26 16:13:27 +01:00
Bruno Alla
1e6104ce72 Update badge 2020-11-09 19:31:40 +00:00
Daniel Feldroy
1a701ed70f
Update README.rst 2020-09-30 17:53:04 -07:00
Daniel Feldroy
da850d2217
Update README.rst 2020-09-30 17:52:33 -07:00
Matthias Sieber
5500af7364 update Readme w/ current PostgreSQL version support 2020-07-27 14:08:56 -07:00
Andrew-Chen-Wang
4d5b6db4c1 Added PG 12.3; Dropped 9.4 2020-07-11 21:15:17 -04:00
Bruno Alla
e4a4d90068 Add badge for documentation build status 2020-06-21 14:48:28 +01:00
Bruno Alla
c4e4bea31b Merge branch 'master' into async 2020-04-16 09:43:38 +01:00
Bruno Alla
3d6dce66aa Mention ASGI in the README 2020-04-16 09:43:31 +01:00
Ernesto Cedeno
0cdf60ceac Change Python version to 3.8 2020-03-29 19:55:27 +02:00
Fabio C. Barrioneuvo da Luz
83f28a592c Migrate book domain to Feldroy and other small fixes 2020-03-25 11:57:33 -03:00
Bruno Alla
ea5db6c4f4
Django 3.0 support (#2469)
* Bump Django version to 3.0.x to see what breaks

* Update places where Django 2.2 is mentioned to 3.0

* Update to latest Django 3.0 version

* Bump version in setup.py
2020-03-23 21:41:51 +00:00
Andrew-Chen-Wang
9cf72849e6 Merged parent repo and configured refurbished tests 2020-03-14 13:29:08 -04:00
Daniel Roy Greenfeld
c54345e5f8
Switch sponsorship to Django Crash Course 2020-02-27 21:07:31 -08:00
Vicente G. Reyes
2fb739fed2
Update README.rst
Update command $ pip install "cookiecutter>=1.7.0" on docs
2020-02-20 02:02:48 +08:00
Andrew-Chen-Wang
ac884f3f75 Updated mail service docs
* Trying to appease the Black-linter god...
2020-02-06 20:18:49 -05:00
Bruno Alla
cb95128b17
Change link from Gitter to Slack 2020-01-17 10:56:11 +00:00
Bruno Alla
d1a46b5d4d
Update badge from Gitter to Slack 2020-01-17 10:53:54 +00:00
Bruno Alla
9a3391a6eb
Update image in README
closes #2282
2019-11-12 14:05:30 +00:00
leollon
4a194c6966 Add pre-commit for the generated project. (#2171) 2019-10-29 22:48:39 +08:00
Nicolas Stefani
acb72cb84c Updated docs 2019-09-29 21:48:04 -03:00
Tano Abeleyra
9a3a796a89 Use GCP acronym for Google Cloud Platform 2019-05-27 17:39:45 -03:00
Bruno Alla
15f283bb74
Merge branch 'master' into upgrade/django-2.2 2019-05-27 17:17:43 +01:00
Bruno Alla
92e4bdf171
Make cloud_provider optional (#2067)
Make cloud_provider optional
2019-05-27 15:50:18 +01:00
Curtis St Pierre
4bf795a908 1989 - reworked postgres version options 2019-05-20 08:53:07 -07:00
Tano Abeleyra
de7be3652a Make cloud_provider optional
Some projects may not need AWS or GCS
2019-05-19 12:45:28 -03:00
Bruno Alla
219062cb2b Update to Django 2.2.1 2019-05-17 22:02:50 +01:00
Bruno Alla
9ca91ef428 Merge branch 'master' into upgrade/django-2.1
# Conflicts:
#	README.rst
2019-04-17 08:40:06 +01:00
Bruno Alla
93d5426cb4 Small updates in the READMEs 2019-04-17 08:37:45 +01:00
Bruno Alla
39df72669e Merge branch 'master' into upgrade/django-2.1
# Conflicts:
#	README.rst
2019-04-17 08:33:54 +01:00
Fábio C. Barrionuevo da Luz
4d8e3c8c13 update "description" in the example 2019-04-16 20:42:17 -03:00
Fábio C. Barrionuevo da Luz
6f2a652c2b
update PostgreSQL versions in the example 2019-04-16 19:42:57 -03:00
Vlad
56aa332e01 Documented Google Cloud Storage integration as an alternative to AWS S3 2019-04-14 11:43:05 -05:00
Bruno Alla
2dcbaca3ee Update documentation 2019-04-02 19:38:23 +01:00
Demetris
b312d516a4 Replace Caddy with Traefik (#1714)
## Description

Replace Caddy with Traefik

## Rationale

There is some trouble with the Caddy license (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-329617536) 

@drdaeman suggested using Traefik (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-353655273) which supports ACME and also plays very nice with Docker.

## Comments

I am currently using the proposed setup on a live site and it working great so far. If this PR is of interest to the maintainers, then I could commit more changes and take care of the documentation. Of course, any suggestions by the more experienced people around here, are welcome!
2019-03-19 09:32:45 +00:00
Bruno Alla
b615d671cb
Merge pull request #1961 from ahhda/remove_link
Remove link that does not exist
2019-03-13 06:55:22 -03:00
anuj
4550e4aa37 Remove link that does not exist 2019-03-13 14:31:35 +05:30
anuj
8ce3e6605b Added link for Google Cloud storage blog 2019-03-13 14:22:36 +05:30
Bruno Alla
ebcd5ec098 Cleanup outdated references to Grunt - fixes #1721 2018-08-30 20:34:56 +01:00
Bruno Alla
cf8287e576 Remove duplicate link to the main cookiecutter repo 2018-08-30 20:15:26 +01:00
Mateusz Ostaszewski
80f6b1958e Update bootstrap to 4.1.1 (#1697)
* Update Bootstrap to 4.1.1

* Add myself to contributors
2018-07-12 12:35:28 +03:00
Nikita Shupeyko
275c13292c
Integrate Flower with Docker Compose setup (#1655)
* Integrate Flower with Docker Compose setup locally

* Remove alien worker celeryd option

* Move Flower COPY section below the worker's

* Remove set -o pipefail command from Flower start script

* Flower client authentication

* Override flower service image name

* Move flower service to the end of local.yml

* Install flower==0.9.2 in all environments

* Introduce production flower service

* Fix local flower start script

* Document Flower integration

* Prettify *.django envs

Rationale: consistency.

* Reference local environment Flower docs from the production's

* 'two more services' -> 'three more services'
2018-06-27 19:33:21 +03:00
Nikita P. Shupeyko
75c423c88e Update @pydanny and @webyneter bios 2018-06-12 13:56:23 +03:00
msaizar
225aca189c Added articles to README.rst (#1659)
* Added articles to README.rst

* Updated CONTRIBUTORS.rst
2018-05-27 20:12:56 +03:00
Nikita P. Shupeyko
9eebd077bd Update README.rst 2018-05-21 21:35:08 +03:00
Jannis Gebauer
fac121a73b
Update README.rst 2018-05-10 23:12:49 +02:00
Nikita P. Shupeyko
a22390ad4f Introduce debug cookiecutter option 2018-05-05 13:47:25 +03:00
Daniel Roy Greenfeld
1355222385
Add black badge 2018-04-08 17:05:08 -05:00