Commit Graph

2124 Commits

Author SHA1 Message Date
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
pyup.io bot
d34aa71038 Update pytest from 3.1.1 to 3.1.2 (#1190) 2017-06-10 13:10:46 +03:00
mekhami
611159eecf Create deployment-with-docker.rst (#1189)
Just a little extra clarity on postgres and the .env file, inspired by #1188.
2017-06-08 12:55:29 -07:00
John Franey
a286e32e2b Gulpfile child process spawn (#1074)
* Update gulpfile to use child_process.spawn

Use child_process.spawn in place of child_process exec to ensure that
console output is captured by Gulp.

Fixes #939

* Remove extra line
2017-06-07 18:46:20 +03:00
pyup.io bot
46af6b4760 Update gevent from 1.2.1 to 1.2.2 (#1186) 2017-06-07 18:26:25 +03:00
Fábio C. Barrionuevo da Luz
7e861404ed Merge pull request #1187 from pydanny/pyup-update-sh-1.12.13-to-1.12.14
Update sh to 1.12.14
2017-06-07 09:05:24 -03:00
pyup-bot
847a5fdbc6 Update sh from 1.12.13 to 1.12.14 2017-06-06 20:19:10 -07:00
Cristian Samaniego
1ddc3fcef8 Fix typo and deprecated option in certbot command (#1185)
The --standalone-supported-challenges option has been deprecated since certbot version 0.9.0.
2017-06-02 22:47:53 +03:00
Fábio C. Barrionuevo da Luz
7762177283 Merge pull request #1182 from pydanny/pyup-update-sphinx-1.6.1-to-1.6.2
Update sphinx to 1.6.2
2017-06-02 09:00:12 -03:00
Fábio C. Barrionuevo da Luz
6ed9ceb232 Merge pull request #1180 from pydanny/pyup-update-raven-6.0.0-to-6.1.0
Update raven to 6.1.0
2017-06-02 08:59:45 -03:00
pyup.io bot
85782f72af Update pytest from 3.1.0 to 3.1.1 (#1183) 2017-05-31 21:54:41 +03:00
pyup-bot
798bf0639e Update sphinx from 1.6.1 to 1.6.2 2017-05-28 13:43:56 -07:00
pyup.io bot
890c7cbf4b Update boto from 2.46.1 to 2.47.0 (#1179) 2017-05-26 23:22:55 +03:00
pyup.io bot
cb46ed4584 Update pytest from 3.0.7 to 3.1.0 (#1178) 2017-05-26 23:22:16 +03:00
pyup-bot
765764a4a2 Update raven from 6.0.0 to 6.1.0 2017-05-25 15:02:53 -07:00
pyup.io bot
c86989eb96 Update django-anymail from 0.9 to 0.10 (#1177) 2017-05-22 23:51:29 +03:00
Cristian Samaniego
7c7176d4f9 Fix ipdb docker-compose needed command (#1175)
'run' must be after the -f flag
2017-05-19 21:26:20 +03:00
pyup.io bot
215879aa30 Update sphinx from 1.5.6 to 1.6.1 (#1171) 2017-05-17 00:08:39 +03:00
pyup.io bot
fa03a69b07 Update werkzeug from 0.12.1 to 0.12.2 (#1170) 2017-05-16 11:08:10 +03:00
Shupeyko Nikita
27fb6e1a0a Fix linters.rst sphinx warnings (#1167)
* Fix linters.rst sphinx warnings

* Stick with `` instead of `
2017-05-15 15:01:19 +03:00
Fábio C. Barrionuevo da Luz
96028e3bbe Merge pull request #1168 from pydanny/pyup-update-sphinx-1.5.5-to-1.5.6
Update sphinx to 1.5.6
2017-05-15 08:51:36 -03:00
Fábio C. Barrionuevo da Luz
2a42743c09 Merge pull request #1169 from pydanny/pyup-update-coverage-4.4-to-4.4.1
Update coverage to 4.4.1
2017-05-15 08:51:06 -03:00
pyup-bot
eed7233c1b Update coverage from 4.4 to 4.4.1 2017-05-14 23:39:38 -07:00
pyup-bot
3ae3e74aae Update coverage from 4.4 to 4.4.1 2017-05-14 23:39:37 -07:00
pyup-bot
7e084c2a76 Update sphinx from 1.5.5 to 1.5.6 2017-05-14 13:10:35 -07:00
Delio Castillo
89bc1212b3 Fixes docker file when using letsencrypt. Adds ps command to nginx image for start.sh to be able to run without errors (#1154) 2017-05-12 18:23:22 +02: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
Fábio C. Barrionuevo da Luz
cdebc13edc update celery to 3.1.25 2017-05-10 10:51:49 -03:00
Fábio C. Barrionuevo da Luz
b42357966a Merge pull request #1162 from pydanny/pyup-update-coverage-4.3.4-to-4.4
Update coverage to 4.4
2017-05-08 09:13:41 -03:00
Fábio C. Barrionuevo da Luz
747ea8a44f Merge pull request #1160 from pydanny/pyup-update-django-extensions-1.7.8-to-1.7.9
Update django-extensions to 1.7.9
2017-05-08 09:13:25 -03:00
pyup-bot
451bee63ac Update coverage from 4.3.4 to 4.4 2017-05-07 22:17:23 -07:00
pyup-bot
64dce4b7d1 Update coverage from 4.3.4 to 4.4 2017-05-07 22:17:21 -07:00
pyup-bot
7125d5c447 Update django-extensions from 1.7.8 to 1.7.9 2017-05-06 05:49:21 -07:00