Commit Graph

200 Commits

Author SHA1 Message Date
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
Daniel Roy Greenfeld
e8c91c1fa7
Update README.rst 2018-04-08 17:04:02 -05:00
Nikita P. Shupeyko
418b53bf77 Rename use_sentry_for_error_reporting to use_sentry
Rationale: consistency
2018-04-03 12:12:26 +03:00
Wan Liuyang
d1198f63b1
Drop Opbeat (#1578) 2018-03-21 19:54:27 +08:00
Nikita Shupeyko
3f8aa26d0f
Group environment variables by the corresponding directories (#1295)
* Update generated project's .gitignore

* Post-gen gitignore .env/ and .env

* Fix linesep between gitignored entries

* Persist `.env/**/*` files into cookiecutter-django's VCS

* Rename .env/ to .envs/

* Reference the newly created .envs/**/.* files in local.yml

* Reference the newly created .envs/**/.* files in production.yml

* Delete .env.example

* Refactor post-gen-project.py

Closes #1299.

* Implement production-dotenv-files-to-dotenv-file merge script

* Create shared PyCharm Run Configuration for the automation script

* Randomize POSTGRES_PASSWORD in ./envs/(.local|.production)/.postgres

* Default POSTGRES_PASSWORD and POSTGRES_USER to random values

* Fix jinja linebreaks in local.yml

* Spaces in production.yml

* Fix post-merge leftovers & set DJANGO_ADMIN_URL automatically

* Prettify here and there

* Fix FileNotFoundError

* Leave a TODO in post_gen_hook.py

* Introduce keep_local_envs_in_vcs option

* Remove envs when not opted for

* Inline pre_gen_project.py if-condition

* Get rid of PROJECT_DIR_PATH in post_gen_project.py

* Clean up the docs

* Match copyright notices

* Document envs ins and outs
2018-03-08 15:56:15 +03:00
Nikita P. Shupeyko
ea54bfe175 Opt PostgreSQL for minor versions as well 2018-03-04 17:28:42 +03:00
Nikita P. Shupeyko
4a1cdb5d25 Drop support for PostgreSQL 9.2
Closes #1493.
2018-03-04 12:39:15 +03:00
Daniel Roy Greenfeld
3cfafcf347
Update README.rst 2018-02-21 18:43:29 -05:00
Bruno Alla
c7238238f8 Update README, Changelog and setup.py after Django 2.0 upgrade 2018-02-20 08:13:24 +00:00
jose Gabriel Guzman Lopez
cbd44dc4b9 Update README.rst (#1518) 2018-02-18 19:20:15 +03:00
Bruno Alla
b66d7a4f04 Rename badge 2018-02-02 23:40:42 +00:00
Bruno Alla
dc8a8a43ca Add Code triage badge
[Code triage](https://www.codetriage.com/)is a service that nudge
people to help triage issues from OSS they care about.
It's picking a random issue from a project people follow and send it
to their inbox.
2018-01-30 22:55:36 +00:00
Elena Williams
3f499f16c3 Update versions and option in README (#1463)
Postgres versions had been updated and `custom_bootstrap_complation` had
been added in the 'Usage' section.
2018-01-22 18:37:53 -08:00
Audrey Roy Greenfeld
2c0d5cfc9e Updated README 2018-01-15 12:51:24 -08:00
Daniel Roy Greenfeld
ea8e70a362 Update the README 2018-01-15 12:43:34 -08:00
Daniel Roy Greenfeld
793a46ba45 Removed expiramental elastic beanstalk support and bumped official Django version to 1.11.9 2018-01-15 12:33:51 -08:00
Audrey Roy Greenfeld
5395687f73 Upgraded to Django 1.11 to resolve 2017-12-28 08:19:19 -08:00
Alex Gleason
2904a32e95 dairy --> dessert (#1386) 2017-11-13 20:32:04 -08:00
Raphael Pierzina
c8210f063c Fix formatting in README.rst 2017-09-19 14:40:57 +02:00
Reggie Riser
874caee360 Removed references and old CSS specific to Bootstrap alpha. (#1333)
* Removed references and old CSS specific to Bootstrap alpha.

* Fixed Bootstrap alpha reference in README.
2017-09-18 10:44:16 +03:00
Fábio C. Barrionuevo da Luz
7bb1d1af21 fix Caddy link and add LetsEncrypt link on README 2017-08-25 09:47:02 -03:00
Jannis Gebauer
e4d94b52d5 add support option 2017-08-11 13:02:11 +02:00
Jannis Gebauer
abf8f2c97a add caddy to feature list 2017-08-11 11:28:42 +02:00
Jannis Gebauer
8801c50867 switch to caddy (#1282) 2017-08-11 11:16:15 +02:00
Nikita P. Shupeyko
394880a468 Remove latest PyPI version badge
For the same reason as in #1203.
2017-07-31 12:58:29 +03:00
Shupeyko Nikita
32b429a3bf Add PyPi badge indicating the latest stable release available (#1262)
Closes #1202.
2017-07-31 12:47:29 +03:00
Daniel Roy Greenfeld
afed9180da Update README.rst 2017-07-17 17:40:34 -07:00
Daniel Roy Greenfeld
5fab2f4bf5 Update README.rst 2017-05-11 08:38:13 -07:00
Daniel Roy Greenfeld
22e47a5dfd Update the support section 2017-05-11 08:37:17 -07:00
Daniel Roy Greenfeld
095d7417b8 Update README.rst 2017-04-25 20:04:20 -07:00