Merge remote-tracking branch 'origin/remove-core-deps'

Sergio Oliveira
2 parents e2a52f55 e2e2afd0
Showing 67 changed files with 125 additions and 1686 deletions Show diff stats
colab/accounts/auth.py
colab/accounts/forms.py
colab/accounts/middleware.py
colab/accounts/models.py
colab/accounts/search_indexes.py
colab/accounts/templates/accounts/change_password.html
colab/accounts/templates/accounts/login.html
colab/accounts/templates/accounts/user_update_form.html
colab/accounts/tests/test_view_signup.py
colab/accounts/urls.py
colab/accounts/views.py
colab/badger/__init__.py
colab/badger/admin.py
colab/badger/forms.py
colab/badger/management/__init__.py
colab/badger/management/commands/__init__.py
colab/badger/management/commands/rebuild_badges.py
colab/badger/management/commands/update_badges.py
colab/badger/migrations/0001_initial.py
colab/badger/migrations/__init__.py
@@ -1,7 +0,0 @@
-
-from django_browserid.auth import BrowserIDBackend
-
-
-class ColabBrowserIDBackend(BrowserIDBackend):
-    def filter_users_by_email(self, email):
-        return self.User.objects.filter(emails__address=email)
@@ -16,8 +16,6 @@ from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
-from conversejs.models import XMPPAccount
-
 from .utils.validators import validate_social_account
 from .utils import mailman
@@ -152,42 +150,6 @@ class ListsForm(forms.Form):
                                       choices=LISTS_NAMES)
