cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-22 17:47:08 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,285 Commits 13 Branches 581 Tags 25 MiB
7b24c19ce5
Commit Graph

1285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jannis Gebauer
1d6edb6f2b resolved merge conflict 2016-02-18 21:44:08 +01:00
Jannis Gebauer
af9baa50eb Merge pull request #488 from Eraldo/patch-2 
Environment aware registration switch setting
 2016-02-18 21:38:43 +01:00
Julian Andres Cantillo
893ccec900 Merge pull request #1 from juliancantillo/juliancantillo-patch-1 
Added NEW_RELIC_APP_NAME env var for app.json
 2016-02-18 15:22:21 -05:00
Julian Andres Cantillo
6ef60301d1 Added NEW_RELIC_APP_NAME env var for app.json 
When using the one-click deployment to Heroku the building process fails if the app uses NewRelic.
 2016-02-18 15:21:47 -05:00
Eraldo Energy
c7627f4c54 Added account registration switch to env example 2016-02-18 00:46:45 +01:00
Eraldo Energy
22acc55bcc Update settings.rst 2016-02-16 19:07:20 +01:00
Eraldo Energy
96a4ae33b5 Environment aware registration switch setting 
The status of the registration (open or closed) is now read from the project environment instead of hardcoded in the common settings file.
 2016-02-16 18:53:37 +01:00
Eraldo Energy
5c51acd570 Updated contributors file 2016-02-16 18:38:44 +01:00
Eraldo Energy
643b0aa2f3 Updated the path to the user adapters. 
(see previous commit)
 2016-02-16 18:05:14 +01:00
Eraldo Energy
1c82d59381 Renamed the file adapter.py to adapters.py 
The rename took place to be consistent with the default django style ('view*s*.py', 'manager*s*.py', etc).
 2016-02-16 18:02:29 +01:00
Fabio C. Barrioneuvo da Luz
6cd4ab6e81 update changelog 2016-02-15 22:50:40 -03:00
Fábio C. Barrionuevo da Luz
be01daefc8 Merge pull request #486 from oryx2/patch-1 
fix is_open_for_signup missing param
 2016-02-15 22:31:29 -03:00
blueness
25b0544c2f fix is_open_for_signup missing param 
add a missing param to SocialAccountAdapter.is_open_for_signup
 2016-02-16 09:23:57 +08:00
Daniel Roy Greenfeld
7c4a753b8d Merge pull request #485 from crdoconnor/master 
Upgraded hitchreqs.txt
 2016-02-15 16:07:13 -08:00
Colm O'Connor
47c3fa749b Make hitch tests pause on success in TDD mode. 2016-02-15 22:54:02 +00:00
Colm O'Connor
4490d08659 Remove click: djHideToolBarButton step and put it in load_website. 2016-02-15 22:46:07 +00:00
Colm O'Connor
a5e127b9a1 Shrink window size when running selenium tests to something smaller and easier to view. 2016-02-15 22:45:43 +00:00
Colm O'Connor
c917ab5057 Upgraded hitchreqs.txt (decorator version specified was taken down off pypi) 2016-02-15 22:40:30 +00:00
Jannis Gebauer
0d342210af Update CHANGELOG.md 2016-02-12 19:27:52 +01:00
Jannis Gebauer
391971c6d5 Merge pull request #484 from yunti/patch-3 
Fixed typo on 403 exception
 2016-02-12 19:25:07 +01:00
yunti
d6962a890d Fixed typo on 403 exception 2016-02-09 18:36:56 +00:00
Daniel Roy Greenfeld
f35412248b Update CHANGELOG.md 2016-02-08 09:29:26 -08:00
Daniel Roy Greenfeld
e0a1bf8f8c Fixes #184, allows for license choices 2016-02-07 20:56:28 -08:00
Fábio C. Barrionuevo da Luz
8826620bd4 Merge pull request #482 from pydanny/update-requirements 
update requirements and CHANGELOG
 2016-02-07 02:55:20 -03:00
Fabio C. Barrioneuvo da Luz
b5f82d41f2 update requirements and CHANGELOG 2016-02-07 02:44:19 -03:00
Fábio C. Barrionuevo da Luz
2cdf8bdb70 Merge pull request #480 from yunti/patch-2 
use LoginRequiredMixin from Django 1.9
 2016-02-07 01:49:29 -03:00
