Merge pull request #910 from dotKom/revert-887-feedme

Revert "feedme integration v2"

onlineweb4/settings/base.py

@@ -122,9 +122,9 @@
     os.path.join(PROJECT_ROOT_DIRECTORY, 'templates/'),
 )
 
-# Feedme settings
-FEEDME_GROUP = 'dotkom'
-FEEDME_ADMIN_GROUP = 'feedmeadmin'
+# Pizzasystem settings
+PIZZA_GROUP = 'dotkom'
+PIZZA_ADMIN_GROUP = 'pizzaadmin'
 
 # Variables for fagKom/bedKom-sync script, override in local.py
 BEDKOM_GROUP_ID = 1
@@ -200,7 +200,6 @@
     'apps.resourcecenter',
     'apps.mailinglists',
     'scripts',
-    'feedme',
 
      # Wiki
     'wiki',

onlineweb4/urls.py

@@ -105,9 +105,9 @@
         url(r'^genfors/',           include('apps.genfors.urls')),
     )
 
-# feedme 
-if 'feedme' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('', url(r'^feedme/', include('feedme.urls')))
+# pizzasystem
+if 'pizzasystem' in settings.INSTALLED_APPS:
+    urlpatterns += patterns('', url(r'^pizza/', include('pizzasystem.urls')))
 
 #Captcha url
 if 'captcha' in settings.INSTALLED_APPS:

requirements.txt

@@ -23,7 +23,7 @@ django-simple-captcha==0.4.1    # Simple captcha
 django_compressor==1.3          # Compiles less and minifies js
 django-watson==1.1.2            # Indexed model search lib
 APScheduler==2.1.1              # Scheduler
-git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.5
+#git+https://github.com/dotKom/pizzasystem.git@1.2#egg=pizzasystem
 git+https://github.com/dotKom/[email protected]#egg=redWine==0.5
 reportlab==2.7
 pdfdocument==1.6