-class ChangeXMPPPasswordForm(forms.ModelForm):
-    password1 = forms.CharField(label=_("Password"),
-                                widget=forms.PasswordInput)
-    password2 = forms.CharField(label=_("Password confirmation"),
-                                widget=forms.PasswordInput,
-                                help_text=_(("Enter the same password as above"
-                                             ", for verification.")))
-
-    class Meta:
-        model = XMPPAccount
-        fields = ('password1', 'password2')
-
-    def __init__(self, *args, **kwargs):
-        super(ChangeXMPPPasswordForm, self).__init__(*args, **kwargs)
-
-        for field_name, field in self.fields.items():
-            # Adds form-control class to all form fields
-            field.widget.attrs.update({'class': 'form-control'})
-
-    def clean_password2(self):
-        password1 = self.cleaned_data.get("password1")
-        password2 = self.cleaned_data.get("password2")
-        if password1 and password2 and password1 != password2:
-            raise forms.ValidationError(
-                _("Password mismatch"),
-                code='password_mismatch',
-            )
-        return password2
-
-    def save(self, commit=True):
-        self.instance.password = self.cleaned_data['password2']
-        if commit:
-            self.instance.save()
-        return self.instance
-
-
 class UserCreationForm(UserForm):
     """
     A form that creates a user, with no privileges, from the given username and
@@ -1,24 +0,0 @@
-
-from django.shortcuts import redirect
-from django.conf import settings
-
-VIEW_NAMES_ALLOWED = ('signup', 'Logout')
-
-
-class UserRegisterMiddleware(object):
-
-    def process_view(self, request, view_func, view_args, view_kwargs):
-        if not settings.BROWSERID_ENABLED:
-            return
-
-        if request.is_ajax():
-            return
-
-        if not request.user.is_authenticated():
-            return
-
-        if not request.user.needs_update:
-            return
-
-        if view_func.__name__ not in VIEW_NAMES_ALLOWED:
-            return redirect('signup')
@@ -47,13 +47,6 @@ class User(AbstractUser):
     objects = ColabUserManager()
-    def check_password(self, raw_password):
-
-        if self.xmpp.exists() and raw_password == self.xmpp.first().password:
-            return True
-
-        return super(User, self).check_password(raw_password)
-
     def get_absolute_url(self):
         return reverse('user_profile', kwargs={'username': self.username})
 # -*- coding: utf-8 -*-
 from haystack import indexes
-# from django.db.models import Count
-
-from colab.badger.utils import get_users_counters
 from .models import User
@@ -26,30 +23,13 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
                                     stored=False)
     webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)
     message_count = indexes.IntegerField(stored=False)
-    # changeset_count = indexes.IntegerField(stored=False)
-    # ticket_count = indexes.IntegerField(stored=False)
-    # wiki_count = indexes.IntegerField(stored=False)
-    contribution_count = indexes.IntegerField(stored=False)
     def get_model(self):
         return User
-    @property
-    def badge_counters(self):
-        if not hasattr(self, '_badge_counters'):
-            self._badge_counters = get_users_counters()
-        return self._badge_counters
-
     def prepare(self, obj):
         prepared_data = super(UserIndex, self).prepare(obj)
-        prepared_data['contribution_count'] = sum((
-            self.prepared_data['message_count'],
-            # self.prepared_data['changeset_count'],
-            # self.prepared_data['ticket_count'],
-            # self.prepared_data['wiki_count']
-        ))
-
         return prepared_data
     def prepare_description(self, obj):
@@ -63,17 +43,5 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
     def prepare_type(self, obj):
         return u'user'
-    def prepare_message_count(self, obj):
-        return self.badge_counters[obj.username]['messages']
-
-    # def prepare_changeset_count(self, obj):
-    #     return self.badge_counters[obj.username]['revisions']
-
-    # def prepare_ticket_count(self, obj):
-    #     return self.badge_counters[obj.username]['tickets']
-
-    # def prepare_wiki_count(self, obj):
-    #     return self.badge_counters[obj.username]['wikis']
-
     def index_queryset(self, using=None):
         return self.get_model().objects.filter(is_active=True)
@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block main-content %}
-<form method="POST" role="form">
-  {% csrf_token %}
-  <div class="row">
-    <h2>{% trans "Change XMPP Client and SVN Password" %}</h2>
-    <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
-      {% for field in form %}
-        <div class="form-group required{% if field.errors %} alert alert-danger has-error{% endif %}">
-          <label for="{{ field.name }}" class="control-label">{{ field.label }}</label>
-          {{ field }}
-          {{ field.errors }}
-        </div>
-      {% endfor %}
-      <button class="btn btn-primary">{% trans "Change Password" %}</button>
-    </div>
-  </div>
-</form>
-{% endblock %}
@@ -1,12 +0,0 @@
-{% extends 'base.html' %}
-{% load browserid i18n %}
-
-{% block main-content %}
-  <br><br><br>
-  <div class="col-lg-12 text-center">
-    <p>{% trans 'To login please click in the link below:'%}</p>
-    {% trans 'Login' as login_text %}
-    {% browserid_login text=login_text link_class='btn btn-primary btn-lg' %}
-  </div>
-  <br><br><br>
-{% endblock %}
@@ -178,40 +178,19 @@ $(function() {
           </div>
         </div>
       </div>
-    {% if not BROWSERID_ENABLED %}
-        <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h3 class="panel-title">
-                {% trans 'Change Password' %}
-              </h3>
-            </div>
-            <div class="panel-body">
-              <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
-            </div>
+      <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">
+              {% trans 'Change Password' %}
+            </h3>
           </div>
-        </div>
-    {% endif %}
-    </div>
-    {% if CONVERSEJS_ENABLED %}
-    <div class="row">
-      <div class="col-lg-12">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h3 class="panel-title">
-            {% trans 'Change Password' %}
-          </h3>
-        </div>
-        <div class="panel-body">
-          <div class="form-group">
-          {% trans "This feature is available only for those who need to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}
+          <div class="panel-body">
+            <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
           </div>
-          <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
         </div>
       </div>
-      </div>
     </div>
-    {% endif %}
     <div class="row">
       <div class="submit">
         <button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
@@ -21,13 +21,6 @@ class TestSignUpView(TestCase):
                                         "usertest@colab.com.br", "123colab4")
         return user
-    def test_user_not_authenticated(self):
-        with self.settings(BROWSERID_ENABLED=True):
-            response = self.client.get("/account/register")
-            self.assertEquals(302, response.status_code)
-            url = "http://testserver/account/login"
-            self.assertEquals(url, response.url)
-
     def test_user_authenticated_and_unregistered(self):
         self.client.login(username="usertestcolab", password="123colab4")
         response = self.client.get("/account/register/")
@@ -2,56 +2,44 @@
 from django.conf import settings
 from django.conf.urls import patterns, url
-from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
-                    ManageUserSubscriptionsView, ChangeXMPPPasswordView)
+from .views import (UserProfileDetailView, UserProfileUpdateView,
+                    ManageUserSubscriptionsView)
 from colab.accounts import views
 from django.contrib.auth import views as auth_views
-BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
+urlpatterns = patterns('',
+    url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
+    url(r'^logout/?$',  'django.contrib.auth.views.logout',
+        {'next_page':'home'}, name='logout'),
-if not BROWSERID_ENABLED:
-    urlpatterns = patterns('',
-        url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
+    url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
+        name="password_reset_done"),
+    url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
+        name="password_reset_complete"),
-        url(r'^logout/?$',  'django.contrib.auth.views.logout',
-            {'next_page':'home'}, name='logout'),
+    url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
+        auth_views.password_reset_confirm,
+        {'template_name':'registration/password_reset_confirm_custom.html'},
+        name="password_reset_confirm"),
-        url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
-            name="password_reset_done"),
-        url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
-            name="password_reset_complete"),
+    url(r'^password-reset/?$', auth_views.password_reset,
+        {'template_name':'registration/password_reset_form_custom.html'},
+        name="password_reset"),
-        url(r'^password-reset-confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
-            auth_views.password_reset_confirm,
-            {'template_name':'registration/password_reset_confirm_custom.html'},
-            name="password_reset_confirm"),
+    url(r'^change-password/?$',auth_views.password_change,
+        {'template_name':'registration/password_change_form_custom.html'},
+        name='password_change'),
-        url(r'^password-reset/?$', auth_views.password_reset,
-            {'template_name':'registration/password_reset_form_custom.html'},
-            name="password_reset"),
-
-        url(r'^change-password/?$',auth_views.password_change,
-            {'template_name':'registration/password_change_form_custom.html'},
-            name='password_change'),
-
-        url(r'^change-password-done/?$',
-            'colab.accounts.views.password_changed', name='password_change_done'),
-    )
-else:
-    urlpatterns = patterns('',
-        url(r'^login/?$', LoginView.as_view(), name='login'),
-    )
+    url(r'^change-password-done/?$',
+        'colab.accounts.views.password_changed', name='password_change_done'),
+)
 urlpatterns += patterns('',
     url(r'^register/?$', 'colab.accounts.views.signup', name='signup'),
-#FIXME Configure for XMPP
-#    url(r'^change-password/$',
-#        ChangeXMPPPasswordView.as_view(), name='change_password'),
-
     url(r'^(?P<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
@@ -13,23 +13,16 @@ from django.core.exceptions import PermissionDenied
 from django.views.generic import DetailView, UpdateView, TemplateView
 from django.http import Http404
-from conversejs import xmpp
-from conversejs.models import XMPPAccount
-
 from colab.super_archives.models import (EmailAddress,
                                          EmailAddressValidation)
 from colab.search.utils import get_collaboration_data, get_visible_threads
 from colab.accounts.models import User
 from .forms import (UserCreationForm, UserForm, ListsForm,
-                    UserUpdateForm, ChangeXMPPPasswordForm)
+                    UserUpdateForm)
 from .utils import mailman
-class LoginView(TemplateView):
-    template_name = "accounts/login.html"
-
-
 class UserProfileBaseMixin(object):
     model = get_user_model()
     slug_field = 'username'
@@ -52,11 +45,6 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
         return obj
-    def get_context_data(self, **kwargs):
-        context = super(UserProfileUpdateView, self).get_context_data(**kwargs)
-        context['CONVERSEJS_ENABLED'] = getattr(settings, 'CONVERSEJS_ENABLED')
-        return context
-
 class UserProfileDetailView(UserProfileBaseMixin, DetailView):
     template_name = 'accounts/user_detail.html'
@@ -94,37 +82,19 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
 def signup(request):
-    BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
-
-    if BROWSERID_ENABLED:
-        # If the user is not authenticated, redirect to login
-        if not request.user.is_authenticated():
-            return redirect('login')
     if request.user.is_authenticated():
-        # If the user doesn't need to update its main data,
-        #   redirect to its profile
-        # It happens when user is created by browserid
-        # and didn't set his/her main data
         if not request.user.needs_update:
             return redirect('user_profile', username=request.user.username)
-    # If the user is authenticated in Persona, but not in the Colab then he
-    # will be redirected to the register form.
     if request.method == 'GET':
-        if BROWSERID_ENABLED:
-            user_form = UserForm()
-        else:
-            user_form = UserCreationForm()
+        user_form = UserCreationForm()
         lists_form = ListsForm()
         return render(request, 'accounts/user_create_form.html',
                       {'user_form': user_form, 'lists_form': lists_form})
-    if BROWSERID_ENABLED:
-        user_form = UserForm(request.POST, instance=request.user)
-    else:
-        user_form = UserCreationForm(request.POST)
+    user_form = UserCreationForm(request.POST)
     lists_form = ListsForm(request.POST)
     if not user_form.is_valid() or not lists_form.is_valid():
@@ -134,12 +104,9 @@ def signup(request):
     user = user_form.save(commit=False)
     user.needs_update = False
-    if not BROWSERID_ENABLED:
-        user.is_active = False
-        user.save()
-        EmailAddressValidation.create(user.email, user)
-    else:
-        user.save()
+    user.is_active = False
+    user.save()
+    EmailAddressValidation.create(user.email, user)
     # Check if the user's email have been used previously
     #   in the mainling lists to link the user to old messages
@@ -208,50 +175,6 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
                      self).get_context_data(**context)
-class ChangeXMPPPasswordView(UpdateView):
-    model = XMPPAccount
-    form_class = ChangeXMPPPasswordForm
-    fields = ['password', ]
-    template_name = 'accounts/change_password.html'
-
-    def get_success_url(self):
-        return reverse('user_profile', kwargs={
-            'username': self.request.user.username
-        })
-
-    def get_object(self, queryset=None):
-        obj = get_object_or_404(XMPPAccount, user=self.request.user.pk)
-        self.old_password = obj.password
-        return obj
-
-    def form_valid(self, form):
-        transaction.set_autocommit(False)
-
-        response = super(ChangeXMPPPasswordView, self).form_valid(form)
-
-        changed = xmpp.change_password(
-            self.object.jid,
-            self.old_password,
-            form.cleaned_data['password1']
-        )
-
-        if not changed:
-            messages.error(
-                self.request,
-                _(u'Could not change your password. Please, try again later.')
-            )
-            transaction.rollback()
-            return response
-        else:
-            transaction.commit()
-
-        messages.success(
-            self.request,
-            _("You've changed your password successfully!")
-        )
-        return response
-
-
 def password_changed(request):
     messages.success(request, _('Your password was changed.'))
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.contrib import admin
-
-from .forms import BadgeForm
-from .models import Badge, BadgeI18N
-
-
-class BadgeI18NInline(admin.TabularInline):
-    model = BadgeI18N
-
-
-class BadgeAdmin(admin.ModelAdmin):
-    form = BadgeForm
-    inlines = [BadgeI18NInline, ]
-    list_display = ['title', 'description', 'order']
-    list_editable = ['order', ]
-
-
-admin.site.register(Badge, BadgeAdmin)
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django import forms
-from django.utils.translation import ugettext_lazy as _
-
-from PIL import Image
-
-from .models import Badge
-
-try:
-    from cStringIO import StringIO
-except ImportError:
-    from StringIO import StringIO
-
-
-class BadgeForm(forms.ModelForm):
-    image = forms.ImageField(label=_(u'Image'), required=False)
-
-    class Meta:
-        model = Badge
-        fields = (
-            'title', 'description', 'image', 'user_attr', 'comparison',
-            'value', 'awardees'
-        )
-
-    def clean_image(self):
-        if not self.instance.pk and not self.cleaned_data['image']:
-            raise forms.ValidationError(_(u'You must add an Image'))
-        return self.cleaned_data['image']
-
-    def save(self, commit=True):
-
-        instance = super(BadgeForm, self).save(commit=False)
-
-        if self.cleaned_data['image']:
-            img = Image.open(self.cleaned_data['image'])
-            img = img.resize((50, 50), Image.ANTIALIAS)
-            f = StringIO()
-            img.save(f, 'png')
-            instance.image_base64 = f.getvalue().encode('base64')
-            f.close()
-
-        if commit:
-            instance.save()
-
-        return instance
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.core.management.base import BaseCommand
-from haystack.query import SearchQuerySet
-
-from colab.accounts.models import User
-from colab.badger.models import Badge
-
-
-class Command(BaseCommand):
-    help = "Rebuild the user's badges."
-
-    def handle(self, *args, **kwargs):
-        for badge in Badge.objects.filter(type='auto'):
-            if not badge.comparison:
-                continue
-            elif badge.comparison == 'biggest':
-                order = u'-{}'.format(Badge.USER_ATTR_OPTS[badge.user_attr])
-                sqs = SearchQuerySet().filter(type='user')
-                user = sqs.order_by(order)[0]
-                badge.awardees.remove(*list(badge.awardees.all()))
-                badge.awardees.add(User.objects.get(pk=user.pk))
-                continue
-
-            comparison = u'__{}'.format(badge.comparison) if badge.comparison \
-                         is not 'equal' else u''
-
-            key = u'{}{}'.format(
-                Badge.USER_ATTR_OPTS[badge.user_attr],
-                comparison
-            )
-            opts = {key: badge.value}
-
-            sqs = SearchQuerySet().filter(
-                type='user',
-                **opts
-            )
-
-            # Remove all awardees to make sure that all of then
-            # still accomplish the necessary to keep the badge
-            badge.awardees.remove(*list(badge.awardees.all()))
-
-            for user in sqs:
-                badge.awardees.add(User.objects.get(pk=user.pk))
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.core.management.base import BaseCommand
-from haystack.query import SearchQuerySet
-
-from colab.accounts.models import User
-from colab.badger.models import Badge
-
-import logging
-
-
-class Command(BaseCommand):
-    help = "Update the user's badges"
-
-    def update_badges(self):
-        for badge in Badge.objects.filter(type='auto'):
-            if not badge.comparison:
-                continue
-            elif badge.comparison == 'biggest':
-                order = u'-{}'.format(Badge.USER_ATTR_OPTS[badge.user_attr])
-                sqs = SearchQuerySet().filter(type='user')
-                user = sqs.order_by(order)[0]
-                badge.awardees.add(User.objects.get(pk=user.pk))
-                continue
-
-            comparison = u'__{}'.format(badge.comparison) if badge.comparison \
-                         is not 'equal' else u''
-
-            key = u'{}{}'.format(
-                Badge.USER_ATTR_OPTS[badge.user_attr],
-                comparison
-            )
-            opts = {key: badge.value}
-
-            sqs = SearchQuerySet().filter(type='user', **opts)
-
-            for user in sqs:
-                badge.awardees.add(User.objects.get(pk=user.pk))
-
-    def handle(self, *args, **kwargs):
-        try:
-            self.update_badges()
-        except Exception as e:
-            logging.exception(e)
-            raise
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Badge',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(max_length=200, null=True, verbose_name='Title', blank=True)),
-                ('description', models.CharField(max_length=200, null=True, verbose_name='Description', blank=True)),
-                ('image_base64', models.TextField(verbose_name='Image')),
-                ('type', models.CharField(max_length=200, verbose_name='Type', choices=[('auto', 'Automatically'), ('manual', 'Manual')])),
-                ('user_attr', models.CharField(blank=True, max_length=100, null=True, verbose_name='User attribute', choices=[('messages', 'Messages'), ('contributions', 'Contributions'), ('wikis', 'Wikis'), ('revisions', 'Revisions'), ('tickets', 'Ticket')])),
-                ('comparison', models.CharField(blank=True, max_length=10, null=True, verbose_name='Comparison', choices=[('gte', 'Greater than or equal'), ('lte', 'less than or equal'), ('equal', 'Equal'), ('biggest', 'Biggest')])),
-                ('value', models.PositiveSmallIntegerField(null=True, verbose_name='Value', blank=True)),
-                ('order', models.PositiveSmallIntegerField(default=100, verbose_name='Order')),
-                ('awardees', models.ManyToManyField(to=settings.AUTH_USER_MODEL, null=True, verbose_name='Awardees', blank=True)),
-            ],
-            options={
-                'ordering': ['order'],
-                'verbose_name': 'Badge',
-                'verbose_name_plural': 'Badges',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='BadgeI18N',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('i18n_language', models.CharField(max_length=10, verbose_name='language', choices=[(b'pt-br', 'Portuguese'), (b'es', 'Spanish')])),
-                ('title', models.CharField(max_length=200, null=True, verbose_name='Title', blank=True)),
-                ('description', models.CharField(max_length=200, null=True, verbose_name='Description', blank=True)),
-                ('i18n_source', models.ForeignKey(related_name=b'translations', editable=False, to='badger.Badge', verbose_name='source')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.AlterUniqueTogether(
-            name='badgei18n',
-            unique_together=set([('i18n_source', 'i18n_language')]),
-        ),
-    ]
@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.conf import settings
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-from i18n_model.models import I18nModel
-
-
-class Badge(models.Model):
-    COMPARISON_CHOICES = (
-        (u'gte', _(u'Greater than or equal')),
-        (u'lte', _(u'less than or equal')),
-        (u'equal', _(u'Equal')),
-        (u'biggest', _(u'Biggest')),
-    )
-    TYPE_CHOICES = (
-        (u'auto', _(u'Automatically')),
-        (u'manual', _(u'Manual')),
-    )
-    USER_ATTR_CHOICES = (
-        (u'messages', _(u'Messages')),
-        (u'contributions', _(u'Contributions')),
-        (u'wikis', _(u'Wikis')),
-        (u'revisions', _(u'Revisions')),
-        (u'tickets', _(u'Ticket')),
-    )
-    USER_ATTR_OPTS = {
-        u'messages': u'message_count',
-        u'revisions': u'changeset_count',
-        u'tickets': u'ticket_count',
-        u'wikis': u'wiki_count',
-        u'contributions': u'contribution_count',
-    }
-
-    title = models.CharField(_(u'Title'), max_length=200, blank=True,
-                             null=True)
-    description = models.CharField(_(u'Description'), max_length=200,
-                                   blank=True, null=True)
-    image_base64 = models.TextField(_(u'Image'))
-    type = models.CharField(_(u'Type'), max_length=200, choices=TYPE_CHOICES)
-    user_attr = models.CharField(
-        _(u'User attribute'), max_length=100,
-        choices=USER_ATTR_CHOICES,
-        blank=True,
-        null=True,
-    )
-    comparison = models.CharField(
-        _(u'Comparison'),
-        max_length=10,
-        choices=COMPARISON_CHOICES,
-        blank=True,
-        null=True
-    )
-    value = models.PositiveSmallIntegerField(
-        _(u'Value'),
-        blank=True,
-        null=True
-    )
-    awardees = models.ManyToManyField(
-        settings.AUTH_USER_MODEL,
-        verbose_name=_(u'Awardees'),
-        blank=True,
-        null=True
-    )
-    order = models.PositiveSmallIntegerField(_(u'Order'), default=100)
-
-    class Meta:
-        verbose_name = _(u'Badge')
-        verbose_name_plural = _(u'Badges')
-        ordering = ['order', ]
-
-    def __unicode__(self):
-        return u'{} ({}, {})'.format(
-            self.title,
-            self.get_user_attr_display(),
-            self.get_type_display(),
-        )
-
-
-class BadgeI18N(I18nModel):
-    class Meta:
-        source_model = Badge
-        translation_fields = ('title', 'description')
@@ -1,4 +0,0 @@
-# uncomment the import if you really use.
-# from django.test import TestCase
-
-# Create your tests here.
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from django.db.models import Count
-
-# from proxy.trac.models import (Ticket, Wiki)
-# from proxy.trac.models import (Revision, WikiCollabCount, TicketCollabCount)
-from colab.accounts.models import User
-
-
-# def get_wiki_counters():
-#     return {author: count for author, count in
-#             WikiCollabCount.objects.values_list()}
-
-
-# def get_revision_counters():
-#     return {
-#         author: count for author, count in Revision.objects.values_list(
-#             'author'
-#         ).annotate(count=Count('author'))
-#     }
-
-
-# def get_ticket_counters():
-#     return {author: count for author, count in
-#             TicketCollabCount.objects.values_list()}
-
-
-def get_users_counters():
-    # wiki_counters = get_wiki_counters()
-    # revision_counters = get_revision_counters()
-    # ticket_counters = get_ticket_counters()
-
-    users_counters = {}
-    for user in User.objects.annotate(message_count=Count('emails__message')):
-        users_counters[user.username] = {
-            'messages': user.message_count,
-            # 'wikis': wiki_counters.get(user.username, 0),
-            # 'revisions': revision_counters.get(user.username, 0),
-            # 'tickets': ticket_counters.get(user.username, 0),
-        }
-    return users_counters
@@ -1,4 +0,0 @@
-# uncomment the import if you really use.
-# from django.shortcuts import render
-
-# Create your views here.
@@ -26,6 +26,3 @@ def ribbon(request):
         }
     }
-
-def browserid_enabled(request):
-    return {'BROWSERID_ENABLED': getattr(settings, 'BROWSERID_ENABLED', False)}
@@ -126,12 +126,11 @@ msgstr &quot;&quot;
 msgid "Register"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:8 badger/models.py:21
+#: accounts/templates/accounts/user_detail.html:8
 msgid "Messages"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:9 badger/models.py:22
-#: templates/home.html:7
+#: accounts/templates/accounts/user_detail.html:9
 msgid "Contributions"
 msgstr ""
@@ -175,7 +174,7 @@ msgstr &quot;&quot;
 msgid "Participation by Group"
 msgstr ""
-#: accounts/templates/accounts/user_detail.html:132 badger/models.py:69
+#: accounts/templates/accounts/user_detail.html:132
 msgid "Badges"
 msgstr ""
@@ -291,87 +290,18 @@ msgstr &quot;&quot;
 msgid "You've changed your password successfully!"
 msgstr ""
-#: badger/forms.py:19 badger/models.py:39 settings.py:160
+#: settings.py:160
 msgid "Image"
 msgstr ""
-#: badger/forms.py:30
-msgid "You must add an Image"
-msgstr ""
-
-#: badger/models.py:11
-msgid "Greater than or equal"
-msgstr ""
-
-#: badger/models.py:12
-msgid "less than or equal"
-msgstr ""
-
-#: badger/models.py:13
-msgid "Equal"
-msgstr ""
-
-#: badger/models.py:14
-msgid "Biggest"
-msgstr ""
-
-#: badger/models.py:17
-msgid "Automatically"
-msgstr ""
-
-#: badger/models.py:18
-msgid "Manual"
-msgstr ""
-
-#: badger/models.py:23
-msgid "Wikis"
-msgstr ""
-
-#: badger/models.py:24
-msgid "Revisions"
-msgstr ""
-
-#: badger/models.py:25
 #: search/templates/search/includes/search_filters.html:122
 msgid "Ticket"
 msgstr ""
-#: badger/models.py:35
-msgid "Title"
-msgstr ""
-
-#: badger/models.py:37
-msgid "Description"
-msgstr ""
-
-#: badger/models.py:40 search/forms.py:18
+#: search/forms.py:18
 msgid "Type"
 msgstr ""
-#: badger/models.py:42
-msgid "User attribute"
-msgstr ""
-
-#: badger/models.py:48
-msgid "Comparison"
-msgstr ""
-
-#: badger/models.py:55
-msgid "Value"
-msgstr ""
-
-#: badger/models.py:61
-msgid "Awardees"
-msgstr ""
-
-#: badger/models.py:65
-msgid "Order"
-msgstr ""
-
-#: badger/models.py:68
-msgid "Badge"
-msgstr ""
-
 #: home/context_processors.py:15
 msgid "Fork me!"
 msgstr ""
@@ -149,12 +149,11 @@ msgid &quot;Register&quot;
 msgstr "Cadastre-se"
 #: colab/accounts/templates/accounts/user_detail.html:8
-#: colab/badger/models.py:21
 msgid "Messages"
 msgstr "Mensagens"
 #: colab/accounts/templates/accounts/user_detail.html:9
-#: colab/badger/models.py:22 colab/templates/home.html:7
+#: colab/templates/home.html:7
 msgid "Contributions"
 msgstr "Contribuições"
@@ -199,7 +198,6 @@ msgid &quot;Participation by Group&quot;
 msgstr "Participação por grupo"
 #: colab/accounts/templates/accounts/user_detail.html:132
-#: colab/badger/models.py:69
 msgid "Badges"
 msgstr "Medalhas"
@@ -365,87 +363,18 @@ msgstr &quot;Nos enviamos o email com as intruções para mudança de senha. Em breve
 msgid "Your password has been set. You may go ahead and log in now."
 msgstr "Sua senha foi redefinida. Você pode prosseguir e autenticar agora."
-#: colab/badger/forms.py:19 colab/badger/models.py:39 colab/settings.py:160
+#: colab/settings.py:160
 msgid "Image"
 msgstr "Imagem"
-#: colab/badger/forms.py:30
-msgid "You must add an Image"
-msgstr "Você deve adicionar uma imagem"
-
-#: colab/badger/models.py:11
-msgid "Greater than or equal"
-msgstr "Maior que ou igual"
-
-#: colab/badger/models.py:12
-msgid "less than or equal"
-msgstr "menor que ou igual"
-
-#: colab/badger/models.py:13
-msgid "Equal"
-msgstr "Igual"
-
-#: colab/badger/models.py:14
-msgid "Biggest"
-msgstr "Maior"
-
-#: colab/badger/models.py:17
-msgid "Automatically"
-msgstr "Automaticamente"
-
-#: colab/badger/models.py:18
-msgid "Manual"
-msgstr "Manual"
-
-#: colab/badger/models.py:23
-msgid "Wikis"
-msgstr "Wikis"
-
-#: colab/badger/models.py:24
-msgid "Revisions"
-msgstr "Conjunto de mudanças"
-
-#: colab/badger/models.py:25
 #: colab/search/templates/search/includes/search_filters.html:122
 msgid "Ticket"
 msgstr "Tíquetes"
-#: colab/badger/models.py:35
-msgid "Title"
-msgstr "Título"
-
-#: colab/badger/models.py:37
-msgid "Description"
-msgstr "Descrição"
-
-#: colab/badger/models.py:40 colab/search/forms.py:18
+#: colab/search/forms.py:18
 msgid "Type"
 msgstr "Tipo"
-#: colab/badger/models.py:42
-msgid "User attribute"
-msgstr "Atributo do usuário"
-
-#: colab/badger/models.py:48
-msgid "Comparison"
-msgstr "Comparação"
-
-#: colab/badger/models.py:55
-msgid "Value"
-msgstr "Valor"
-
-#: colab/badger/models.py:61
-msgid "Awardees"
-msgstr "Premiados"
-
-#: colab/badger/models.py:65
-msgid "Order"
-msgstr "Ordem"
-
-#: colab/badger/models.py:68
-msgid "Badge"
-msgstr "Medalha"
-
 #: colab/home/context_processors.py:20
 msgid "Fork me!"
 msgstr "Fork me!"
@@ -21,15 +21,6 @@ EMAIL_SUBJECT_PREFIX = &#39;[colab]&#39;
 SECRET_KEY = '{secret_key}'
-#  Must use it without trailing slash
-SITE_URL = 'http://localhost:8000'
-BROWSERID_AUDIENCES = [
-    'http://localhost:8000',
-#    'http://example.com',
-#    'https://example.org',
-#    'http://example.net',
-]
-
 ALLOWED_HOSTS = [
     'localhost',
 #    'example.com',
@@ -37,18 +28,9 @@ ALLOWED_HOSTS = [
 #    'example.net',
 ]
-### Uncomment to enable Broswer ID protocol for authentication
-# BROWSERID_ENABLED = True
-
 ### Uncomment to enable social networks fields profile
 # SOCIAL_NETWORK_ENABLED = True
-### Uncomment to enable Converse.js
-# CONVERSEJS_ENABLED = True
-
-### Uncomment to enable auto-registration
-# CONVERSEJS_AUTO_REGISTER = 'xmpp.example.com'
-
 ## Database settings
 DATABASES = {{
     'default': {{
@@ -1,3 +0,0 @@
-
-
-default_app_config = 'colab.plugins.jenkins.apps.ProxyJenkinsAppConfig'
@@ -1,16 +0,0 @@
-
-from django.utils.translation import ugettext_lazy as _
-
-from ..utils.apps import ColabProxiedAppConfig
-
-
-class ProxyJenkinsAppConfig(ColabProxiedAppConfig):
-    name = 'colab.plugins.jenkins'
-    verbose_name = 'Jenkins Proxy'
-
-    menu = {
-        'title': _('Code'),
-        'links': (
-            (_('Continuos Integration'), ''),
-        ),
-    }
@@ -1,7 +0,0 @@
-from colab.plugins.utils.proxy_data_api import ProxyDataAPI
-
-
-class JenkinsDataAPI(ProxyDataAPI):
-
-    def fetch_data(self):
-        pass
@@ -1,27 +0,0 @@
-<rules
-    xmlns="http://namespaces.plone.org/diazo"
-    xmlns:css="http://namespaces.plone.org/diazo/css"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <before theme-children="/html/head" content-children="/html/head" />
-    <before css:theme-children="#main-content" css:content-children="body" />
-
-    <merge attributes="class" css:theme="body" css:content="body" />
-    <drop css:content="#top-panel" />
-
-    <drop attributes="style" css:content="#main-table" />
-
-    <after theme-children="/html/head">
-      <script>jQuery.noConflict();</script>
-      <style>
-        #breadcrumbs {
-          border: 0 !important;
-        }
-
-        #right-top-nav {
-          margin-right: 5em !important;
-        }
-      </style>
-    </after>
-
-</rules>
@@ -1,10 +0,0 @@
-
-from django.conf.urls import patterns, url
-
-from .views import JenkinsProxyView
-
-
-urlpatterns = patterns('',
-    # Jenkins URLs
-    url(r'^(?P<path>.*)$', JenkinsProxyView.as_view(), name='jenkins'),
-)
@@ -1,6 +0,0 @@
-
-from ..utils.views import ColabProxyView
-
-
-class JenkinsProxyView(ColabProxyView):
-    app_label = 'jenkins'
@@ -1,3 +0,0 @@
-
-
-default_app_config = 'colab.plugins.redmine.apps.ProxyRedmineAppConfig'
@@ -1,7 +0,0 @@
-
-from ..utils.apps import ColabProxiedAppConfig
-
-
-class ProxyRedmineAppConfig(ColabProxiedAppConfig):
-    name = 'colab.plugins.redmine'
-    verbose_name = 'Redmine Proxy'
@@ -1,7 +0,0 @@
-from colab.plugins.utils.proxy_data_api import ProxyDataAPI
-
-
-class RedmineDataAPI(ProxyDataAPI):
-
-    def fetch_data(self):
-        pass
@@ -1,11 +0,0 @@
-<rules
-    xmlns="http://namespaces.plone.org/diazo"
-    xmlns:css="http://namespaces.plone.org/diazo/css"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <before theme-children="/html/head" content-children="/html/head" />
-    <before css:theme-children="#main-content" css:content-children="body" />
-
-    <merge attributes="class" css:theme="body" css:content="body" />
-    <drop css:content="#top-panel" />
-</rules>
@@ -1,10 +0,0 @@
-
-from django.conf.urls import patterns, url
-
-from .views import RedmineProxyView
-
-
-urlpatterns = patterns('',
-    # RedmineProxyView URLs
-    url(r'^redmine/(?P<path>.*)$', RedmineProxyView.as_view()),
-)
@@ -1,7 +0,0 @@
-
-from ..utils.views import ColabProxyView
-
-
-class RedmineProxyView(ColabProxyView):
-    app_label = 'redmine'
-    diazo_theme_template = 'proxy/redmine.html'
@@ -1,3 +0,0 @@
-
-
-default_app_config = 'colab.plugins.trac.apps.ProxyTracAppConfig'
@@ -1 +0,0 @@
-# from . import signals
@@ -1,24 +0,0 @@
-
-from django.utils.translation import ugettext_lazy as _
-
-from ..utils.apps import ColabProxiedAppConfig
-
-
-class ProxyTracAppConfig(ColabProxiedAppConfig):
-    name = 'colab.plugins.trac'
-    verbose_name = 'Trac Proxy'
-
-    menu = {
-        'title': _('Code'),
-        'links': (
-            (_('Timeline'), 'timeline'),
-            (_('Wiki'), 'wiki'),
-            (_('View Tickets'), 'report'),
-            (_('Roadmap'), 'roadmap'),
-            (_('Browse Source'), 'browser'),
-        ),
-        'auth_links': (
-            (_('New Ticket'), 'newticket'),
-            (_('New Wiki Page'), 'wiki/WikiNewPage'),
-        ),
-    }
@@ -1,7 +0,0 @@
-from colab.plugins.utils.proxy_data_api import ProxyDataAPI
-
-
-class TracDataAPI(ProxyDataAPI):
-
-    def fetch_data(self):
-        pass
@@ -1,45 +0,0 @@
-<rules
-    xmlns="http://namespaces.plone.org/diazo"
-    xmlns:css="http://namespaces.plone.org/diazo/css"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <replace css:theme="#trac-css" content="//head/link" />
-    <replace css:theme="#trac-js" content="//head/script" />
-    <replace theme="//head/title" content="//head/title" />
-
-    <before css:theme-children="#main-content" css:content="#main" />
-
-    <after theme-children="/html/head">
-        <style>
-          .navbar .nav ul { font-size: 14px; text-align: left; padding: 5px 0; }
-          .navbar .nav li { border: 0; padding: 0; white-space: normal; display: list-item;}
-          :link:not(.btn),
-          :visited:not(.btn) { border: 0; color: rgb(66, 139, 202); }
-          h1 { font-size: 24px; margin: 0.15em 1em 0.5em 0px; }
-          h2 { font-size: 20px }
-          h3 { font-size: 16px }
-          h4 { font-size: 14px }
-          input[type="checkbox"], input[type="radio"] { margin: 0 4px; }
-          fieldset { padding: 1em; margin: 1em 0; border: 1px solid rgb(215, 215, 215); }
-          label { font-weight: 400; }
-          legend { margin-bottom: 0; width: auto; }
-          input, textarea, select { margin: 2px; }
-
-          .wikitoolbar,
-          .wikitoolbar:before,
-          .wikitoolbar:after {
-            -moz-box-sizing: content-box;
-            -webkit-box-sizing: content-box;
-          }
-          .wikitoolbar :link,
-          .wikitoolbar :visited {
-            border-width: 1px;
-            border-style: solid;
-            border-color: #fff #fff #fff #ccc;
-            -moz-box-sizing: content-box;
-            -webkit-box-sizing: content-box;
-          }
-        </style>
-    </after>
-
-</rules>
@@ -1,141 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations, connections
-
-
-def create_views(apps, schema_editor):
-    connection = connections['trac']
-
-    cursor = connection.cursor()
-
-    # revision_view
-    cursor.execute('''
-        CREATE OR REPLACE VIEW revision_view AS SELECT
-        revision.rev,
-        revision.author,
-        revision.message,
-        repository.value AS repository_name,
-        TIMESTAMP WITH TIME ZONE 'epoch' + (revision.time/1000000) * INTERVAL '1s' AS created,
-        CONCAT(revision.repos, '-', revision.rev) AS key
-        FROM revision
-        INNER JOIN repository ON(
-        repository.id = revision.repos
-        AND repository.name = 'name'
-        AND repository.value != ''
-        );
-        ''')
-
-    # attachment_view
-    cursor.execute('''
-        CREATE OR REPLACE VIEW attachment_view AS SELECT
-        CONCAT(attachment.type, '/' , attachment.id, '/', attachment.filename) AS url,
-        attachment.type AS used_by,
-        attachment.filename AS filename,
-        attachment.id as attach_id,
-        (SELECT LOWER(SUBSTRING(attachment.filename FROM '\.(\w+)$'))) AS mimetype,
-        attachment.author AS author,
-        attachment.description AS description,
-        attachment.size AS size,
-        TIMESTAMP WITH TIME ZONE 'epoch' + (attachment.time/1000000)* INTERVAL '1s' AS created
-        FROM attachment;
-        ''')
-
-    # wiki_view
-    cursor.execute('''
-        CREATE OR REPLACE VIEW wiki_view AS SELECT
-        wiki.name AS name,
-        (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
-        AND wiki2.version = MAX(wiki.version)) AS wiki_text,
-        (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
-        AND wiki3.version = 1) AS author,
-        string_agg(DISTINCT wiki.author, ', ') AS collaborators,
-        TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS created,
-        TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS modified,
-        (SELECT wiki4.author FROM wiki AS wiki4 WHERE wiki4.name = wiki.name
-        AND wiki4.version = MAX(wiki.version)) AS modified_by
-        FROM wiki
-        GROUP BY wiki.name;
-        ''')
-
-    # ticket_view
-    cursor.execute('''
-        CREATE OR REPLACE VIEW ticket_view AS SELECT
-        ticket.id AS id,
-        ticket.summary as summary,
-        ticket.description as description,
-        ticket.milestone as milestone,
-        ticket.priority as priority,
-        ticket.component as component,
-        ticket.version as version,
-        ticket.severity as severity,
-        ticket.reporter as reporter,
-        ticket.reporter as author,
-        ticket.status as status,
-        ticket.keywords as keywords,
-        (SELECT
-        string_agg(DISTINCT ticket_change.author, ', ')
-        FROM ticket_change WHERE ticket_change.ticket = ticket.id
-        GROUP BY ticket_change.ticket) as collaborators,
-        TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
-        TIMESTAMP WITH TIME ZONE 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified,
-        (SELECT
-        ticket_change.author
-        FROM ticket_change
-        WHERE ticket_change.ticket = ticket.id
-        AND ticket_change.time = ticket.changetime
-        LIMIT 1
-        ) AS modified_by
-        FROM ticket;
-        ''')
-
-    # ticket_collab_count_view
-    cursor.execute('''
-        CREATE OR REPLACE VIEW ticket_collab_count_view AS
-        SELECT
-        COALESCE (t1.author, t2.author) as author,
-        (COALESCE(t1.count, 0) + COALESCE(t2.count, 0)) as count
-        FROM
-        (SELECT author, count(*) as count
-        FROM ticket_change
-        GROUP BY author
-        ORDER BY author
-        ) AS t1
-        FULL OUTER JOIN
-        (SELECT reporter as author, count(*) as count
-        FROM ticket
-        GROUP BY reporter
-        ORDER BY reporter
-        ) AS t2
-        ON t1.author = t2.author;
-        ''')
-
-    # wiki_collab_count_view
-    cursor.execute('''
-        CREATE OR REPLACE VIEW wiki_collab_count_view AS
-        SELECT author, count(*) from wiki GROUP BY author;
-        ''')
-
-
-def drop_views(apps, schema_editor):
-    connection = connections['trac']
-
-    cursor = connection.cursor()
-    cursor.execute('''
-        DROP VIEW IF EXISTS revision_view;
-        DROP VIEW IF EXISTS ticket_view;
-        DROP VIEW IF EXISTS wiki_view;
-        DROP VIEW IF EXISTS ticket_collab_count_view;
-        DROP VIEW IF EXISTS wiki_collab_count_view;
-        DROP VIEW IF EXISTS attachment_view;
-        ''')
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.RunPython(code=create_views, reverse_code=drop_views)
-    ]
@@ -1,133 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-import urllib2
-
-from django.db import models
-from django.conf import settings
-
-from hitcounter.models import HitCounterModelMixin
-
-from colab.accounts.models import User
-
-
-class Attachment(models.Model, HitCounterModelMixin):
-    url = models.TextField(primary_key=True)
-    attach_id = models.TextField()
-    used_by = models.TextField()
-    filename = models.TextField()
-    author = models.TextField(blank=True)
-    description = models.TextField(blank=True)
-    created = models.DateTimeField(blank=True)
-    mimetype = models.TextField(blank=True)
-    size = models.IntegerField(blank=True)
-
-    class Meta:
-        managed = False
-        db_table = 'attachment_view'
-
-    @property
-    def filepath(self):
-        return os.path.join(
-            settings.ATTACHMENTS_FOLDER_PATH,
-            self.used_by,
-            self.attach_id,
-            urllib2.quote(self.filename.encode('utf8'))
-        )
-
-    def get_absolute_url(self):
-        return u'/raw-attachment/{}'.format(self.url)
-
-    def get_author(self):
-        try:
-            return User.objects.get(username=self.author)
-        except User.DoesNotExist:
-            return None
-
-
-class Revision(models.Model, HitCounterModelMixin):
-    key = models.TextField(blank=True, primary_key=True)
-    rev = models.TextField(blank=True)
-    author = models.TextField(blank=True)
-    message = models.TextField(blank=True)
-    repository_name = models.TextField(blank=True)
-    created = models.DateTimeField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'revision_view'
-
-    def get_absolute_url(self):
-        return u'/changeset/{}/{}'.format(self.rev, self.repository_name)
-
-    def get_author(self):
-        try:
-            return User.objects.get(username=self.author)
-        except User.DoesNotExist:
-            return None
-
-
-class Ticket(models.Model, HitCounterModelMixin):
-    id = models.IntegerField(primary_key=True)
-    summary = models.TextField(blank=True)
-    description = models.TextField(blank=True)
-    milestone = models.TextField(blank=True)
-    priority = models.TextField(blank=True)
-    component = models.TextField(blank=True)
-    version = models.TextField(blank=True)
-    severity = models.TextField(blank=True)
-    reporter = models.TextField(blank=True)
-    author = models.TextField(blank=True)
-    status = models.TextField(blank=True)
-    keywords = models.TextField(blank=True)
-    collaborators = models.TextField(blank=True)
-    created = models.DateTimeField(blank=True, null=True)
-    modified = models.DateTimeField(blank=True, null=True)
-    modified_by = models.TextField(blank=True)
-
-    class Meta:
-        managed = False
-        db_table = 'ticket_view'
-
-    def get_absolute_url(self):
-        return u'/ticket/{}'.format(self.id)
-
-    def get_author(self):
-        try:
-            return User.objects.get(username=self.author)
-        except User.DoesNotExist:
-            return None
-
-    def get_modified_by(self):
-        try:
-            return User.objects.get(username=self.modified_by)
-        except User.DoesNotExist:
-            return None
-
-
-class Wiki(models.Model, HitCounterModelMixin):
-    name = models.TextField(primary_key=True)
-    wiki_text = models.TextField(blank=True)
-    author = models.TextField(blank=True)
-    collaborators = models.TextField(blank=True)
-    created = models.DateTimeField(blank=True, null=True)
-    modified = models.DateTimeField(blank=True, null=True)
-    modified_by = models.TextField(blank=True)
-
-    class Meta:
-        managed = False
-        db_table = 'wiki_view'
-
-    def get_absolute_url(self):
-        return u'/wiki/{}'.format(self.name)
-
-    def get_author(self):
-        try:
-            return User.objects.get(username=self.author)
-        except User.DoesNotExist:
-            return None
-
-    def get_modified_by(self):
-        try:
-            return User.objects.get(username=self.modified_by)
-        except User.DoesNotExist:
-            return None
@@ -1,23 +0,0 @@
-class TracRouter(object):
-    def db_for_read(self, model, **hints):
-        if model._meta.app_label == 'proxy':
-            return 'trac'
-        return None
-
-    def db_for_write(self, model, **hints):
-        if model._meta.app_label == 'proxy':
-            return 'trac'
-        return None
-
-    def allow_relation(self, obj1, obj2, **hints):
-        if obj1._meta.app_label == 'proxy' or \
-           obj2._meta.app_label == 'proxy':
-            return True
-        return None
-
-    def allow_migrate(self, db, model):
-        if db == 'trac':
-            return model._meta.app_label == 'proxy'
-        elif model._meta.app_label == 'proxy':
-            False
-        return None
@@ -1,155 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import string
-
-from django.template import loader, Context
-from haystack import indexes
-from haystack.utils import log as logging
-
-from colab.search.base_indexes import BaseIndex
-from .models import Attachment, Ticket, Wiki, Revision
-
-
-logger = logging.getLogger('haystack')
-
-# the string maketrans always return a string encoded with latin1
-# http://stackoverflow.com/questions/1324067/how-do-i-get-str-translate-to-work-with-unicode-strings # noqa
-table = string.maketrans(
-    string.punctuation,
-    '.' * len(string.punctuation)
-).decode('latin1')
-
-
-class AttachmentIndex(BaseIndex, indexes.Indexable):
-    title = indexes.CharField(model_attr='filename')
-    description = indexes.CharField(model_attr='description', null=True)
-    modified = indexes.DateTimeField(model_attr='created', null=True)
-    used_by = indexes.CharField(model_attr='used_by', null=True, stored=False)
-    mimetype = indexes.CharField(
-        model_attr='mimetype',
-        null=True,
-        stored=False
-    )
-    size = indexes.IntegerField(model_attr='size', null=True, stored=False)
-    filename = indexes.CharField(stored=False)
-
-    def get_model(self):
-        return Attachment
-
-    def get_updated_field(self):
-        return 'created'
-
-    def prepare(self, obj):
-        data = super(AttachmentIndex, self).prepare(obj)
-
-        try:
-            file_obj = open(obj.filepath)
-        except IOError as e:
-            logger.warning(u'IOError: %s - %s', e.strerror, e.filename)
-            return data
-        backend = self._get_backend(None)
-
-        extracted_data = backend.extract_file_contents(file_obj)
-        file_obj.close()
-
-        if not extracted_data:
-            return data
-
-        t = loader.select_template(
-            ('search/indexes/proxy/attachment_text.txt', )
-        )
-        data['text'] = t.render(Context({
-            'object': obj,
-            'extracted': extracted_data,
-        }))
-        return data
-
-    def prepare_filename(self, obj):
-        return obj.filename.translate(table).replace('.', ' ')
-
-    def prepare_icon_name(self, obj):
-        return u'file'
-
-    def prepare_type(self, obj):
-        return u'attachment'
-
-
-class WikiIndex(BaseIndex, indexes.Indexable):
-    title = indexes.CharField(model_attr='name')
-    collaborators = indexes.CharField(
-        model_attr='collaborators',
-        null=True,
-        stored=False,
-    )
-
-    def get_model(self):
-        return Wiki
-
-    def prepare_description(self, obj):
-        return u'{}\n{}'.format(obj.wiki_text, obj.collaborators)
-
-    def prepare_icon_name(self, obj):
-        return u'book'
-
-    def prepare_type(self, obj):
-        return u'wiki'
-
-
-class TicketIndex(BaseIndex, indexes.Indexable):
-    tag = indexes.CharField(model_attr='status', null=True)
-    milestone = indexes.CharField(model_attr='milestone', null=True)
-    component = indexes.CharField(model_attr='component', null=True)
-    severity = indexes.CharField(model_attr='severity', null=True)
-    reporter = indexes.CharField(model_attr='reporter', null=True)
-    keywords = indexes.CharField(model_attr='keywords', null=True)
-    collaborators = indexes.CharField(
-        model_attr='collaborators',
-        null=True,
-        stored=False,
-    )
-
-    def get_model(self):
-        return Ticket
-
-    def prepare_description(self, obj):
-        return u'{}\n{}\n{}\n{}\n{}\n{}\n{}'.format(
-            obj.description, obj.milestone, obj.component, obj.severity,
-            obj.reporter, obj.keywords, obj.collaborators
-        )
-
-    def prepare_icon_name(self, obj):
-        return u'tag'
-
-    def prepare_title(self, obj):
-        return u'#{} - {}'.format(obj.pk, obj.summary)
-
-    def prepare_type(self, obj):
-        return 'ticket'
-
-
-class RevisionIndex(BaseIndex, indexes.Indexable):
-    description = indexes.CharField(model_attr='message', null=True)
-    modified = indexes.DateTimeField(model_attr='created', null=True)
-    repository_name = indexes.CharField(
-        model_attr='repository_name',
-        stored=False
-    )
-
-    def get_model(self):
-        return Revision
-
-    def get_updated_field(self):
-        return 'created'
-
-    def get_boost(self, obj):
-        boost = super(RevisionIndex, self).get_boost(obj)
-        return boost * 0.8
-
-    def prepare_icon_name(self, obj):
-        return u'align-right'
-
-    def prepare_title(self, obj):
-        return u'{} [{}]'.format(obj.repository_name, obj.rev)
-
-    def prepare_type(self, obj):
-        return 'changeset'
@@ -1,33 +0,0 @@
-
-from django.db import connections
-from django.dispatch import receiver
-from django.db.models.signals import post_save
-
-from colab.accounts.models import User
-
-
-@receiver(post_save, sender=User)
-def change_session_attribute_email(sender, instance, **kwargs):
-    cursor = connections['trac'].cursor()
-
-    cursor.execute(("UPDATE session_attribute SET value=%s "
-                    "WHERE name='email' AND sid=%s"),
-                   [instance.email, instance.username])
-    cursor.execute(("UPDATE session_attribute SET value=%s "
-                    "WHERE name='name' AND sid=%s"),
-                   [instance.get_full_name(), instance.username])
-
-    cursor.execute(("INSERT INTO session_attribute "
-                    "(sid, authenticated,  name, value) "
-                    "SELECT %s, '1', 'email', %s WHERE NOT EXISTS "
-                    "(SELECT 1 FROM session_attribute WHERE sid=%s "
-                    "AND name='email')"),
-                   [instance.username, instance.email, instance.username])
-
-    cursor.execute(("INSERT INTO session_attribute "
-                    "(sid, authenticated, name, value) "
-                    "SELECT %s, '1', 'name', %s WHERE NOT EXISTS "
-                    "(SELECT 1 FROM session_attribute WHERE sid=%s "
-                    "AND name='name')"),
-                   [instance.username, instance.get_full_name(),
-                    instance.username])
@@ -1,7 +0,0 @@
-{% extends "base.html" %}
-
-{% block head %}
-    <placeholder id="trac-css"/>
-    <placeholder id="trac-js"/>
-    {{ block.super }}
-{% endblock %}
@@ -1,15 +0,0 @@
-{{ object.filename }}
-{{ object.filename|slugify }}
-{{ object.description }}
-{{ object.description|slugify }}
-{{ object.used_by }}
-{{ object.mimetype }}
-{{ object.get_author.get_full_name }}
-
-{% for k, v in extracted.metadata.items %}
-  {% for val in v %}
-    {{ k }}: {{ val|safe }}
-  {% endfor %}
-{% endfor %}
-
-{{ extracted.contents|striptags|safe }}
@@ -1,8 +0,0 @@
-{{ object.repository_name }}
-{{ object.repository_name|slugify }}
-{{ object.rev }}
-{{ object.rev|slugify }}
-{% firstof object.get_author.get_full_name object.author %}
-{% firstof object.get_author.get_full_name|slugify object.author|slugify %}
-{{ object.message }}
-{{ object.message|slugify }}
@@ -1,20 +0,0 @@
-{{ object.summary }}
-{{ object.summary|slugify }}
-{{ object.description }}
-{{ object.description|slugify }}
-{{ object.milestone }}
-{{ object.milestone|slugify }}
-{{ object.component|slugify }}
-{{ object.version }}
-{{ object.severity }}
-{{ object.severity|slugify }}
-{{ object.reporter }}
-{{ object.reporter|slugify }}
-{% firstof object.get_author.get_fullname or object.author %}
-{% firstof object.get_author.get_fullname|slugify or object.author|slugify %}
-{{ object.status }}
-{{ object.status|slugify }}
-{{ object.keywords }}
-{{ object.keywords|slugify }}
-{{ object.collaborators }}
-{{ object.collaborators|slugify }}
@@ -1,9 +0,0 @@
-{{ object.author }}
-{{ object.get_author.get_full_name }}
-{{ object.get_author.get_full_name|slugify }}
-{{ object.name }}
-{{ object.name|slugify }}
-{{ object.collaborators }}
-{{ object.collaborators|slugify }}
-{{ object.wiki_text }}
-{{ object.wiki_text|slugify }}
@@ -1,10 +0,0 @@
-
-from django.conf.urls import patterns, url
-
-from .views import TracProxyView
-
-
-urlpatterns = patterns('',
-    # Trac
-    url(r'^(?P<path>.*)$', TracProxyView.as_view(), name='trac'),
-)
@@ -1,40 +0,0 @@
-
-from hitcounter.views import HitCounterViewMixin
-
-from ..utils.views import ColabProxyView
-from .models import Wiki, Ticket, Revision
-
-
-class TracProxyView(HitCounterViewMixin, ColabProxyView):
-    app_label = 'trac'
-    diazo_theme_template = 'proxy/trac.html'
-
-    def get_object(self):
-        obj = None
-
-        if self.request.path_info.startswith('/wiki'):
-            wiki_name = self.request.path_info.split('/', 2)[-1]
-            if not wiki_name:
-                wiki_name = 'WikiStart'
-            try:
-                obj = Wiki.objects.get(name=wiki_name)
-            except Wiki.DoesNotExist:
-                return None
-        elif self.request.path_info.startswith('/ticket'):
-            ticket_id = self.request.path_info.split('/')[2]
-            try:
-                obj = Ticket.objects.get(id=ticket_id)
-            except (Ticket.DoesNotExist, ValueError):
-                return None
-        elif self.request.path_info.startswith('/changeset'):
-            try:
-                changeset, repo = self.request.path_info.split('/')[2:4]
-            except ValueError:
-                return None
-            try:
-                obj = Revision.objects.get(rev=changeset,
-                                           repository_name=repo)
-            except Revision.DoesNotExist:
-                return None
-
-        return obj
@@ -44,8 +44,6 @@ INSTALLED_APPS = (
     # Not standard apps
     'cliauth',
     'django_mobile',
-    'django_browserid',
-    'conversejs',
     'haystack',
     'hitcounter',
     'i18n_model',
@@ -58,7 +56,6 @@ INSTALLED_APPS = (
     'colab.api',
     'colab.rss',
     'colab.search',
-    'colab.badger',
     'colab.tz',
 )
@@ -198,7 +195,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'colab.home.context_processors.robots',
     'colab.home.context_processors.ribbon',
     'colab.home.context_processors.google_analytics',
-    'colab.home.context_processors.browserid_enabled',
 )
 MIDDLEWARE_CLASSES = (
@@ -213,13 +209,10 @@ MIDDLEWARE_CLASSES = (
     'django_mobile.middleware.MobileDetectionMiddleware',
     'django_mobile.middleware.SetFlavourMiddleware',
     'colab.tz.middleware.TimezoneMiddleware',
-    'colab.accounts.middleware.UserRegisterMiddleware',
 )
-# Add the django_browserid authentication backend.
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
-    'colab.accounts.auth.ColabBrowserIDBackend',
 )
 LOCALE_PATHS = (
@@ -247,27 +240,13 @@ SUPER_ARCHIVES_LOCK_FILE = &#39;/var/lock/colab/import_emails.lock&#39;
 # Mailman API settings
 MAILMAN_API_URL = 'http://localhost:8124'
-# BrowserID / Persona
-SITE_URL = 'http://localhost:8000'
-BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
-
-
 LOGIN_URL = '/user/login'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/?bid_login_failed=true'
 LOGOUT_REDIRECT_URL = '/'
-BROWSERID_CREATE_USER = True
 REVPROXY_ADD_REMOTE_USER = True
-# Converse.js settings
-# This URL must use SSL in order to keep chat sessions secure
-CONVERSEJS_ENABLED = False
-CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
-
-CONVERSEJS_ALLOW_CONTACT_REQUESTS = False
-CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
-
 # Tastypie settings
 TASTYPIE_DEFAULT_FORMATS = ['json', ]
@@ -279,7 +258,6 @@ if locals().get(&#39;RAVEN_DSN&#39;, False):
     }
     INSTALLED_APPS += ('raven.contrib.django.raven_compat',)
-BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
 locals().update(load_colab_apps())
 <!DOCTYPE html>
-{% load i18n browserid conversejs gravatar %}
+{% load i18n gravatar plugins %}
 {% load static from staticfiles %}
 <html>
@@ -43,10 +43,6 @@
     {% block head_js %}{% endblock %}
     {% block head_css %}{% endblock %}
-    {% if not is_mobile %}
-      {% conversejs_static %}
-    {% endif %}
-
     <link rel="stylesheet" href="{% static 'css/screen.css' %}"
         type="text/css" media="screen" />
@@ -54,10 +50,7 @@
   </head>
   <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
-  <body data-no-turbolink>
-    {% if BROWSERID_ENABLED %}
-      {% browserid_info %}
-    {% endif %}
+  <body class="container" data-no-turbolink>
     {% block ribbon %}
     {% if ribbon %}
@@ -70,8 +63,82 @@
     {% endblock %}
     {% block navbar %}
-
-      {% include "header.html" %}
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
+        </div>
+        <div class="collapse navbar-collapse navbar-main">
+          <ul class="nav navbar-nav">
+
+            <li>
+              <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
+            </li>
+
+            {% plugins_menu %}
+
+            <li class="hidden-lg hidden-md">
+              <a href="{% url 'haystack_search' %}?q=">{% trans "Search" %}</a>
+            </li>
+          </ul>
+
+          <ul class="nav navbar-nav navbar-right">
+            {% if not user.is_authenticated %}
+
+              <li class="dropdown hidden-xs hidden-lg">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
+                <ul class="dropdown-menu">
+                  {% trans 'Login' as login_text %}
+                  <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                  <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+                </ul>
+              </li>
+              {% trans 'Login' as login_text %}
+                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+            {% else %}
+              <li id="user-menu" class="dropdown">
+                <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
+                <ul class="dropdown-menu" role="menu">
+                  <li>
+                    <div class="wrapper">
+                      <div class="thumbnail">{% gravatar user.email 100 %}</div>
+                      <div class="user-info">
+                        <span><b>{{ user.get_full_name }}</b></span>
+                        <span class="quiet">{{ user.email }}</span>
+                      </div>
+                      <div>
+                        <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
+                        {% trans 'Logout' as logout_text %}
+                        <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </li>
+            {% endif %}
+          </ul>
+
+          <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form navbar-right hidden-xs hidden-sm" role="search">
+            <div class="form-group">
+              <label class="sr-only" for="header-searchbox">{% trans 'Search here...' %}</label>
+              <input name="q" id="header-searchbox"
+                     class="form-control" value="{{ request.GET.q }}"
+                     type="search" placeholder="{% trans 'Search here...' %}" />
+            </div>
+            <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
+          </form>
+        </div>
+      </div>
+    </nav>
     {% endblock %}
@@ -107,19 +174,8 @@
     {% endblock %}
-  {% if not is_mobile %}
-    {% conversejs_chatpanel %}
-    {% conversejs_initialize %}
-  {% endif %}
-
   {% include "tz/set_utc_offset.html" %}
-  {% if BROWSERID_ENABLED %}
-    <script src="https://login.persona.org/include.js"></script>
-    <script src="{% static 'browserid/api.js' %}"></script>
-    <script src="{% static 'browserid/browserid.js' %}"></script>
-  {% endif %}
-
   {% block footer_js %}{% endblock %}
   </body>
 </html>
-{% load i18n browserid conversejs gravatar %}
+{% load i18n gravatar plugins %}
 {% load static from staticfiles %}
 <div class="footer row">
-{% load i18n browserid conversejs gravatar plugins %}
+{% load i18n gravatar plugins %}
 {% load static from staticfiles %}
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
@@ -21,12 +21,6 @@
           <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
         </li>
-        {% if feedzilla %}
-        <li>
-          <a href="{% url "feedzilla_index" %}">{% trans "Blogs" %}</a>
-        </li>
-        {% endif %}
-
         {% plugins_menu %}
         <li><a href="/paste">{% trans "Paste" %}</a></li>
@@ -30,16 +30,12 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^myaccount/(?P<route>.*)$',
         'colab.accounts.views.myaccount_redirect', name='myaccount'),
-    url(r'', include('django_browserid.urls')),
-
     # Uncomment the next line to enable the admin:
     url(r'^colab/admin/', include(admin.site.urls)),
-    url(r'^trac/', include('colab.plugins.trac.urls')),
     url(r'^gitlab/', include('colab.plugins.gitlab.urls')),
     url(r'^mezuro/', include('colab.plugins.mezuro.urls')),
     url(r'^social/', include('colab.plugins.noosfero.urls')),
-    url(r'^ci/', include('colab.plugins.jenkins.urls')),
     url(r'', include('colab.plugins.urls')),
 )
@@ -139,31 +139,6 @@ Social Networks
    When this variable is True, the social networks fields, like Facebook and
    Twitter, are added in user profile. By default, this fields are disabled.
-Auth
-++++
-.. attribute:: BROWSERID_ENABLED
-
-   :default: False
-
-   When this variable is True, Colab use BrowserID authentication. By default,
-   django authentication system is used.
-
-.. attribute:: BROWSERID_AUDIENCES
-
-   :default: No default
-
-   List of audiences that your site accepts. An audience is the protocol,
-   domain name, and (optionally) port that users access your site from. This
-   list is used to determine the audience a user is part of (how they are
-   accessing your site), which is used during verification to ensure that the
-   assertion given to you by the user was intended for your site.
-
-   Without this, other sites that the user has authenticated with via Persona
-   could use their assertions to impersonate the user on your site.
-
-   Note that this does not have to be a publicly accessible URL, so local URLs
-   like ``http://localhost:8000`` or ``http://127.0.0.1`` are acceptable as
-   long as they match what you are using to access your site.
 Customization
 -------------
@@ -29,20 +29,8 @@ REQUIREMENTS = [
     'raven==3.5.2',
     'tornado==3.1.1',
-    # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
-    'django-browserid==0.11',
     'django-revproxy==0.9.3',
-    # Converse.js (XMPP client)
-    'django-conversejs==0.3.4',
-
-    # Feedzilla (planet) and deps
-    'django-common==0.1.51',
-    'feedparser==5.1.3',
-    'lxml==3.2.4',
-    'grab==0.4.13',
-    'transliterate==1.5',
-
     # Diazo
     'diazo==1.0.5',
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-
2	-from django_browserid.auth import BrowserIDBackend
3	-
4	-
5	-class ColabBrowserIDBackend(BrowserIDBackend):
6	- def filter_users_by_email(self, email):
7	- return self.User.objects.filter(emails__address=email)
	@@ -16,8 +16,6 @@ from django.utils.text import capfirst		@@ -16,8 +16,6 @@ from django.utils.text import capfirst
16	from django.utils.translation import ugettext_lazy as _	16	from django.utils.translation import ugettext_lazy as _
17	from django.utils.safestring import mark_safe	17	from django.utils.safestring import mark_safe
18		18
19	-from conversejs.models import XMPPAccount
20	-
21		19
22	from .utils.validators import validate_social_account	20	from .utils.validators import validate_social_account
23	from .utils import mailman	21	from .utils import mailman
	@@ -152,42 +150,6 @@ class ListsForm(forms.Form):		@@ -152,42 +150,6 @@ class ListsForm(forms.Form):
152	choices=LISTS_NAMES)	150	choices=LISTS_NAMES)
153		151
154		152
155	-class ChangeXMPPPasswordForm(forms.ModelForm):
156	- password1 = forms.CharField(label=_("Password"),
157	- widget=forms.PasswordInput)
158	- password2 = forms.CharField(label=_("Password confirmation"),
159	- widget=forms.PasswordInput,
160	- help_text=_(("Enter the same password as above"
161	- ", for verification.")))
162	-
163	- class Meta:
164	- model = XMPPAccount
165	- fields = ('password1', 'password2')
166	-
167	- def __init__(self, args, *kwargs):
168	- super(ChangeXMPPPasswordForm, self).__init__(args, *kwargs)
169	-
170	- for field_name, field in self.fields.items():
171	- # Adds form-control class to all form fields
172	- field.widget.attrs.update({'class': 'form-control'})
173	-
174	- def clean_password2(self):
175	- password1 = self.cleaned_data.get("password1")
176	- password2 = self.cleaned_data.get("password2")
177	- if password1 and password2 and password1 != password2:
178	- raise forms.ValidationError(
179	- _("Password mismatch"),
180	- code='password_mismatch',
181	- )
182	- return password2
183	-
184	- def save(self, commit=True):
185	- self.instance.password = self.cleaned_data['password2']
186	- if commit:
187	- self.instance.save()
188	- return self.instance
189	-
190	-
191	class UserCreationForm(UserForm):	153	class UserCreationForm(UserForm):
192	"""	154	"""
193	A form that creates a user, with no privileges, from the given username and	155	A form that creates a user, with no privileges, from the given username and
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-
2	-from django.shortcuts import redirect
3	-from django.conf import settings
4	-
5	-VIEW_NAMES_ALLOWED = ('signup', 'Logout')
6	-
7	-
8	-class UserRegisterMiddleware(object):
9	-
10	- def process_view(self, request, view_func, view_args, view_kwargs):
11	- if not settings.BROWSERID_ENABLED:
12	- return
13	-
14	- if request.is_ajax():
15	- return
16	-
17	- if not request.user.is_authenticated():
18	- return
19	-
20	- if not request.user.needs_update:
21	- return
22	-
23	- if view_func.__name__ not in VIEW_NAMES_ALLOWED:
24	- return redirect('signup')
	@@ -47,13 +47,6 @@ class User(AbstractUser):		@@ -47,13 +47,6 @@ class User(AbstractUser):
47		47
48	objects = ColabUserManager()	48	objects = ColabUserManager()
49		49
50	- def check_password(self, raw_password):
51	-
52	- if self.xmpp.exists() and raw_password == self.xmpp.first().password:
53	- return True
54	-
55	- return super(User, self).check_password(raw_password)
56	-
57	def get_absolute_url(self):	50	def get_absolute_url(self):
58	return reverse('user_profile', kwargs={'username': self.username})	51	return reverse('user_profile', kwargs={'username': self.username})
59		52
1	# -- coding: utf-8 --	1	# -- coding: utf-8 --
2		2
3	from haystack import indexes	3	from haystack import indexes
4	-# from django.db.models import Count
5	-
6	-from colab.badger.utils import get_users_counters
7	from .models import User	4	from .models import User
8		5
9		6
	@@ -26,30 +23,13 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):		@@ -26,30 +23,13 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
26	stored=False)	23	stored=False)
27	webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)	24	webpage = indexes.CharField(model_attr='webpage', null=True, stored=False)
28	message_count = indexes.IntegerField(stored=False)	25	message_count = indexes.IntegerField(stored=False)
29	- # changeset_count = indexes.IntegerField(stored=False)
30	- # ticket_count = indexes.IntegerField(stored=False)
31	- # wiki_count = indexes.IntegerField(stored=False)
32	- contribution_count = indexes.IntegerField(stored=False)
33		26
34	def get_model(self):	27	def get_model(self):
35	return User	28	return User
36		29
37	- @property
38	- def badge_counters(self):
39	- if not hasattr(self, '_badge_counters'):
40	- self._badge_counters = get_users_counters()
41	- return self._badge_counters
42	-
43	def prepare(self, obj):	30	def prepare(self, obj):
44	prepared_data = super(UserIndex, self).prepare(obj)	31	prepared_data = super(UserIndex, self).prepare(obj)
45		32
46	- prepared_data['contribution_count'] = sum((
47	- self.prepared_data['message_count'],
48	- # self.prepared_data['changeset_count'],
49	- # self.prepared_data['ticket_count'],
50	- # self.prepared_data['wiki_count']
51	- ))
52	-
53	return prepared_data	33	return prepared_data
54		34
55	def prepare_description(self, obj):	35	def prepare_description(self, obj):
	@@ -63,17 +43,5 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):		@@ -63,17 +43,5 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
63	def prepare_type(self, obj):	43	def prepare_type(self, obj):
64	return u'user'	44	return u'user'
65		45
66	- def prepare_message_count(self, obj):
67	- return self.badge_counters[obj.username]['messages']
68	-
69	- # def prepare_changeset_count(self, obj):
70	- # return self.badge_counters[obj.username]['revisions']
71	-
72	- # def prepare_ticket_count(self, obj):
73	- # return self.badge_counters[obj.username]['tickets']
74	-
75	- # def prepare_wiki_count(self, obj):
76	- # return self.badge_counters[obj.username]['wikis']
77	-
78	def index_queryset(self, using=None):	46	def index_queryset(self, using=None):
79	return self.get_model().objects.filter(is_active=True)	47	return self.get_model().objects.filter(is_active=True)
	@@ -1,21 +0,0 @@	@@ -1,21 +0,0 @@
1	-{% extends "base.html" %}
2	-{% load i18n %}
3	-
4	-{% block main-content %}
5	-<form method="POST" role="form">
6	- {% csrf_token %}
7	- <div class="row">
8	- <h2>{% trans "Change XMPP Client and SVN Password" %}</h2>
9	- <div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
10	- {% for field in form %}
11	- <div class="form-group required{% if field.errors %} alert alert-danger has-error{% endif %}">
12	- <label for="{{ field.name }}" class="control-label">{{ field.label }}</label>
13	- {{ field }}
14	- {{ field.errors }}
15	- </div>
16	- {% endfor %}
17	- <button class="btn btn-primary">{% trans "Change Password" %}</button>
18	- </div>
19	- </div>
20	-</form>
21	-{% endblock %}
	@@ -1,12 +0,0 @@	@@ -1,12 +0,0 @@
1	-{% extends 'base.html' %}
2	-{% load browserid i18n %}
3	-
4	-{% block main-content %}
5	- <br><br><br>
6	- <div class="col-lg-12 text-center">
7	- <p>{% trans 'To login please click in the link below:'%}</p>
8	- {% trans 'Login' as login_text %}
9	- {% browserid_login text=login_text link_class='btn btn-primary btn-lg' %}
10	- </div>
11	- <br><br><br>
12	-{% endblock %}
	@@ -178,40 +178,19 @@ $(function() {		@@ -178,40 +178,19 @@ $(function() {
178	</div>	178	</div>
179	</div>	179	</div>
180	</div>	180	</div>
181	- {% if not BROWSERID_ENABLED %}
182	- <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
183	- <div class="panel panel-default">
184	- <div class="panel-heading">
185	- <h3 class="panel-title">
186	- {% trans 'Change Password' %}
187	- </h3>
188	- </div>
189	- <div class="panel-body">
190	- <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
191	- </div>	181	+ <div class="col-lg-4 col-md-5 col-sm-12 col-xm-12">
		182	+ <div class="panel panel-default">
		183	+ <div class="panel-heading">
		184	+ <h3 class="panel-title">
		185	+ {% trans 'Change Password' %}
		186	+ </h3>
192	</div>	187	</div>
193	- </div>
194	- {% endif %}
195	- </div>
196	- {% if CONVERSEJS_ENABLED %}
197	- <div class="row">
198	- <div class="col-lg-12">
199	- <div class="panel panel-default">
200	- <div class="panel-heading">
201	- <h3 class="panel-title">
202	- {% trans 'Change Password' %}
203	- </h3>
204	- </div>
205	- <div class="panel-body">
206	- <div class="form-group">
207	- {% trans "This feature is available only for those who need to change the password for some reason as having an old user with the same username, forgot your password to commit, usage of other XMPP Client for connection. Usually, you won't need to change this password. Only change it if you are sure about what you are doing." %}	188	+ <div class="panel-body">
		189	+ <a href="{% url 'password_change' %}" class="btn btn-default btn-primary pull-right btn-block">{% trans "Change Password" %}</a>
208	</div>	190	</div>
209	- <a href="{% url 'change_password' %}" class="btn btn-default pull-right"><span class="icon-warning-sign"></span> {% trans "Change Password" %}</a>
210	</div>	191	</div>
211	</div>	192	</div>
212	- </div>
213	</div>	193	</div>
214	- {% endif %}
215	<div class="row">	194	<div class="row">
216	<div class="submit">	195	<div class="submit">
217	<button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>	196	<button type="submit" class="btn btn-primary btn-lg btn-block">{% trans "Update" %}</button>
	@@ -21,13 +21,6 @@ class TestSignUpView(TestCase):		@@ -21,13 +21,6 @@ class TestSignUpView(TestCase):
21	"usertest@colab.com.br", "123colab4")	21	"usertest@colab.com.br", "123colab4")
22	return user	22	return user
23		23
24	- def test_user_not_authenticated(self):
25	- with self.settings(BROWSERID_ENABLED=True):
26	- response = self.client.get("/account/register")
27	- self.assertEquals(302, response.status_code)
28	- url = "http://testserver/account/login"
29	- self.assertEquals(url, response.url)
30	-
31	def test_user_authenticated_and_unregistered(self):	24	def test_user_authenticated_and_unregistered(self):
32	self.client.login(username="usertestcolab", password="123colab4")	25	self.client.login(username="usertestcolab", password="123colab4")
33	response = self.client.get("/account/register/")	26	response = self.client.get("/account/register/")
	@@ -13,23 +13,16 @@ from django.core.exceptions import PermissionDenied		@@ -13,23 +13,16 @@ from django.core.exceptions import PermissionDenied
13	from django.views.generic import DetailView, UpdateView, TemplateView	13	from django.views.generic import DetailView, UpdateView, TemplateView
14	from django.http import Http404	14	from django.http import Http404
15		15
16	-from conversejs import xmpp
17	-from conversejs.models import XMPPAccount
18	-
19	from colab.super_archives.models import (EmailAddress,	16	from colab.super_archives.models import (EmailAddress,
20	EmailAddressValidation)	17	EmailAddressValidation)
21	from colab.search.utils import get_collaboration_data, get_visible_threads	18	from colab.search.utils import get_collaboration_data, get_visible_threads
22	from colab.accounts.models import User	19	from colab.accounts.models import User
23		20
24	from .forms import (UserCreationForm, UserForm, ListsForm,	21	from .forms import (UserCreationForm, UserForm, ListsForm,
25	- UserUpdateForm, ChangeXMPPPasswordForm)	22	+ UserUpdateForm)
26	from .utils import mailman	23	from .utils import mailman
27		24
28		25
29	-class LoginView(TemplateView):
30	- template_name = "accounts/login.html"
31	-
32	-
33	class UserProfileBaseMixin(object):	26	class UserProfileBaseMixin(object):
34	model = get_user_model()	27	model = get_user_model()
35	slug_field = 'username'	28	slug_field = 'username'
	@@ -52,11 +45,6 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):		@@ -52,11 +45,6 @@ class UserProfileUpdateView(UserProfileBaseMixin, UpdateView):
52		45
53	return obj	46	return obj
54		47
55	- def get_context_data(self, **kwargs):
56	- context = super(UserProfileUpdateView, self).get_context_data(**kwargs)
57	- context['CONVERSEJS_ENABLED'] = getattr(settings, 'CONVERSEJS_ENABLED')
58	- return context
59	-
60		48
61	class UserProfileDetailView(UserProfileBaseMixin, DetailView):	49	class UserProfileDetailView(UserProfileBaseMixin, DetailView):
62	template_name = 'accounts/user_detail.html'	50	template_name = 'accounts/user_detail.html'
	@@ -94,37 +82,19 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):		@@ -94,37 +82,19 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
94		82
95		83
96	def signup(request):	84	def signup(request):
97	- BROWSERID_ENABLED = getattr(settings, 'BROWSERID_ENABLED', False)
98	-
99	- if BROWSERID_ENABLED:
100	- # If the user is not authenticated, redirect to login
101	- if not request.user.is_authenticated():
102	- return redirect('login')
103		85
104	if request.user.is_authenticated():	86	if request.user.is_authenticated():
105	- # If the user doesn't need to update its main data,
106	- # redirect to its profile
107	- # It happens when user is created by browserid
108	- # and didn't set his/her main data
109	if not request.user.needs_update:	87	if not request.user.needs_update:
110	return redirect('user_profile', username=request.user.username)	88	return redirect('user_profile', username=request.user.username)
111		89
112	- # If the user is authenticated in Persona, but not in the Colab then he
113	- # will be redirected to the register form.
114	if request.method == 'GET':	90	if request.method == 'GET':
115	- if BROWSERID_ENABLED:
116	- user_form = UserForm()
117	- else:
118	- user_form = UserCreationForm()	91	+ user_form = UserCreationForm()
119	lists_form = ListsForm()	92	lists_form = ListsForm()
120		93
121	return render(request, 'accounts/user_create_form.html',	94	return render(request, 'accounts/user_create_form.html',
122	{'user_form': user_form, 'lists_form': lists_form})	95	{'user_form': user_form, 'lists_form': lists_form})
123		96
124	- if BROWSERID_ENABLED:
125	- user_form = UserForm(request.POST, instance=request.user)
126	- else:
127	- user_form = UserCreationForm(request.POST)	97	+ user_form = UserCreationForm(request.POST)
128	lists_form = ListsForm(request.POST)	98	lists_form = ListsForm(request.POST)
129		99
130	if not user_form.is_valid() or not lists_form.is_valid():	100	if not user_form.is_valid() or not lists_form.is_valid():
	@@ -134,12 +104,9 @@ def signup(request):		@@ -134,12 +104,9 @@ def signup(request):
134	user = user_form.save(commit=False)	104	user = user_form.save(commit=False)
135	user.needs_update = False	105	user.needs_update = False
136		106
137	- if not BROWSERID_ENABLED:
138	- user.is_active = False
139	- user.save()
140	- EmailAddressValidation.create(user.email, user)
141	- else:
142	- user.save()	107	+ user.is_active = False
		108	+ user.save()
		109	+ EmailAddressValidation.create(user.email, user)
143		110
144	# Check if the user's email have been used previously	111	# Check if the user's email have been used previously
145	# in the mainling lists to link the user to old messages	112	# in the mainling lists to link the user to old messages
	@@ -208,50 +175,6 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):		@@ -208,50 +175,6 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView):
208	self).get_context_data(**context)	175	self).get_context_data(**context)
209		176
210		177
211	-class ChangeXMPPPasswordView(UpdateView):
212	- model = XMPPAccount
213	- form_class = ChangeXMPPPasswordForm
214	- fields = ['password', ]
215	- template_name = 'accounts/change_password.html'
216	-
217	- def get_success_url(self):
218	- return reverse('user_profile', kwargs={
219	- 'username': self.request.user.username
220	- })
221	-
222	- def get_object(self, queryset=None):
223	- obj = get_object_or_404(XMPPAccount, user=self.request.user.pk)
224	- self.old_password = obj.password
225	- return obj
226	-
227	- def form_valid(self, form):
228	- transaction.set_autocommit(False)
229	-
230	- response = super(ChangeXMPPPasswordView, self).form_valid(form)
231	-
232	- changed = xmpp.change_password(
233	- self.object.jid,
234	- self.old_password,
235	- form.cleaned_data['password1']
236	- )
237	-
238	- if not changed:
239	- messages.error(
240	- self.request,
241	- _(u'Could not change your password. Please, try again later.')
242	- )
243	- transaction.rollback()
244	- return response
245	- else:
246	- transaction.commit()
247	-
248	- messages.success(
249	- self.request,
250	- _("You've changed your password successfully!")
251	- )
252	- return response
253	-
254	-
255	def password_changed(request):	178	def password_changed(request):
256	messages.success(request, _('Your password was changed.'))	179	messages.success(request, _('Your password was changed.'))
257		180