From 245903ba8a5b874a9f6842f0af69a5ff0e6945b0 Mon Sep 17 00:00:00 2001 From: Sklirg Date: Thu, 11 Sep 2014 21:39:14 +0200 Subject: [PATCH 1/7] feedme integration --- onlineweb4/settings/base.py | 7 ++++--- onlineweb4/urls.py | 6 +++--- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/onlineweb4/settings/base.py b/onlineweb4/settings/base.py index a979cccb8..ff5f638e5 100644 --- a/onlineweb4/settings/base.py +++ b/onlineweb4/settings/base.py @@ -122,9 +122,9 @@ os.path.join(PROJECT_ROOT_DIRECTORY, 'templates/'), ) -# Pizzasystem settings -PIZZA_GROUP = 'dotkom' -PIZZA_ADMIN_GROUP = 'pizzaadmin' +# Feedme settings +FEEDME_GROUP = 'dotkom' +FEEDME_ADMIN_GROUP = 'feedmeadmin' # Grappelli settings GRAPPELLI_ADMIN_TITLE = 'Onlineweb' @@ -195,6 +195,7 @@ 'apps.resourcecenter', 'apps.mailinglists', 'scripts', + 'feedme', # Wiki 'wiki', diff --git a/onlineweb4/urls.py b/onlineweb4/urls.py index ead1b1e31..0d1564541 100755 --- a/onlineweb4/urls.py +++ b/onlineweb4/urls.py @@ -105,9 +105,9 @@ url(r'^genfors/', include('apps.genfors.urls')), ) -# pizzasystem -if 'pizzasystem' in settings.INSTALLED_APPS: - urlpatterns += patterns('', url(r'^pizza/', include('pizzasystem.urls'))) +# feedme +if 'feedme' in settings.INSTALLED_APPS: + urlpatterns += patterns('', url(r'^feedme/', include('feedme.urls'))) #Captcha url if 'captcha' in settings.INSTALLED_APPS: diff --git a/requirements.txt b/requirements.txt index 7cce5193d..90b4077f1 100644 --- a/requirements.txt +++ b/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/pizzasystem.git@1.2#egg=pizzasystem +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.2 git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6 From 1d5f4ccb460596378142815233a9cd8645617695 Mon Sep 17 00:00:00 2001 From: Sklirg Date: Thu, 11 Sep 2014 22:31:09 +0200 Subject: [PATCH 2/7] halp --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 90b4077f1..6b25b951c 100644 --- a/requirements.txt +++ b/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.2 +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.2 git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6 From c8291e02290b280b02310f6b61e4b5e57e183931 Mon Sep 17 00:00:00 2001 From: Sklirg Date: Wed, 17 Sep 2014 19:59:39 +0200 Subject: [PATCH 3/7] bump for release --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6b25b951c..9ca5bc759 100644 --- a/requirements.txt +++ b/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.2 +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.3 git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6 From 3f7479328f8b0407974a191962d1098b492ab05e Mon Sep 17 00:00:00 2001 From: Sklirg Date: Wed, 17 Sep 2014 20:11:10 +0200 Subject: [PATCH 4/7] bump for build --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9ca5bc759..949ebc150 100644 --- a/requirements.txt +++ b/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.3 +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.3 #iwantprbuild git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6 From c8e3df8499eb8054adb255b700f1d6d2a3ae7d03 Mon Sep 17 00:00:00 2001 From: Sklirg Date: Wed, 17 Sep 2014 20:14:53 +0200 Subject: [PATCH 5/7] bump for build --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 949ebc150..93b64b3db 100644 --- a/requirements.txt +++ b/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.3 #iwantprbuild +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.3 #iwantprbuildd git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6 From 09514e298ef72c2586e0c762c1f0c15cd4142a28 Mon Sep 17 00:00:00 2001 From: Sklirg Date: Wed, 17 Sep 2014 21:25:39 +0200 Subject: [PATCH 6/7] bump version no --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 93b64b3db..5ada2c5bf 100644 --- a/requirements.txt +++ b/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.3 #iwantprbuildd +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.4 git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6 From cb436fb452bbc6f67578ff579a84ac2607d6faf7 Mon Sep 17 00:00:00 2001 From: Sklirg Date: Wed, 17 Sep 2014 21:34:25 +0200 Subject: [PATCH 7/7] bump for build --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5ada2c5bf..0a4358ddf 100644 --- a/requirements.txt +++ b/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.4 +git+https://github.com/dotKom/feedme.git@#egg=feedme==1.0.5 git+https://github.com/dotKom/redWine.git@0.5#egg=redWine==0.5 reportlab==2.7 pdfdocument==1.6