cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-30 05:24:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
976 Commits 12 Branches 585 Tags 25 MiB
733071f121
Commit Graph

576 Commits

Author SHA1 Message Date
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
Audrey Roy Greenfeld
773130acb2 Update coverage version to 4.0b1. 2015-08-05 15:11:51 -07:00
Audrey Roy
ed90eb07b6 Better specification of migrations in .coveragerc. 2015-08-04 21:11:36 -07:00
Colm O'Connor
a8836b390b Added note to the README about hitch not running on windows, and instructions on how to install the test runner. 2015-08-04 23:47:37 +08:00
Colm O'Connor
3f2484d75c Enable hitch tests to be run in Travis CI. 2015-08-04 23:39:27 +08:00
Daniel Greenfeld
85ee76ad7c Flake8 fix 2015-08-03 23:03:45 -07:00
Daniel Greenfeld
9f4e904348 Add tests to the admin 2015-08-03 22:48:55 -07:00
Audrey Roy
9e48191115 Instructions to open the HTML coverage report. 2015-08-03 22:31:39 -07:00
Audrey Roy
a7a3661786 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-03 22:31:08 -07:00
Audrey Roy
5a455b320f Add coverage project-level config file. 2015-08-03 22:30:58 -07:00
Daniel Greenfeld
1b0e53a374 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-03 22:22:07 -07:00
Daniel Greenfeld
48721b3d32 Remove unnecessary form 2015-08-03 22:22:03 -07:00
Audrey Roy
370145bb21 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-08-03 22:21:04 -07:00
Audrey Roy
d4366ce5d5 Add instructions for test coverage. 2015-08-03 22:20:12 -07:00
Daniel Greenfeld
9bb3f08ea3 Update django-allauth 2015-08-03 22:11:53 -07:00
Daniel Greenfeld
f31e10042f Cleaned up signup form 2015-08-03 21:06:56 -07:00
Daniel Greenfeld
bc9e9c7d22 Upgrading test packages 2015-08-03 21:00:42 -07:00
Colm O'Connor
18b1843481 Added support for the Hitch integration testing framework. 2015-08-01 18:26:06 +08:00
Fabio C. Barrioneuvo da Luz
136ade3f67 update django-floppyforms version to 1.5.2 2015-07-30 08:45:11 -03:00
Daniel Greenfeld
09bbc5f853 Removed legacy permalink decorator. 2015-07-29 20:20:26 -07:00
Burhan Khalid
4b0d35194f making sure tests pass 2015-07-29 00:02:57 +03:00
Burhan Khalid
a79e845533 flake8 and misc fixes 2015-07-28 23:26:16 +03:00
Burhan Khalid
69398a8292 fixing production settings logic for middleware 2015-07-28 19:02:41 +03:00
Burhan Khalid
80383aba19 fixing a bug in the allauth configuration 2015-07-27 18:43:37 +03:00
Burhan Khalid
7403679ee7 fixing an allauth setting bug 2015-07-27 18:42:23 +03:00
Fabio C. Barrioneuvo da Luz
dca0a016cf update ipython to 3.2.1 and django-allauth to 0.22.0 2015-07-27 08:36:45 -03:00
stepmr
a59f3458e9 Update package.json 
- add missing pixrem dependency
 2015-07-23 12:17:49 -07:00
stepmr
ac1379e35b Update autoprefixer browser support 
- Use twitter bootstrap project defaults to all compiling bootstrap-sass
 2015-07-23 12:08:49 -07:00
stepmr
16abdf0bb2 Update Gruntfile.js 
- Use grunt-sass instead of compass
- Update grunt build task to use postcss with autoprefixer, cssnano and pixrem
 2015-07-23 12:05:53 -07:00
stepmr
0e66834ae3 Update package.json 
- Update npm dependencies
- Use grunt-sass (ie node-sass/libsass)
- Add posttcss with autoprefixer and cssnano
 2015-07-23 11:49:26 -07:00
Burhan Khalid
40ea180998 updating requirements and misc. fixes 2015-07-22 19:03:15 +03:00
jayfk
5da51a3ece Reflect Celery taskapp refactoring in the docs 
Fixes https://github.com/pydanny/cookiecutter-django/issues/279
 2015-07-21 11:27:50 +02:00
Jay
79dbcc16f8 renaming taskman to taskapp to reflect upstream changes 2015-07-21 11:08:29 +02:00
Jay
35d61c9eee added docker-compose documentation 2015-07-21 10:42:31 +02:00
Jay
7690b42c27 switched to redis cache 2015-07-21 10:22:02 +02:00
Jay
bff7487121 Merge branch 'master' into docker-compose 2015-07-21 10:02:52 +02:00
Saurabh Kumar
613b91d71e Merge pull request #258 from burhan/feature/redis-cache 
adding redis support
 2015-07-21 07:23:26 +05:30
kaido
362f86a4c1 Switch celery default serialization to JSON, to avoid pickle related deprecation warnings 2015-07-19 21:55:29 -07:00
kaidokert
b275c7ca72 Add .pep8 and .pylintrc 2015-07-20 02:10:31 +01:00
stepmr
a9e210dbf5 Generate safe secret_key by default 
Use openssl to generate a secure, random secret_key
 2015-07-18 13:13:49 -07:00
stepmr
696eca2fd2 Use PYTHONHASHSEED=random 
- Django reccomends setting the PYTHONHASHSEED environment variable to random.  See: https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/#python-options
 2015-07-18 13:09:59 -07:00
