Merge branch 'master' of benjaoming/membersystem into master

.gitignore

@@ -2,5 +2,5 @@ __pycache__/
 *.pyc
 *.sw*
 db.sqlite3
-membersystem/settings/local.py
+project/settings/local.py
 .pytest_cache

manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "membersystem.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

profiles/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class ProfilesConfig(AppConfig):
-    name = 'profiles'

profiles/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

project/context_processors.py

@@ -1,5 +1,4 @@
 """Context processors for the membersystem app."""
-
 from django.contrib.sites.shortcuts import get_current_site
 
 

project/settings/base.py

@@ -35,8 +35,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.sites',
 
-    'membersystem',
-    'profiles',
+    'users',
     'accounting',
     'membership',
 ]
@@ -51,12 +50,12 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'membersystem.urls'
+ROOT_URLCONF = 'project.urls'
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, "project", "templates")],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -64,7 +63,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'membersystem.context_processors.current_site',
+                'project.context_processors.current_site',
             ],
         },
     },
@@ -75,7 +74,7 @@ AUTHENTICATION_BACKENDS = (
     'allauth.account.auth_backends.AuthenticationBackend',
 )
 
-WSGI_APPLICATION = 'membersystem.wsgi.application'
+WSGI_APPLICATION = 'project.wsgi.application'
 
 
 # Database

project/templates/base.html

@@ -47,4 +47,3 @@
         </footer>
     </body>
 </html>
-

project/wsgi.py

@@ -10,6 +10,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "membersystem.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
 
 application = get_wsgi_application()

pytest.ini

@@ -1,5 +1,5 @@
 [pytest]
 testpaths = .
 python_files = tests.py test_*.py *_tests.py
-DJANGO_SETTINGS_MODULE = membersystem.settings
+DJANGO_SETTINGS_MODULE = project.settings
 #norecursedirs = dist tmp* .svn .*

users/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class UsersConfig(AppConfig):
+    name = 'users'