Daniel Roy Greenfeld
c49c942ba7
Merge pull request #394 from show0k/patch-1
...
Fix python version issue in .travis.yml
2015-11-09 07:19:28 -08:00
Garry Polley
d92d6e6fec
Update django-extensions to current release.
...
Fixes #400
2015-11-08 14:58:07 -06:00
Jay
1ce169d5de
added NEW_RELIC_LICENSE_KEY to environment variables
2015-11-07 20:20:19 +01:00
Jay
6699e6d125
added NEW_RELIC_APP_NAME so that it appears on the dashboard
2015-11-07 20:18:11 +01:00
Jannis Gebauer
ba00160aab
Merge pull request #362 from amjith/master
...
Add newrelic for monitoring.
2015-11-07 20:10:00 +01:00
Jay
205ac33abc
'dsn'.upper()
2015-11-07 19:05:56 +01:00
Jay
87c5360b18
added DJANGO_SENTRY_DSN
2015-11-07 19:04:19 +01:00
Jannis Gebauer
0be1b8ebbe
Merge pull request #397 from ChrisPappalardo/master
...
changed ADMIN_URL to DJANGO_ADMIN_URL in env.example
2015-11-07 18:08:31 +01:00
Daniel Roy Greenfeld
fe9be62cf5
Added *tests* to , because including it is cheating
2015-11-06 16:21:16 -08:00
Chris Pappalardo
85e0471911
changed ADMIN_URL to DJANGO_ADMIN_URL in env.example; the former is not an expected env variable
2015-11-06 10:23:44 -08:00
Audrey Roy Greenfeld
930dee5ddb
Merge pull request #391 from mcho421/master
...
Fix gevent requirement for Python 3
2015-11-05 19:57:29 -08:00
Fabio C. Barrioneuvo da Luz
8c05e0140b
update django-extensions to 1.5.8
2015-11-05 10:02:05 -03:00
Fabio C. Barrionuevo da Luz
dbe5bcc690
update requirements
2015-11-04 23:24:49 -03:00
Théo Segonds
7f3fad80ce
Update .travis.yml
...
fix python version issue
2015-11-03 16:23:00 +01:00
Colm O'Connor
acdec670f0
Resolved conflict from changed base.html not having HTML IDs
2015-11-02 15:23:49 +08:00
mcho421
8c2a4cc317
Fix gevent requirement for Python 3
2015-10-31 12:34:37 +11:00
Audrey Roy Greenfeld
1adb10c300
Merge pull request #378 from MathijsHoogland/patch-3
...
Added sudo: true to the travis file
2015-10-26 23:44:59 -05:00
Daniel Roy Greenfeld
084fb2529e
Fixed flake8 issue
2015-10-25 17:37:34 -07:00
Audrey Roy Greenfeld
8307e43d15
Move LOGGING setting to production from common, since it's not useful locally.
2015-10-25 17:30:36 -05:00
Audrey Roy Greenfeld
d04a59fbe8
Update nav in base template to latest Bootstrap 4 version.
2015-10-24 20:31:36 -05:00
Jannis Gebauer
8fe03fe553
no need to chown the file
2015-10-24 19:27:04 +02:00
Jannis Gebauer
fc54af7b15
use REDIS_URL instead of DJANGO_CACHE_URL, fixes #379
2015-10-24 19:25:46 +02:00
Jannis Gebauer
fe497c6dd0
move development postgres data volume to /data/dev to avoid conflicts with production volume
2015-10-24 19:23:43 +02:00
Jannis Gebauer
571530dd09
removed unused commands from development dockerfile
2015-10-24 19:22:08 +02:00
Jannis Gebauer
dc67886f64
Merge pull request #385 from pydanny/change-add-to-copy
...
Use COPY instead of ADD in Dockerfiles
2015-10-24 19:15:53 +02:00
Audrey Roy Greenfeld
dcaa3e91c2
Merge branch 'master' of github.com:pydanny/cookiecutter-django
2015-10-22 12:37:35 -07:00
Audrey Roy Greenfeld
f9f4876e11
Remove unnecessary gitkeep. Already another file in that dir.
2015-10-22 12:37:14 -07:00
Audrey Roy Greenfeld
3d6169c2b9
Use COPY instead of ADD as per https://docs.docker.com/articles/dockerfile_best-practices/#add-or-copy
2015-10-22 12:35:55 -07:00
Daniel Roy Greenfeld
2b550a75d5
removed isort link
2015-10-21 13:19:08 -07:00
Saurabh Kumar
676739332a
Update requirement, coverage, factory-boy
2015-10-22 00:25:01 +05:30
Saurabh Kumar
f01cddeae6
fix requirement, update django-autoslug to 1.9.3
...
Thanks @cdvv7788 / @aniketmaithani
2015-10-22 00:19:24 +05:30
Colm O'Connor
cc98785734
Hitch : Updates to the default framework template - to accomodate new features, rationalized features and bug fixes.
2015-10-20 17:53:03 +08:00
Audrey Roy Greenfeld
c98934d7d5
When developing on Windows, only install psycopg2 in test/prod.
2015-10-19 16:02:42 -07:00
Adam Dobrawy
e1d76ea25e
Add factories for users
2015-10-18 13:58:41 +02:00
Audrey Roy Greenfeld
a7c2cf8f56
Set example ALLOWED_HOSTS to be domain and its subdomains.
2015-10-15 14:40:12 -07:00
Daniel Roy Greenfeld
08ab710ea4
Cryptographically secured env.example secret key
2015-10-15 09:29:43 -07:00
MathijsHoogland
ccc0262c5e
Added sudo: true to the travis file
...
Sudo isn't true for default for some people in travis.
2015-10-14 16:41:28 +02:00
MathijsHoogland
5a8f1ed4b1
Removed unnecessary space
2015-10-14 14:22:22 +02:00
Saurabh Kumar
4f7e5e5c97
Update requirements to latest stable
...
- django-autoslug==1.9.2
- django-debug-toolbar==1.4
- gevent==1.0.2
2015-10-13 14:22:36 +05:30
Anna Callahan
daedd6c4c3
Fix for raven not being loaded on development
...
related to issue #302
2015-10-11 14:10:39 -04:00
Amjith Ramanujam
4acd6ad098
Remove blank lines to fix flake8 compliance.
2015-10-08 05:38:05 -07:00
Audrey Roy Greenfeld
1027befea1
Merge pull request #361 from pydanny/multiple-dockerfiles
...
Multiple Dockerfiles. Implementation of #360 .
2015-10-06 10:46:18 -07:00
Fabio C. Barrioneuvo da Luz
b22611a1a3
update requirements
2015-10-05 18:09:55 -03:00
Chris Franklin
694bbb2e81
Fixes #363 - Remove stray closing tags, fix navbar margin
...
Removes stray </ul> tags that don't seem like they should be there. Reduces topbar bottom margin because it looked bad.
2015-10-04 15:44:06 +01:00
Amjith Ramanujam
c35d759b74
Fix the template syntax error.
2015-10-04 05:51:09 -07:00
Amjith Ramanujam
c0c0bc6ca3
Add newrelic for monitoring.
2015-10-04 05:06:20 -07:00
Jay
faa534b3c1
Enhances #360
2015-10-04 12:13:42 +02:00
Audrey Roy Greenfeld
e23e9ceb7e
Multiple Dockerfiles. Implementation of #360 .
2015-10-03 20:06:33 -07:00
Daniel Roy Greenfeld
a6e10f6600
Correct production name
2015-10-03 17:08:11 -07:00
Daniel Roy Greenfeld
4781c2baa2
Flake8 fix
2015-10-03 15:58:49 -07:00
Daniel Roy Greenfeld
0c9dfd8de6
Merge branch 'master' of github.com:pydanny/cookiecutter-django
2015-10-03 15:42:40 -07:00
Daniel Roy Greenfeld
9b34bf16ec
Fixing the build
2015-10-03 15:42:33 -07:00
Fábio C. Barrionuevo da Luz
606e1de157
escape admin url usage example in comment
2015-10-03 19:35:27 -03:00
Daniel Roy Greenfeld
6dbf4e88d6
Add the DJANGO_ADMIN_URL to app.json
2015-10-03 15:01:35 -07:00
Daniel Roy Greenfeld
58ec2fe113
URL to django.contrib.admin is now configurable
2015-10-03 14:54:29 -07:00
Fabio C. Barrioneuvo da Luz
0fb5f5d854
Update version of requirements
...
cookiecutter, coverage, django-environ, django-extensions, hitchpython, hitchselenium, hitchserve, pytest, pytz, whitenoise
2015-09-30 15:10:12 -03:00
Fábio C. Barrionuevo da Luz
09b61bab1a
Merge pull request #354 from siauPatrick/master
...
String view arguments to url() is deprecated in django 1.9
2015-09-30 12:44:19 -03:00
Roman Afanaskin
5150f0ec2d
String view arguments to url() is deprecated in django 1.9
2015-09-30 18:13:16 +03:00
Jannis Gebauer
b465ccc9b2
fix sentry logging in conjunction with celery
2015-09-30 10:39:25 +02:00
Audrey Roy Greenfeld
f0cc78f01f
Move .pep8 to setup.cfg.
2015-09-26 00:47:44 -07:00
Audrey Roy Greenfeld
8facd2448d
Better .pep8 excludes
2015-09-26 00:40:39 -07:00
Audrey Roy Greenfeld
54d1742446
Merge pull request #283 from kaidokert/master
...
Add .pep8 and .pylintrc, for #282
2015-09-26 00:37:05 -07:00
Audrey Roy Greenfeld
5e1ea0940c
Sass alert improvements (better variables).
2015-09-26 00:29:39 -07:00
Audrey Roy Greenfeld
ee66f11e5e
Sass linting.
2015-09-26 00:27:08 -07:00
Daniel Greenfeld
7c2777734b
Updated django-mailgun requirement
...
This not only has a nice feature, it also improves Python 3 support.
2015-09-25 23:26:56 -07:00
Daniel Greenfeld
a37b35e50f
Merge pull request #346 from pydanny/remove-flake8-ignore
...
Remove commented-out flake8 ignore rule.
2015-09-25 23:25:23 -07:00
Audrey Roy Greenfeld
de4a717b98
Ignore user-uploaded media
2015-09-24 16:19:38 -07:00
Audrey Roy Greenfeld
7c0e979ef3
Update editorconfig to match existing project conventions for 2-space html, css, scss, json
2015-09-24 16:18:20 -07:00
Audrey Roy Greenfeld
9160a3443a
Remove commented-out flake8 ignore rule.
2015-09-24 00:39:42 -07:00
Audrey Roy Greenfeld
8fa150a81f
Have flake8 ignore node_modules/
2015-09-24 00:33:33 -07:00
Audrey Roy Greenfeld
c35a2ece8a
Merge branch 'fix-debug-toolbar'
2015-09-24 00:24:10 -07:00
Audrey Roy Greenfeld
f06cb3c44f
Merge branch 'master' of github.com:pydanny/cookiecutter-django
2015-09-23 23:53:48 -07:00
Audrey Roy Greenfeld
97142763a6
Workaround for debug-toolbar conflict with Bootstrap 4.
2015-09-23 23:53:33 -07:00
Daniel Roy Greenfeld
dc146fc0e8
Update the Python3 in Dockerfile to 3.5
2015-09-22 09:14:56 -07:00
Audrey Roy Greenfeld
650d4f1dd2
Copy mobile navbar fix from css to scss.
2015-09-22 09:04:33 -07:00
Audrey Roy Greenfeld
cf340019a1
Merge pull request #336 from yunti/select-python-version
...
Add python version option for deployment
2015-09-22 08:50:34 -07:00
Daniel Greenfeld
5dfea14970
Merge pull request #338 from siauPatrick/loggers_in_loggers
...
Remove excess "loggers" from LOGGING setting
2015-09-21 21:22:32 -07:00
Daniel Greenfeld
4989efaece
Switch back to django-mailgun proper.
...
As I'm now a maintainer, I feel confident that django-mailgun will be supported going forward.
2015-09-21 15:54:13 -07:00
Roman Afanaskin
379214348e
Remove excess "loggers" from LOGGING setting
2015-09-21 22:36:06 +03:00
Audrey Roy Greenfeld
332f746d27
Update outdated requirements.
2015-09-18 15:22:35 -07:00
Audrey Roy Greenfeld
08a63f5b7d
Merge pull request #337 from jayfk/master
...
fix navbar on mobile
2015-09-18 15:02:21 -07:00
yunti
e63d9fc736
Update runtime.txt
2015-09-18 19:07:09 +01:00
yunti
cb44293d81
Update runtime.txt
2015-09-18 19:04:17 +01:00
yunti
2489bf39ab
Update runtime.txt
2015-09-18 19:02:42 +01:00
yunti
c77c8e0b83
Update Dockerfile
2015-09-18 19:02:33 +01:00
yunti
6662ccbd94
Update runtime.txt
2015-09-18 18:24:18 +01:00
yunti
361ab459e8
Update Dockerfile
2015-09-18 18:24:06 +01:00
Daniel Roy Greenfeld
275f7eee14
Big reorganization of documentation
2015-09-18 10:20:48 -07:00
Jay
1eb23fd046
fix navbar on mobile
2015-09-18 18:45:55 +02:00
yunti
16c3b5f081
Fix for heroku runtime file
2015-09-18 17:41:16 +01:00
yunti
9bf03454fa
Added python 3 option to docker
2015-09-18 17:39:45 +01:00
yunti
b085f023e6
Add python3 runtime option for Heroku deployment
2015-09-18 17:37:15 +01:00
yunti
166121c398
Removed redundant else for Fix for Raven
2015-09-18 09:53:57 +01:00
yunti
5fecdf8405
Fix for wsgi.py for Raven in dev
2015-09-17 19:49:25 +01:00
yunti
d18d3a2ab7
Production settings typo
...
(testing basic pull request before submitting more)
2015-09-17 12:09:26 +01:00
Ian Lee
8ecdc47dee
Added whitespace to allow proper rendering of RST
2015-09-14 23:21:24 -07:00
Audrey Roy Greenfeld
a9aa93acc5
Update outdated Hitch requirements.
2015-09-14 13:25:07 -07:00
Audrey Roy Greenfeld
649a656ee0
Remove unused generated CSS styles.
2015-09-14 13:20:50 -07:00
Audrey Roy Greenfeld
c45c86ad30
Replace navbar-header with Bootstrap m-b-lg for the navbar's margin-bottom.
2015-09-14 13:20:12 -07:00
Fabio C. Barrionuevo da Luz
319c5ac42a
fix 'W391 blank line at end of file' on celery.py
2015-09-13 19:09:23 -03:00
Fabio C. Barrionuevo da Luz
8380f143c6
Merge remote-tracking branch 'origin/issue-296'
2015-09-13 19:01:38 -03:00
Daniel Greenfeld
2b81eb9be7
noqa != pragma
2015-09-13 14:01:51 -07:00
Daniel Greenfeld
191d4768a5
Address test coverage issues.
2015-09-13 13:59:02 -07:00
Audrey Roy Greenfeld
9c9a624ee2
Update Hitch requirements to latest.
2015-09-13 09:56:40 -07:00
Fabio C. Barrionuevo da Luz
db186d9e9a
fix issue #296
2015-09-13 12:59:18 -03:00
Audrey Roy Greenfeld
904f149405
Remove styles that already exist in Bootstrap 4 (or 3).
2015-09-13 08:54:21 -07:00
Daniel Greenfeld
a91d1a41fd
Added htmlcov to .gitignore.
...
No reason to keep these files, as they are purposefully ephemeral.
2015-09-08 18:05:11 -07:00
Daniel Greenfeld
87f02cdf4d
Merge pull request #321 from bogdal/deploy-to-heroku-button
...
Add heroku configuration file
2015-09-04 21:02:09 -07:00
Daniel Greenfeld
4b69720c25
Merge pull request #319 from bogdal/allowed-hosts
...
Allowed hosts
2015-09-03 15:17:22 -07:00
Adam Bogdał
467ccee10c
Add heroku configuration file
2015-09-03 20:52:59 +02:00
Adam Bogdał
734fef14e8
Add DJANGO_ALLOWED_HOSTS variable to the env.example file
2015-09-02 23:22:40 +02:00
Adam Bogdał
b13bd0578e
Make logs more descriptive
2015-09-02 22:59:40 +02:00
Adam Bogdał
e73e967c8d
Fix sentry configuration
2015-09-02 22:10:37 +02:00
Adam Bogdał
1ab5e73b51
Add allowed_hosts to the settings list
2015-09-01 20:50:50 +02:00
Adam Bogdał
b047191709
Set .herokuapp.com as allowed host on heroku
2015-09-01 20:35:43 +02:00
Adam Bogdał
1571b91dad
Add ability to set ALLOWED_HOSTS
2015-09-01 20:18:28 +02:00
Audrey Roy Greenfeld
6b58d65bb6
Remove comments referring to specific lines, which are brittle. Replace with descriptive comment.
2015-08-31 21:53:04 -07:00
Daniel Roy Greenfeld
99a30d08dc
Fix #313 , which is removing dokku
2015-08-31 21:25:23 -07:00
Fabio C. Barrionuevo da Luz
ebc728613e
update AngularJS version to 1.4.4
2015-08-30 23:29:57 -03:00
Fabio C. Barrionuevo da Luz
7ca8863a8c
Small improvements in install_python_dependencies.sh and install_os_dependencies.sh scripts
2015-08-30 22:56:19 -03:00
Fabio C. Barrionuevo da Luz
795fccc15f
Update version of django-crispy-forms to 1.5.1, django-extensions to 1.5.6, django-test-plus to 1.0.9, gevent to 1.1b3, coverage to 4.0b2, hitchpython to 0.3.3 and hitchtest to 0.7.6
2015-08-30 22:52:38 -03:00
Daniel Greenfeld
86239af98f
Merge pull request #315 from pydanny/bootstrap-4
...
Upgrade to Bootstrap 4 alpha
2015-08-30 15:45:09 -07:00
Audrey Roy Greenfeld
139deaf6b8
Put <nav> into a div with a nicer-displaying bottom margin.
2015-08-30 15:41:46 -07:00
Audrey Roy Greenfeld
243e823a2e
Upgrade jQuery to 2.1.4 and Bootstrap JS to Bootstrap 4.
2015-08-30 14:53:52 -07:00
Daniel Roy Greenfeld
97017f7a17
README reorganization
2015-08-30 12:17:46 -07:00
Daniel Roy Greenfeld
f02eacaece
Move dokku to the docs section
2015-08-30 12:12:21 -07:00
Audrey Roy Greenfeld
15dd400769
Be consistent with using non-fluid container in base template.
2015-08-29 21:46:05 -07:00
Audrey Roy Greenfeld
69617648d5
Remove navbar's corners, and invert colors.
2015-08-29 21:44:51 -07:00
Audrey Roy Greenfeld
968c04369e
Update stylesheet to Bootstrap 4. Remove optional theme stylesheet.
2015-08-29 12:11:10 -07:00
Audrey Roy Greenfeld
8330706775
Update navbar and toggle to Bootstrap 4 HTML.
2015-08-29 12:09:45 -07:00
Daniel Roy Greenfeld
cb4e1d0d9d
Switch to django-mailgun-redux
2015-08-28 22:01:26 -07:00
Audrey Roy Greenfeld
63753ac078
Merge pull request #288 from stepmr/grunt-updates
...
Grunt Updates: use libsass, add postcss
2015-08-25 20:56:15 -07:00
Daniel Roy Greenfeld
f573fbcb7d
Changed requirements files to match current dependency versions
2015-08-20 22:08:40 -07:00
Daniel Greenfeld
5c19e0d5f2
Correct spelling
2015-08-19 20:18:08 -07:00
Saurabh Kumar
83dab0b380
Upgrade django to 1.8.4 [security release]
...
https://www.djangoproject.com/weblog/2015/aug/18/security-releases/
2015-08-19 11:59:21 +05:30
Jay
c7ea475f06
refactoring + added documentation
...
- removed env.production and added a env.example that should be renamed to `.env` (not tracked by default)
- Refactored docker-compose.yml
* adding user to django, celeryworker, celerybeat so that we got rid of the `su` hack
* removed rabbitmq
- Refactored Dockerfile
- Refactored `entrypoint.sh` and added inline documentation
- Removed `su` hack from gunicorn.sh
- Added documentation
2015-08-18 17:50:20 +02:00
Jay
0a3ad4d0ec
Merge commit '79dbcc16f8d32f57d25fa7326f6fdd847eecf25a'
...
# Conflicts:
# README.rst
2015-08-18 14:05:47 +02:00
Daniel Greenfeld
dd7259d5aa
Updating Tornado so we aren't in the red for requirements.
2015-08-14 16:23:37 -07:00
Daniel Greenfeld
0d68abcc39
Merge pull request #295 from crdoconnor/master
...
Added support for the Hitch integration testing framework.
2015-08-12 11:41:17 -07:00
Colm O'Connor
4f68d3eb2a
Removed sudo from pip install hitch, since the test invoker strictly speaking does not need to be run globally.
2015-08-12 08:49:06 +08:00
Daniel Greenfeld
2996576556
Upped test to 100% and catching up on changelog
2015-08-09 08:00:24 -07:00
Daniel Greenfeld
0477f2ddb5
Merge pull request #285 from jayfk/patch-1
...
Reflect Celery taskapp refactoring in the docs
2015-08-06 19:03:43 -07:00
Daniel Greenfeld
e02dca8228
Raising coverage of rendered project to 97%.
2015-08-06 18:54:27 -07:00
Kaido Kert
76a207d8da
Oops - revert celery defaults change, separate PR
2015-08-06 11:21:08 -07:00
Daniel Greenfeld
74509ac5cb
Merge branch 'master' of github.com:pydanny/cookiecutter-django
2015-08-05 19:53:52 -07:00
Daniel Greenfeld
8f690d3724
Fixed borked User model
2015-08-05 19:53:46 -07:00
Daniel Greenfeld
d65f2bde6d
Merge pull request #292 from burhan/feature/sentry-support
...
Feature/sentry support
2015-08-05 19:48:34 -07:00
Daniel Greenfeld
518c5d561a
making the user object python 2 and 3 friendly
2015-08-05 18:32:12 -07:00
Audrey Roy Greenfeld
9c74fe4bde
Move gevent above maildump
...
Because maildump's dependencies aren't pinned.
2015-08-05 15:24:34 -07:00
Audrey Roy Greenfeld
ff12536765
If using maildump, pin gevent
...
If using maildump, pin gevent to the version supporting Python 3.
2015-08-05 15:23:01 -07:00
