Commit Graph

810 Commits

Author SHA1 Message Date
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
221178ad84 Changelog correction and merge. 2015-09-22 08:52:51 -07:00
Audrey Roy Greenfeld
7f9baab66b Add #336 to changelog 2015-09-22 08:52:06 -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 Roy Greenfeld
d9e65afef1 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-09-21 21:24:31 -07:00
Daniel Roy Greenfeld
1da7e33007 Add @siauPatrick to the contributors and changelog 2015-09-21 21:24:19 -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
0a84799252 Add dos, navbar fix, reqs update to changelog. 2015-09-18 15:27:56 -07: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
Daniel Roy Greenfeld
8b3fbce4a2 Add documentation refactor note #335 2015-09-18 14:35:10 -07:00
Daniel Roy Greenfeld
698c990cbd Refactored the Docker docs and added indexes. 2015-09-18 14:26:29 -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
Daniel Roy Greenfeld
44814f3ced Add FAQ and early work on file copier #335 2015-09-18 10:55:06 -07: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
2209a6cd79 Add python version option to cookiecutter json 2015-09-18 17:38:48 +01:00
yunti
b085f023e6 Add python3 runtime option for Heroku deployment 2015-09-18 17:37:15 +01:00
Daniel Roy Greenfeld
904d2d50fe More docs configuration for #335 2015-09-18 09:32:47 -07:00
Daniel Roy Greenfeld
27b59b460c Beginning of reorganization of documentation per #335
* Created top-level docs Sphinx directory
* Moved development instructions out of /README.rst and into /docs/
2015-09-18 09:22:55 -07:00
Daniel Greenfeld
5ba340d373 Merge pull request #334 from yunti/mail-setup-docs
Updated Readme for mail setup
2015-09-18 08:39:35 -07:00
Fábio C. Barrionuevo da Luz
08a58ab555 Merge pull request #333 from yunti/Fix-for-Raven-II
Removed redundant else for Fix for Raven
2015-09-18 08:06:17 -03:00
yunti
dfd29c7243 Updated Readme for mail setup
fix for part 2. of  issue #323
2015-09-18 11:56:49 +01:00
yunti
166121c398 Removed redundant else for Fix for Raven 2015-09-18 09:53:57 +01:00
Daniel Roy Greenfeld
e8b7a3c363 Added @yunti's Fix for wsgi.py for Raven in dev 2015-09-17 12:21:31 -07:00
Daniel Greenfeld
f296f96a96 Merge pull request #332 from yunti/missing-raven-local
Fix for wsgi.py for Raven in dev
2015-09-17 12:18:28 -07:00
yunti
5fecdf8405 Fix for wsgi.py for Raven in dev 2015-09-17 19:49:25 +01:00
Fábio C. Barrionuevo da Luz
8be2f14cb4 add Ian Lee in CONTRIBUTORS.txt
@IanLee1521 Thanks.
2015-09-17 11:11:56 -03:00
Fábio C. Barrionuevo da Luz
37f19c3af0 Merge pull request #330 from yunti/yunti-typo
fix small typo in production settings file
2015-09-17 11:03:56 -03:00
yunti
5b734de089 Update CONTRIBUTORS.txt 2015-09-17 14:39:23 +01:00
yunti
d18d3a2ab7 Production settings typo
(testing basic pull request before submitting more)
2015-09-17 12:09:26 +01:00
Daniel Greenfeld
8da7fe5f03 Merge pull request #329 from IanLee1521/master
Added whitespace to allow proper rendering of RST
2015-09-15 20:36:29 -07:00
Ian Lee
8ecdc47dee Added whitespace to allow proper rendering of RST 2015-09-14 23:21:24 -07:00
Daniel Roy Greenfeld
5bae08596e fixed #327 - post_gen_hook now deletes taskapp if celery isn't going to be used 2015-09-14 18:55:41 -07:00
Audrey Roy Greenfeld
656a9b9ed5 Update changelog. 2015-09-14 13:41:51 -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