Commit Graph

3893 Commits

Author SHA1 Message Date
Daniel Roy Greenfeld
2f605ce731 Update travis to support Python 3.4 and 3.5 2015-11-06 19:53:16 -08:00
Audrey Roy Greenfeld
21d1c887e3 Ignore .cache/ generated by running the cookiecutter-django tests. 2015-11-06 19:46:11 -08:00
Audrey Roy Greenfeld
7e8f58d6ec Fix test failure due to favicon.ico being opened by DjangoCookieTestCase.check_paths(). 2015-11-06 19:44:10 -08:00
Audrey Roy Greenfeld
1c1ca39618 Add #391 to changelog. 2015-11-06 19:07:11 -08: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
Daniel Roy Greenfeld
ea9dec49d7 Bump Django in setup.py 2015-11-04 20:28:23 -08:00
Fábio C. Barrionuevo da Luz
c5fcb4895b Merge pull request #395 from pydanny/update-requirements
update requirements
2015-11-04 23:30:04 -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
aedba0b1f5 Add #371 to changelog. 2015-10-29 20:05:41 -05:00
Audrey Roy Greenfeld
1a4e5738d4 Merge pull request #371 from yunti/patch-1
Update deployment-on-heroku.rst for ADMIN_URL
2015-10-28 20:46:38 -07:00
Audrey Roy Greenfeld
7a304981cd Add #378 to changelog. 2015-10-27 23:01:10 -05: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
Daniel Roy Greenfeld
0c80d91112 Version 2015-10-25 09:30:19 -07:00
Daniel Roy Greenfeld
b76f402541 Added version and tagging policy 2015-10-25 09:29:43 -07:00
Daniel Roy Greenfeld
0351c29295 Added so we can list it on PyPI and therefore displayed on djangopackages.com as compatible with Python 3. 2015-10-25 08:36:20 -07: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
683872bc20 added the docker related changes from @audreyr and @jayfk 2015-10-24 19:38:06 +02: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
2ffdffe9c7 Merge branch 'master' of https://github.com/pydanny/cookiecutter-django 2015-10-24 19:18:40 +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
Jannis Gebauer
1f36ed3c8e Merge branch 'master' of https://github.com/pydanny/cookiecutter-django 2015-10-24 18:46:49 +02:00
Jannis Gebauer
a05d1c99e9 Merge branch 'master' of github.com:jayfk/cookiecutter-django 2015-10-24 18:46:29 +02:00
Audrey Roy Greenfeld
e852bfe5b9 Update history. Add TODOs for @pydanny and @theskumar to update for your changes 🔔 2015-10-22 12:42:53 -07: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
Daniel Roy Greenfeld
811e98f4cf Contribution updates 2015-10-14 13:26:01 -07:00
Daniel Roy Greenfeld
ab7e2635ca Merge pull request #376 from MathijsHoogland/patch-1
Removed unnecessary space
2015-10-14 13:08:04 -07:00
Audrey Roy Greenfeld
1a886dc098 Merge pull request #377 from MathijsHoogland/patch-2
Added clarification on building for local or production
2015-10-14 13:04:59 -07:00
Audrey Roy Greenfeld
251e8d1ddd Document the project generation options. 2015-10-14 12:59:14 -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