Commit Graph

2246 Commits

Author SHA1 Message Date
Bruno Alla
4be48b7999 Use django-storages for media files if using WhiteNoise - fixes #1192
As per the discussion in #869, WhiteNoise is for serving static files
not for media files (files uploaded from the app by users).
For such thing, we still need `DEFAULT_FILE_STORAGE` to be set and
we use django-storages for that.
2017-08-02 20:10:49 +01:00
Bruno Alla
12db5176d6 Upgrade to boto3 fixes #998
- Boto3 is the replacement of boto, switch to the latest version
- Switch django-storages class to the one based on Boto3
- AWS_S3_CALLING_FORMAT isn't relevant anymore
2017-08-02 20:00:03 +01:00
pyup.io bot
83081a20b5 Update factory-boy to 2.9.1 (#1272)
* Update factory-boy from 2.9.0 to 2.9.1

* Update factory-boy from 2.9.0 to 2.9.1
2017-08-02 16:07:25 +03:00
pyup.io bot
c5ed6173b2 Update pytest from 3.1.3 to 3.2.0 (#1271) 2017-08-02 08:15:51 +03:00
Bruno Alla
4e9f18b52d Add @browniebroke to CONTRIBUTORS.rst 2017-08-02 00:51:31 +01:00
Bruno Alla
9017432421 Update django-storages fixes #998
The -redux project is now the official project, update to the latest version
2017-08-01 22:34:09 +01:00
Ben Warren
ffedad9103 Add project generation option docs (#1267)
* Add project generation option docs

* Alter wording
2017-08-01 20:06:07 +03:00
Nathan Victor
b4e68a6bf1 Update 404 with how to link (#1244) 2017-07-31 16:57:33 +03:00
orzarchi
d36ff72c0f Fix gulpfile default task stuck on runServer (#1260) 2017-07-31 16:04:36 +03:00
Shupeyko Nikita
fe903e5c14 Fix docs erros/typos (#1264)
* Fix #.1

* Fix #.2

[Running management commands: "docker-compose -f production.yml run" to "docker-compose -f local.yml run'](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html#running-management-commands).

* Fix #.3

Designate @bertdemiranda as a contributor (#1242).
2017-07-31 13:27:58 +03:00
Bert de Miranda
ce33b0c498 Update developing-locally-docker.rst (#1242) 2017-07-31 13:16:38 +03: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
pyup.io bot
041616db2c Update factory-boy to 2.9.0 (#1259)
* Update factory-boy from 2.8.1 to 2.9.0

* Update factory-boy from 2.8.1 to 2.9.0
2017-07-31 09:45:09 +03:00
Shupeyko Nikita
37837e9902 Fix ALLOWED_HOSTS (#1164) 2017-07-30 15:43:01 +03:00
pyup.io bot
993aac6b95 Update flake8 to 3.4.1 (#1254)
* Update flake8 from 3.4.0 to 3.4.1

* Update flake8 from 3.4.0 to 3.4.1
2017-07-29 05:57:27 +03:00
pyup.io bot
e7ae16eeb6 Update flake8 to 3.4.0 (#1253)
* Update flake8 from 3.3.0 to 3.4.0

* Update flake8 from 3.3.0 to 3.4.0
2017-07-28 11:16:01 +03:00
pyup.io bot
60e57117d6 Update psycopg2 to 2.7.3 (#1247)
* Update psycopg2 from 2.7.2 to 2.7.3

* Update psycopg2 from 2.7.2 to 2.7.3

* Update psycopg2 from 2.7.2 to 2.7.3
2017-07-26 09:20:21 +02:00
pyup.io bot
30a6151647 Update django-anymail from 0.11 to 0.11.1 (#1248) 2017-07-24 21:59:20 +03:00
pyup.io bot
34c969423f Update psycopg2 to 2.7.2 (#1246)
* Update psycopg2 from 2.7.1 to 2.7.2

* Update psycopg2 from 2.7.1 to 2.7.2

* Update psycopg2 from 2.7.1 to 2.7.2
2017-07-22 21:41:28 +03:00
Fábio C. Barrionuevo da Luz
aaa9800ba8 Merge pull request #1239 from pydanny/luzfcb-heroku-python-3.6.2
update heroku python runtime to 3.6.2
2017-07-20 09:32:25 -03:00
Fábio C. Barrionuevo da Luz
488855d472 update heroku python runtime to 3.6.2 2017-07-20 09:30:25 -03:00
Daniel Roy Greenfeld
afed9180da Update README.rst 2017-07-17 17:40:34 -07:00
Shupeyko Nikita
e889316b11 Rename dev.yml to local.yml (#1227)
* Rename dev.yml to local.yml

Closes #1226.

* Rename docker-compose.yml to production.yml
2017-07-14 17:09:41 +03:00
pyup.io bot
38f53b5886 Update django-anymail from 0.10 to 0.11 (#1232) 2017-07-14 10:50:26 +03:00
Hamish Durkin
afb6b79fc3 Updated idea run configurations to work as explained in the docs (#1223) 2017-07-09 16:04:27 +03:00
pyup.io bot
db45132724 Update django-extensions from 1.8.0 to 1.8.1 (#1219) 2017-07-09 15:36:38 +03:00
pyup.io bot
57410882ae Update boto from 2.47.0 to 2.48.0 (#1220) 2017-07-09 15:36:22 +03:00
pyup.io bot
03648d3d01 Update pillow from 4.1.1 to 4.2.1 (#1221) 2017-07-09 15:36:07 +03:00
pyup.io bot
43b8e96cd3 Update pytest from 3.1.2 to 3.1.3 (#1218) 2017-07-05 10:30:24 +03:00
pyup.io bot
b3bf6f4f67 Update django-extensions from 1.7.9 to 1.8.0 (#1217) 2017-07-03 23:01:17 +03:00
pyup.io bot
ba4869feea Update sphinx from 1.6.2 to 1.6.3 (#1215) 2017-07-03 20:37:08 +03:00
pyup.io bot
44aff93933 Update django-storages-redux from 1.3.2 to 1.3.3 (#1210) 2017-06-27 23:44:33 +03:00
Charles Han
c63ba28e36 Change to process *.scss instead of only project.scss. (#1209) 2017-06-26 22:52:40 +03:00
shireenrao
1871abd7e9 Setting up new project with mailhog without docker breaks use of mailhog (#553)
* add mailhog container for local development

* update local settings to use mailhog container for docker

* remove whitespace

* remove whitespace

* fix whitespace formatting

* another try to fix whitespace

* fix block error due to whitespace

* only use mailhog in docker if docker and mailhog is chosen in setup wizard

* Remove warning at end if using docker and mailhog

* mailhog should work locally without docker

* remove unnecessary check for docker in dev docker-compose file

* Remove section within local development docs referencing docker

As this document is meant as a how to for developing locally, I removed the section which was added for using mailhog in docker. I will add that section to the developing-locally-docker.rst file. Also removed jinja template as it does not work in docs.

* Added a comment on mailhog for local docker development

* fix hyperlink to #smtp-backend

* Added a comment on mailhog for local docker development

* pull docs/developing-locally-docker.rst from upstream

* remove changes from dev.yml and add comment for local.py

* Sync with pydanny:master
2017-06-26 22:21:32 +03:00
Fábio C. Barrionuevo da Luz
9b57c8f4b7 Merge pull request #1208 from pydanny/pyup-update-django-test-plus-1.0.17-to-1.0.18
Update django-test-plus to 1.0.18
2017-06-26 15:53:34 -03:00
pyup-bot
50a4beed7e Update django-test-plus from 1.0.17 to 1.0.18 2017-06-26 10:15:47 -07:00
pyup-bot
854683de3e Update django-test-plus from 1.0.17 to 1.0.18 2017-06-26 10:15:46 -07:00
Ashish Patil
292c419001 [Fix] #1173 Nginx SSL redirect loop (#1174)
Headers not being passed was causing nginx to redirect to SSL again & again.
2017-06-21 23:49:35 +03:00
Shupeyko Nikita
10577e97d1 Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165) 2017-06-21 23:49:28 +03:00
Shupeyko Nikita
e8037d595e Fix index.rst sphinx warnings (#1166) 2017-06-21 23:49:12 +03:00
Shupeyko Nikita
28af86b48d Pin mailhog Docker image to v1.0.0 (#1201) 2017-06-21 23:18:34 +03:00
Shupeyko Nikita
1f7be4eb57 Revert "Node.JS + docker-compose = ♥" (#1206)
* Revert "[Fix] #1173 Nginx SSL redirect loop (#1174)"

This reverts commit cabcc7b106.

* Revert "Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165)"

This reverts commit 83c8594203.

* Revert "Fix index.rst sphinx warnings (#1166)"

This reverts commit 51dd0b5e73.

* Revert "Pin mailhog Docker image to v1.0.0 (#1201)"

This reverts commit d9f870461b.

* Revert "Node.JS + docker-compose = ♥ (#1128)"

This reverts commit 4b06fe3958.
2017-06-21 23:12:22 +03:00
Ashish Patil
cabcc7b106 [Fix] #1173 Nginx SSL redirect loop (#1174)
Headers not being passed was causing nginx to redirect to SSL again & again.
2017-06-20 23:33:39 +03:00
Shupeyko Nikita
83c8594203 Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165) 2017-06-20 23:29:56 +03:00
Shupeyko Nikita
51dd0b5e73 Fix index.rst sphinx warnings (#1166) 2017-06-20 23:29:31 +03:00
Shupeyko Nikita
d9f870461b Pin mailhog Docker image to v1.0.0 (#1201) 2017-06-20 23:27:41 +03:00
Shupeyko Nikita
4b06fe3958 Node.JS + docker-compose = ♥ (#1128)
* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Fix typo

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Revert "Fix typo"

This reverts commit 02033729b5.

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Fix typo

* Revert "Fix typo"

This reverts commit 02033729b5.

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Remove Gulp-Docker integraton not supported initialization message
2017-06-20 22:48:17 +03:00
Emile Petrone
ec62188fae Fix hard coded email (#1193) 2017-06-14 01:00:14 +03:00
Ben Warren
4aff5971d1 Automatic recompilation of Bootstrap with user-defined variables (#1181)
Allow for dynamic bootstrap compilation

Exclude sublime artifacts

Make custom bootstrap vars file

Add custom bootstrap compilation

Add cookiecutter option

Use the right name for the file

Add explanation to generated README

Add self to contributors

Remove sublime exclusion
2017-06-12 19:38:00 +03:00