Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13

Conflicts:
	snf-astakos-app/astakos/im/urls.py
	snf-astakos-app/astakos/im/views.py

diff --cc snf-astakos-app/astakos/im/templates/im/profile.html
Simple merge

diff --cc snf-astakos-app/astakos/im/urls.py
index cddf21a,d55e803..69da824
--- 1/snf-astakos-app/astakos/im/urls.py
--- 2/snf-astakos-app/astakos/im/urls.py
+++ b/snf-astakos-app/astakos/im/urls.py
@@@ -63,7 -63,8 +63,9 @@@ urlpatterns = patterns('astakos.im.view
      url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/approve/?$', 'approve_member', {}, name='approve_member'),
      url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/disapprove/?$', 'disapprove_member', {}, name='disapprove_member'),
      url(r'^group/create/?$', 'group_create_list', {}, name='group_create_list'),
+     url(r'^remove_auth_provider/(?P<pk>\d+)?$', 'remove_auth_provider', {},
 -        name='remove_auth_provider')
++        name='remove_auth_provider'),
 +    url(r'^group/how_it_works/?$', 'how_it_works', {}, name='how_it_works')
  )
  
  

diff --cc snf-astakos-app/astakos/im/views.py
index 4ac29e0,833d2c4..c022309
--- 1/snf-astakos-app/astakos/im/views.py
--- 2/snf-astakos-app/astakos/im/views.py
+++ b/snf-astakos-app/astakos/im/views.py
@@@ -1365,8 -1406,19 +1365,23 @@@ def timeline(request)
                             timeline_body=timeline_body)
      return data
  
+ # TODO: action only on POST and user should confirm the removal
+ @require_http_methods(["GET", "POST"])
+ @login_required
+ @signed_terms_required
+ def remove_auth_provider(request, pk):
+     try:
+         provider = request.user.auth_providers.get(pk=pk)
+     except AstakosUserAuthProvider.DoesNotExist:
+         raise Http404
+ 
+     if provider.can_remove():
+         provider.delete()
+         return HttpResponseRedirect(reverse('edit_profile'))
+     else:
+         raise PermissionDenied
  
 +def how_it_works(request):
 +    return render_response(
 +        template='im/how_it_works.html',
 +        context_instance=get_context(request),)