Merge branch 'master' into avatars-sidebar

Conflicts:
	askbot/models/__init__.py

2 files changed, 42 insertions, 0 deletions

diff --git a/askbot/conf/login_providers.py b/askbot/conf/login_providers.py
index 56423ca4..a97baa9d 100644
--- a/askbot/conf/login_providers.py
+++ b/askbot/conf/login_providers.py
@@ -5,6 +5,7 @@ from askbot.conf.settings_wrapper import settings
 from askbot.deps import livesettings
 from django.utils.translation import ugettext as _
 from django.conf import settings as django_settings
+from askbot.skins import utils as skin_utils
 
 LOGIN_PROVIDERS = livesettings.ConfigurationGroup(
                     'LOGIN_PROVIDERS',
@@ -29,6 +30,38 @@ settings.register(
     )
 )
 
+settings.register(
+    livesettings.BooleanValue(
+        LOGIN_PROVIDERS,
+        'SIGNIN_WORDPRESS_SITE_ENABLED',
+        default = False,
+        description=_('Activate to allow login with self-hosted wordpress site'),
+        help_text=_('to activate this feature you must fill out the wordpress xml-rpc setting bellow')
+    )
+)
+
+settings.register(
+    livesettings.URLValue(
+        LOGIN_PROVIDERS,
+        'WORDPRESS_SITE_URL',
+        default = '',
+        description=_('Fill it with the wordpress url to the xml-rpc, normally http://mysite.com/xmlrpc.php'),
+        help_text=_('To enable, go to Settings->Writing->Remote Publishing and check the box for XML-RPC')
+    )
+)
+
+settings.register(
+    livesettings.ImageValue(
+        LOGIN_PROVIDERS,
+        'WORDPRESS_SITE_ICON',
+        upload_directory = django_settings.ASKBOT_FILE_UPLOAD_DIR,
+        upload_url = '/' + django_settings.ASKBOT_UPLOADED_FILES_URL,
+        default = '/images/logo.gif',
+        description = _('Upload your icon'),
+        url_resolver = skin_utils.get_media_url
+    )
+)
+
 providers = (
     'local',
     'AOL',
diff --git a/askbot/conf/social_sharing.py b/askbot/conf/social_sharing.py
index 0ea5f9be..db01fb49 100644
--- a/askbot/conf/social_sharing.py
+++ b/askbot/conf/social_sharing.py
@@ -40,6 +40,15 @@ settings.register(
 settings.register(
     BooleanValue(
         SOCIAL_SHARING,
+        'ENABLE_SHARING_IDENTICA',
+        default=True,
+        description=_('Check to enable sharing of questions on Identi.ca')
+    )
+)
+
+settings.register(
+    BooleanValue(
+        SOCIAL_SHARING,
         'ENABLE_SHARING_GOOGLE',
         default=True,
         description=_('Check to enable sharing of questions on Google+')