Mercurial > agora-palash

comparison settings.py @ 211:2a234e11185c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in Wendy's changes
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 21 Aug 2013 14:43:48 -0400
parents 2619e53b1ec2
children
comparison
equal deleted inserted replaced
210:95edf106bdef 211:2a234e11185c
139 'django.contrib.sessions', 139 'django.contrib.sessions',
140 'django.contrib.sites', 140 'django.contrib.sites',
141 'django.contrib.messages', 141 'django.contrib.messages',
142 'django.contrib.admindocs', 142 'django.contrib.admindocs',
143 'django.contrib.admin', 143 'django.contrib.admin',
144 # 'django.contrib.comments', 144 'django.contrib.comments',
145 145
146 # Third-party apps 146 # Third-party apps
147 'registration', 147 'registration',
148 'djcelery', 148 'djcelery',
149 'kombu.transport.django', 149 'kombu.transport.django',
150 'mptt', 150 'mptt',
151 'sizefield', 151 'sizefield',
152 'djangoratings',
153 'south',
152 # 'threadedcomments', 154 # 'threadedcomments',
153 155
154 # Agora apps 156 # Agora apps
155 'apps.profile', 157 'apps.profile',
156 'apps.snippet', 158 'apps.snippet',
157 'apps.bundle', 159 'apps.bundle',
158 'apps.free_license', 160 'apps.free_license',
159 'apps.pygments_style', 161 'apps.pygments_style',
162 'apps.treecomments',
160 ) 163 )
161 164
162 COMMENTS_APP = 'threadedcomments' 165 COMMENTS_APP = 'apps.treecomments'
163 166
164 # Doesn't accept view names until Django 1.5 167 # Doesn't accept view names until Django 1.5
165 LOGIN_REDIRECT_URL='/' 168 LOGIN_REDIRECT_URL='/'
166 LOGIN_URL = '/login' 169 LOGIN_URL = '/login'
167 AUTH_PROFILE_MODULE = 'profile.Profile' 170 AUTH_PROFILE_MODULE = 'profile.Profile'