Commit Graph

886 Commits

Author SHA1 Message Date
Jannis Gebauer
ba85552732 Removed duplicate 2015-09-28 09:42:35 +02:00
Jannis Gebauer
d8a7081d4c Added advice on how to persist changes with boot2docker 2015-09-28 09:42:13 +02:00
Alvaro [Andor]
bdd916835e Fixed reStructuredText (RST) format
The lack of a space between the '::' tag and the text did that the block around the code didn't appear.
2015-09-27 19:42:21 +02:00
Audrey Roy Greenfeld
86d9c848ca Merge pull request #349 from hackebrot/fix-contributors-file-format
Fix contributors file format
2015-09-27 10:24:11 -07:00
Raphael Pierzina
17b3814193 Add @hackebrot to contributors 2015-09-26 11:07:49 +02:00
Raphael Pierzina
8187842971 Add a blank before core committer mark to be consistent 2015-09-26 11:01:56 +02:00
Raphael Pierzina
900385c0da Add rst bullet points to CONTRIBUTORS.rst 2015-09-26 10:47:21 +02:00
Raphael Pierzina
73c19f6046 Rename CONTRIBUTORS.txt to rst 2015-09-26 10:36:16 +02:00
Audrey Roy Greenfeld
598bf20826 Add @kaidokert to contributors list. 2015-09-26 01:08:04 -07:00
Audrey Roy Greenfeld
55e0895dc6 Tons of changelog updates. 2015-09-26 01:06:18 -07:00
Audrey Roy Greenfeld
42fe4f645b Update pylint and pep8 docs. 2015-09-26 00:50:54 -07: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
481bdb71b3 More linter documentation in prep for merging #283. 2015-09-26 00:35:55 -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 Roy Greenfeld
8f7b5d5cf1 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2015-09-25 23:28:39 -07:00
Daniel Roy Greenfeld
11f99c01bd Changelog update 2015-09-25 23:28:33 -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
b642fed5bb Starter docs on our flake8 setup. 2015-09-24 00:38:04 -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
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