Fábio C. Barrionuevo da Luz
9d76faa42c Merge pull request #481 from crdoconnor/master 
Fix for issue #389 (and related issues).
 2016-02-07 01:48:10 -03:00
Colm O'Connor
f44b9fad41 Fix for issue #389 (and related issues). For when different distributions have different package names (e.g. libtiff5-dev for ubuntu wily and libtiff4-dev for ubuntu trusty). Ensures that the correct one is installed for the distribution the user is on. 2016-02-06 16:29:10 +00:00
yunti
9f08e59d16 Changed LoginRequiredMixin import 
Mixin now part of djanog core from 1.9
 2016-02-04 18:41:03 +00:00
Fabio C. Barrioneuvo da Luz
7779c726a0 update django, django-floppyforms, hitchpython and selenium version 2016-02-01 18:10:33 -03:00
Fabio C. Barrioneuvo da Luz
5c9b01ae87 update flake8 version 2016-01-30 17:32:01 -03:00
Fábio C. Barrionuevo da Luz
e0835f8dd2 Merge pull request #478 from pydanny/update-requirements 
update version of dependencies
 2016-01-30 17:26:04 -03:00
Fabio C. Barrioneuvo da Luz
8b82f2a804 update version of dependencies 2016-01-29 02:42:45 -03:00
Jay
9a2f72773a fixed new relic app name 
The app name wasn't displayed correctly on the new relic dashboard.

Although `NEW_RELIC_APP_NAME` was set in `production.py`, the variable was not loaded *before* the newrelic agent was called.

Since the new relic agent is loaded at a very low level, NEW_RELIC_APP_NAME has to be set before django settings are imported.
 2016-01-26 17:04:59 +01:00
Daniel Roy Greenfeld
1722d461b3 Changelog commit 2016-01-18 19:31:56 -08:00
Daniel Roy Greenfeld
d003afcf3a Merge pull request #472 from pydanny/docker-test 
Testing Docker
 2016-01-18 19:30:23 -08:00
Fábio C. Barrionuevo da Luz
554be0c375 Merge pull request #473 from mjhea0/master 
added new article - deploy on Fedora
 2016-01-18 13:44:30 -02:00
Michael Herman
96e0b0774d added new article 2016-01-18 08:38:22 -07:00
Jannis Gebauer
f9fd29e898 reformatting 2016-01-18 12:50:01 +01:00
Jannis Gebauer
0fa6eb6cde added .dockerignore file 2016-01-18 12:48:49 +01:00
Jannis Gebauer
0705fd4a26 Merge pull request #460 from bogdal/dockerignore 
Add dockerignore file
 2016-01-18 12:46:48 +01:00
Jannis Gebauer
715fbee022 added $-sign remove 2016-01-18 12:45:56 +01:00
Jay
82a30ea88c adds simple docker test 2016-01-18 12:26:25 +01:00
Jannis Gebauer
bd8d23fac3 remove $ from allowed chars 
django-environ has problems with environment variables that begin with a `$` sign, see https://github.com/joke2k/django-environ/issues/60
 2016-01-18 12:14:34 +01:00
Audrey Roy Greenfeld
5756a61732 Add #469 by @originell to changelog/contributors. 2016-01-18 00:00:03 -08:00
Audrey Roy Greenfeld
305e3bc06b Merge pull request #469 from originell/patch-1 
Adds celerybeat db to gitignore
 2016-01-17 23:54:32 -08:00
Burhan Khalid
173eb3d102 fixing style on changelog 2016-01-17 13:07:31 +03:00
Burhan Khalid
6f0d69446f adding articles section (pr # 456) 2016-01-17 13:03:01 +03:00
Burhan Khalid
07fcaf3728 Merge branch 'mjhea0-master' - PR #456 2016-01-17 12:59:52 +03:00
Burhan Khalid
4ff84a5799 Merge branch 'master' of https://github.com/mjhea0/cookiecutter-django into mjhea0-master 2016-01-17 12:58:45 +03:00