stepmr
b2816c0e94 Updated heroku setup 
- Heroku's free postgres tier is now "hobby-dev"
- pg:backups require a scheduled time
- add missing Mailgun API key
 2015-07-18 12:48:04 -07:00
Daniel Greenfeld
f073fb6ab5 Added @models.permalink decorator to User.get_absolute_url() method 2015-07-17 08:41:41 -07:00
Daniel Greenfeld
009c4993cc Fixed error in user_form.html 2015-07-17 03:42:42 -07:00
Daniel Greenfeld
52876da0e2 Add testplus 2015-07-16 15:35:16 -07:00
Jay
def7f47572 experimental docker-compose support 2015-07-16 17:43:02 +02:00
Daniel Greenfeld
36454d9893 Removed unnecessary block tag and 'user:' prefix. 2015-07-16 08:25:53 -07:00
Daniel Greenfeld
a848bde153 Merge pull request #264 from burhan/feature/maildump 
Use maildump instead of ConsoleEmailHandler
 2015-07-16 07:27:15 -07:00
jayfk
c9ab3b958e Fixed a bug where 'DEFAULT_FROM_EMAIL' was used to cast the value instead of providing a default 2015-07-16 11:10:36 +02:00
Burhan Khalid
a54081a761 tweaking the comments to match master README 2015-07-16 07:44:49 +03:00
Burhan Khalid
f966888ff1 making maildump optional 2015-07-16 07:21:06 +03:00
Burhan Khalid
07354a3d37 Fixing links for maildump and updating master README 2015-07-16 07:03:16 +03:00
Burhan Khalid
a103eaa93e Adding support for maildump for local development (replaces the nice, but not friendly console email handler) 2015-07-16 06:58:08 +03:00
Daniel Greenfeld
895dc09a45 Much cleaner user urls and added get_absolute_url to User 2015-07-15 20:37:38 -07:00
Daniel Greenfeld
70c871dfbd Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-07-15 13:40:43 -07:00
Daniel Greenfeld
8852fef5f7 Add name to user detail page 2015-07-15 13:40:38 -07:00
Fábio C. Barrionuevo da Luz
d181fca7d4 fix issue #275 2015-07-15 16:53:44 -03:00
Daniel Greenfeld
d412946f93 Fix User initial migration 2015-07-15 12:40:04 -07:00
Daniel Greenfeld
88188812a1 Fix user_list.html 2015-07-15 12:00:20 -07:00
Daniel Greenfeld
1d194d0e12 Remove unnecessary divs from the User form 2015-07-15 11:08:49 -07:00
Daniel Greenfeld
6dbe252c83 Use a more global 'name' field in User model 2015-07-15 11:06:03 -07:00
Daniel Greenfeld
696d1c5606 Making bootstrap containers fluid 2015-07-14 13:23:26 -07:00
Burhan Khalid
5589003ff3 fixing requirements 2015-07-14 12:05:25 +03:00
Daniel Greenfeld
265d14b645 Added ipdb for improved REPL 2015-07-13 20:33:49 -07:00
Audrey Roy
03dba391ca Don't make Home active in base template. 2015-07-13 19:28:42 -07:00
Audrey Roy
35112546c4 Close navbar-collapse div. 2015-07-13 19:26:40 -07:00
Audrey Roy
7a147e72e2 Update navbar HTML to latest Bootstrap as per http://getbootstrap.com/components/#navbar 2015-07-13 19:20:13 -07:00
Daniel Greenfeld
e25942652d Added instructions on how to install compass. 2015-07-13 15:50:00 -07:00
Daniel Greenfeld
acfef44b64 Remove specification for installing just grunt. 
Otherwise it ignores the other modules.
 2015-07-13 15:39:51 -07:00
Daniel Greenfeld
3710e9b953 Changed 'taskman' to 'taskapp 2015-07-13 13:32:47 -07:00
Daniel Greenfeld
f038f8fd88 Merge pull request #266 from jayfk/master 
added optional celery support
 2015-07-13 13:19:55 -07:00
Jay
9bfca28f6f refactored to load celery from an AppConfig 2015-07-10 11:30:42 +02:00
Fábio C. Barrionuevo da Luz
7837c4e099 update Django version to 1.8.3 
https://www.djangoproject.com/weblog/2015/jul/08/security-releases/
 2015-07-09 11:47:10 -03:00
Burhan Khalid
32dd1be245 merging from upstream 2015-07-08 12:58:19 +03:00
Fábio C. Barrionuevo da Luz
b498bb4245 Merge pull request #263 from burhan/patch/move-aws-settings 
set correct variables for heroku/doku
 2015-07-07 16:39:26 -03:00
Burhan Khalid
076c7c21c6 set correct variables for heroku/doku 2015-07-07 22:29:41 +03:00
Fábio C. Barrionuevo da Luz
a3c46bb8a0 Merge pull request #262 from burhan/patch/move-aws-settings 
unifying environment variables
 2015-07-07 16:23:46 -03:00
Burhan Khalid
740483f0e7 unifying environment variables 2015-07-07 22:06:46 +03:00
Fabio C. Barrioneuvo da Luz
e5dc8b97c1 update dependencies versions 
update pylibmc version to 1.5.0
django-allauth to 0.21.0
Pillow to 2.9.0
whitenoise to 2.0.2
 2015-07-07 09:15:26 -03:00
Burhan Khalid
768b8cf2c8 adding support for mailgun 2015-07-06 21:25:08 +03:00
Burhan Khalid
3c285e0569 adding redis support 2015-07-06 14:09:13 +03:00
Audrey Roy
f370702c4d Instructions for creating user accounts. Fix #39. 2015-06-28 14:56:13 -07:00