Merge branch 'forum' into 'master'

Forum

See merge request !49

sith/settings.py

@@ -60,6 +60,7 @@ INSTALLED_APPS = (
     'sas',
     'com',
     'election',
+    'forum',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -234,6 +235,7 @@ SITH_URL = "my.url.git.an"
 SITH_NAME = "Sith website"
 
 # AE configuration
+SITH_MAIN_CLUB_ID = 1 # TODO: keep only that first setting, with the ID, and do the same for the other clubs
 SITH_MAIN_CLUB = {
         'name': "AE",
         'unix_name': "ae",
@@ -263,13 +265,17 @@ SITH_SCHOOL_START_YEAR = 1999
 
 SITH_GROUP_ROOT_ID = 1
 SITH_GROUP_PUBLIC_ID = 2
-SITH_GROUP_ACCOUNTING_ADMIN_ID = 3
-SITH_GROUP_COM_ADMIN_ID = 4
-SITH_GROUP_COUNTER_ADMIN_ID = 5
-SITH_GROUP_BANNED_ALCOHOL_ID = 6
-SITH_GROUP_BANNED_COUNTER_ID = 7
-SITH_GROUP_BANNED_SUBSCRIPTION_ID = 8
-SITH_GROUP_SAS_ADMIN_ID = 9
+SITH_GROUP_SUBSCRIBERS_ID = 3
+SITH_GROUP_OLD_SUBSCRIBERS_ID = 4
+SITH_GROUP_ACCOUNTING_ADMIN_ID = 5
+SITH_GROUP_COM_ADMIN_ID = 6
+SITH_GROUP_COUNTER_ADMIN_ID = 7
+SITH_GROUP_BANNED_ALCOHOL_ID = 8
+SITH_GROUP_BANNED_COUNTER_ID = 9
+SITH_GROUP_BANNED_SUBSCRIPTION_ID = 10
+SITH_GROUP_SAS_ADMIN_ID = 11
+SITH_GROUP_FORUM_ADMIN_ID = 12
+
 
 SITH_CLUB_REFOUND_ID = 89
 SITH_COUNTER_REFOUND_ID = 38

sith/urls.py

@@ -40,6 +40,7 @@ urlpatterns = [
     url(r'^sas/', include('sas.urls', namespace="sas", app_name="sas")),
     url(r'^api/v1/', include('api.urls', namespace="api", app_name="api")),
     url(r'^election/', include('election.urls', namespace="election", app_name="election")),
+    url(r'^forum/', include('forum.urls', namespace="forum", app_name="forum")),
     url(r'^admin/', include(admin.site.urls)),
     url(r'^ajax_select/', include(ajax_select_urls)),
     url(r'^i18n/', include('django.conf.urls.i18n')),