Cristian Vargas
b368dd7e36
Make sure that STATIC_URL != MEDIA_URL
2016-03-02 09:49:34 -05:00
Jannis Gebauer
1d6edb6f2b
resolved merge conflict
2016-02-18 21:44:08 +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
643b0aa2f3
Updated the path to the user adapters.
...
(see previous commit)
2016-02-16 18:05:14 +01:00
yunti
d6962a890d
Fixed typo on 403 exception
2016-02-09 18:36:56 +00: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
Jay
f8a610502a
fixed redis url on docker
2016-01-08 11:16:14 +01:00
Audrey Roy Greenfeld
5a65c9e8a9
Merge contributors change.
2016-01-06 21:37:23 -08:00
Saurabh Kumar
77c6a12eaa
fix(urls): update 4xx error pages preview, to accept exceptions
...
closes #444
2015-12-16 14:16:54 +05:30
David Díaz
cc1da172f4
[IMP] django-allauth configuration: Allow enable or disable user registration using ACCOUNT_ALLOW_REGISTRATION setting.
2015-12-05 20:12:53 +01:00
Fabio C. Barrioneuvo da Luz
c9f500116d
fix celery configuration in local.py
2015-11-24 22:00:16 -03:00
Tom Atkins
3316a3b023
Fix merge conflict in README.rst
2015-11-18 11:16:25 +00:00
Burhan Khalid
03edea3021
E303 too many blank lines fix
2015-11-16 21:41:06 +03:00
Burhan Khalid
f4a75e0d10
fixing the middleware order
2015-11-16 21:41:06 +03:00
Burhan Khalid
4c07b5dea6
initial configuration to support opbeat
2015-11-16 21:41:06 +03:00
Jay
6699e6d125
added NEW_RELIC_APP_NAME so that it appears on the dashboard
2015-11-07 20:18:11 +01:00
Jannis Gebauer
ba00160aab
Merge pull request #362 from amjith/master
...
Add newrelic for monitoring.
2015-11-07 20:10:00 +01:00
Daniel Roy Greenfeld
084fb2529e
Fixed flake8 issue
2015-10-25 17:37:34 -07:00
Audrey Roy Greenfeld
8307e43d15
Move LOGGING setting to production from common, since it's not useful locally.
2015-10-25 17:30:36 -05:00
Amjith Ramanujam
4acd6ad098
Remove blank lines to fix flake8 compliance.
2015-10-08 05:38:05 -07:00
Amjith Ramanujam
c0c0bc6ca3
Add newrelic for monitoring.
2015-10-04 05:06:20 -07:00
Daniel Roy Greenfeld
a6e10f6600
Correct production name
2015-10-03 17:08:11 -07:00
Daniel Roy Greenfeld
4781c2baa2
Flake8 fix
2015-10-03 15:58:49 -07:00
Daniel Roy Greenfeld
0c9dfd8de6
Merge branch 'master' of github.com:pydanny/cookiecutter-django
2015-10-03 15:42:40 -07:00
Daniel Roy Greenfeld
9b34bf16ec
Fixing the build
2015-10-03 15:42:33 -07:00
Fábio C. Barrionuevo da Luz
606e1de157
escape admin url usage example in comment
2015-10-03 19:35:27 -03:00
Daniel Roy Greenfeld
58ec2fe113
URL to django.contrib.admin is now configurable
2015-10-03 14:54:29 -07:00
Fábio C. Barrionuevo da Luz
09b61bab1a
Merge pull request #354 from siauPatrick/master
...
String view arguments to url() is deprecated in django 1.9
2015-09-30 12:44:19 -03:00
Roman Afanaskin
5150f0ec2d
String view arguments to url() is deprecated in django 1.9
2015-09-30 18:13:16 +03:00
Roman Afanaskin
379214348e
Remove excess "loggers" from LOGGING setting
2015-09-21 22:36:06 +03: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
Daniel Greenfeld
4b69720c25
Merge pull request #319 from bogdal/allowed-hosts
...
Allowed hosts
2015-09-03 15:17:22 -07: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ł
1571b91dad
Add ability to set ALLOWED_HOSTS
2015-09-01 20:18:28 +02: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
7403679ee7
fixing an allauth setting bug
2015-07-27 18:42:23 +03:00
Saurabh Kumar
613b91d71e
Merge pull request #258 from burhan/feature/redis-cache
...
adding redis support
2015-07-21 07:23:26 +05:30
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
f966888ff1
making maildump optional
2015-07-16 07:21:06 +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
Burhan Khalid
5589003ff3
fixing requirements
2015-07-14 12:05:25 +03:00
Daniel Greenfeld
3710e9b953
Changed 'taskman' to 'taskapp
2015-07-13 13:32:47 -07:00
Jay
9bfca28f6f
refactored to load celery from an AppConfig
2015-07-10 11:30:42 +02:00
Burhan Khalid
32dd1be245
merging from upstream
2015-07-08 12:58:19 +03:00
