Changeset 6064
- Timestamp:
- 09/07/07 15:51:17 (1 year ago)
- Files:
-
- djangoproject.com (modified) (1 prop)
- djangoproject.com/django_website/apps/accounts (added)
- djangoproject.com/django_website/apps/accounts/forms.py (added)
- djangoproject.com/django_website/apps/accounts/__init__.py (added)
- djangoproject.com/django_website/apps/accounts/urls.py (added)
- djangoproject.com/django_website/settings.py (modified) (4 diffs)
- djangoproject.com/django_website/templates/registration (added)
- djangoproject.com/django_website/templates/registration/activate.html (added)
- djangoproject.com/django_website/templates/registration/activation_email.txt (added)
- djangoproject.com/django_website/templates/registration/base.html (added)
- djangoproject.com/django_website/templates/registration/login.html (added)
- djangoproject.com/django_website/templates/registration/logout.html (added)
- djangoproject.com/django_website/templates/registration/registration_complete.html (added)
- djangoproject.com/django_website/templates/registration/registration_form.html (added)
- djangoproject.com/django_website/urls.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
djangoproject.com
- Property svn:externals set to
django -r6063 http://code.djangoproject.com/svn/django/trunk/django/
registration -r87 http://django-registration.googlecode.com/svn/trunk/registration/
- Property svn:externals set to
djangoproject.com/django_website/settings.py
r6060 r6064 13 13 DEBUG = True 14 14 PREPEND_WWW = False 15 DATABASE_ENGINE = "sqlite3"16 DATABASE_NAME = "/tmp/djangoproject.db"15 DATABASE_ENGINE = 'postgresql_psycopg2' 16 DATABASE_NAME = 'djangoproject' 17 17 CACHE_BACKEND = "file:///tmp/djangoprojectcache/" 18 18 TEMPLATE_DIRS = [os.path.join(os.path.dirname(__file__), "templates")] … … 40 40 'django.contrib.contenttypes', 41 41 'django.contrib.flatpages', 42 'django.contrib.humanize', 42 43 'django.contrib.redirects', 43 44 'django.contrib.sessions', … … 46 47 'django_website.apps.docs', 47 48 'django_website.apps.aggregator', 49 'registration', 48 50 ) 49 51 ADMIN_MEDIA_PREFIX = 'http://media.djangoproject.com/admin/' … … 72 74 USE_I18N = False 73 75 76 # django-registration settings 77 ACCOUNT_ACTIVATION_DAYS = 3 djangoproject.com/django_website/urls.py
r4789 r6064 31 31 32 32 urlpatterns = patterns('', 33 (r'^ weblog/', include('django_website.apps.blog.urls')),34 (r'^ documentation/', include('django_website.apps.docs.urls')),33 (r'^accounts/', include('django_website.apps.accounts.urls')), 34 (r'^admin/', include('django.contrib.admin.urls')), 35 35 (r'^comments/$', 'django.views.generic.list_detail.object_list', comments_info_dict), 36 36 (r'^comments/', include('django.contrib.comments.urls.comments')), 37 37 (r'^community/$', 'django.views.generic.list_detail.object_list', aggregator_info_dict), 38 (r'^ rss/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),38 (r'^documentation/', include('django_website.apps.docs.urls')), 39 39 (r'^password_reset/', include('django.conf.urls.admin_password_reset')), 40 40 (r'^r/', include('django.conf.urls.shortcut')), 41 (r'^rss/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), 41 42 (r'^sitemap.xml$', cache_page(sitemap_views.sitemap, 60 * 60 * 6), {'sitemaps': sitemaps}), 42 (r'^ admin/', include('django.contrib.admin.urls')),43 (r'^weblog/', include('django_website.apps.blog.urls')), 43 44 (r'', include('django.contrib.flatpages.urls')), 44 45 )
