Commit Graph

2338 Commits

Author SHA1 Message Date
Jannis Gebauer
dab119a4f3 removing duplication of depends_on in docker-compose.yml 2016-04-18 20:54:57 +02:00
Jannis Gebauer
bd645cbac5 Merge pull request #520 from SpisTresci/removing_duplication_of_depends_on
removing duplication of depends_on in docker-compose.yml
2016-04-18 20:52:19 +02:00
Daniel Roy Greenfeld
1a8969f73f Added missing contributors 2016-04-17 12:53:20 -07:00
Daniel Roy Greenfeld
5929281e8d Update CHANGELOG.md 2016-04-17 12:51:19 -07:00
Daniel Roy Greenfeld
214181a3ed Update CHANGELOG.md 2016-04-17 12:50:13 -07:00
Daniel Roy Greenfeld
4c454cb477 Update README.rst 2016-04-17 12:00:56 -07:00
Audrey Roy Greenfeld
345c855ddb Add e794fc1 to changelog 2016-04-17 11:47:07 -07:00
Audrey Roy Greenfeld
e794fc1a84 Add "Built with Cookiecutter Django" badge to project README 2016-04-17 11:45:23 -07:00
Daniel Roy Greenfeld
e752e77326 Merge pull request #519 from blopker/master
Quote consistency
2016-04-17 10:18:02 -07:00
Daniel Roy Greenfeld
7fc37ecac8 Merge pull request #525 from krzysztofzuraw/add_new_link_readme
Added new introductory article
2016-04-17 10:13:28 -07:00
Krzysztof Żuraw
6c53cf9b97 Added link with article 2016-04-17 18:56:28 +02:00
Daniel Roy Greenfeld
acc6b9f168 Changing the formal name to Cookiecutter Django 2016-04-16 23:44:53 -07:00
Audrey Roy Greenfeld
291ab92ff0 Readme improvements 2016-04-16 13:36:12 -07:00
Bo Lopker
a300f1190d Quote consistency 2016-04-15 23:29:04 -07:00
Audrey Roy Greenfeld
f2ffd5ad5e Changelog cleanup 2016-04-15 19:10:59 -07:00
Audrey Roy Greenfeld
924fcb7ea5 Add #516 to changelog 2016-04-15 19:10:09 -07:00
Audrey Roy Greenfeld
abb41d4dff Merge pull request #516 from pydanny/project-cleanup
Major Project Generation Cleanup
2016-04-15 19:08:42 -07:00
Audrey Roy Greenfeld
95eb7e0384 Add #517 to changelog 2016-04-15 18:53:40 -07:00
Audrey Roy Greenfeld
84d99e94d6 Merge pull request #517 from SpisTresci/remove_idea_dir
Deleting unnecessary .idea dir from MAIN directory
2016-04-15 18:50:46 -07:00
Daniel Roy Greenfeld
d84e1a6ee9 Update CHANGELOG.md 2016-04-13 20:31:41 -07:00
Daniel Roy Greenfeld
72405f2ec9 Merge pull request #493 from solvire/master
pylint-django gets "no-member" error: known issue
2016-04-13 20:29:48 -07:00
Fábio C. Barrionuevo da Luz
098c84f6cb Merge pull request #522 from pydanny/luzfcb-patch-pillow
update pillow version to 3.2.0
2016-04-14 00:25:23 -03:00
Fábio C. Barrionuevo da Luz
5e7b67874e Update CHANGELOG.md 2016-04-14 00:22:29 -03:00
Fábio C. Barrionuevo da Luz
6c44ac54d6 upgrade pillow version to 3.2.0 2016-04-14 00:19:15 -03:00
Fábio C. Barrionuevo da Luz
2857affae5 Update CHANGELOG.md 2016-04-14 00:15:44 -03:00
Fábio C. Barrionuevo da Luz
a65cb87548 Merge pull request #521 from SpisTresci/fix_for_failing_tests_dateutil_version_conflict
fix for failng test - version conflict of dateutil package
2016-04-14 00:01:04 -03:00
Krzysztof Szumny
3cb828e528 fix for failng test " raise VersionConflict(dist, req).with_context(dependent_req)" 2016-04-13 01:22:42 +02:00
Krzysztof Szumny
e63d2fe8fe removing duplication of depends_on 2016-04-13 01:16:50 +02:00
Jannis Gebauer
86d6d8e423 Update CHANGELOG.md 2016-04-12 15:36:44 +02:00
Jannis Gebauer
1af5977630 celeryworker and celerybeat missing the correct dockerfile 2016-04-12 15:36:13 +02:00
Krzysztof Szumny
58f133bb0d Deleting unnecessary .idea dir from MAIN directory 2016-04-10 16:47:09 +02:00
Jannis Gebauer
327d0c2038 major project cleanup 2016-04-08 09:45:09 +02:00
Jannis Gebauer
0954ec8dad switch to named docker volumes 2016-04-08 08:31:02 +02:00
Jannis Gebauer
c521458928 Update CHANGELOG.md 2016-04-07 08:52:01 +02:00
Jannis Gebauer
dec0545ef7 Merge pull request #511 from epileptic-fish/features/readme-licence
Template license in README.rst based on user's choice.
2016-04-07 08:49:17 +02:00
Jannis Gebauer
ca508b8b58 adds @noisy to contributors 2016-04-07 08:48:02 +02:00
Jannis Gebauer
b3b7007a44 Update CHANGELOG.md 2016-04-07 08:46:23 +02:00
Jannis Gebauer
e25c5999c0 Merge pull request #507 from SpisTresci/pycharm_support_2
Pycharm Support (including debugging in Docker)
2016-04-07 08:45:13 +02:00
Raony Guimarães
2f6315d606 changes to suport Ubuntu Xenial 2016-04-04 09:58:22 +02:00
William Adams
b5ae65f538 Template license in README.rst based on user's choice. 2016-04-01 10:29:27 +01:00
Krzysztof Szumny
fc1b77104d git related fixes 2016-03-28 17:09:56 +02:00
Krzysztof Szumny
aee5b34f8f post_get hook removes docs for pycharm if it isn't used 2016-03-28 01:43:37 +02:00
Krzysztof Szumny
e897d0af52 pycharm/configuration.rst 2016-03-28 00:43:39 +02:00
Krzysztof Szumny
cd7a817249 requirements/local.txt set as default for Pycharm 2016-03-27 21:46:14 +02:00
Krzysztof Szumny
b4ca4cbaea additionall runConfigurations for tests + pycharm service 2016-03-27 20:53:30 +02:00
Krzysztof Szumny
0e3b879d17 pycharm service 2016-03-27 20:47:43 +02:00
Krzysztof Szumny
9e64d225a2 CR fix 2016-03-27 20:39:29 +02:00
Fabio C. Barrioneuvo da Luz
3d3ec182d7 fix issue #508 2016-03-23 17:38:43 -03:00
Krzysztof Szumny
29e659b57b Example runConfigurations for runserver, migrate, tests 2016-03-23 21:24:53 +01:00
Krzysztof Szumny
5f52f9e7e5 Dockerfile and Dockerfile-dev moved to compose/django/ 2016-03-23 20:45:09 +01:00