pferreir

diff --git a/indico/MaKaC/user.py b/indico/MaKaC/user.py
index a234469..82f7cb5 100644
--- a/indico/MaKaC/user.py
+++ b/indico/MaKaC/user.py
@@ -402,30 +402,15 @@ class Avatar(Persistent, Fossilizable):
             if 'title' in userData:
                 self.setTitle(userData["title"])
             if 'organisation' in userData:
-                if len(userData["organisation"])>0:
-                    for org in userData["organisation"]:

pferreir

from functools import wraps
from distutils.dist import Distribution
from pkgutil import walk_packages

from flask_script import Manager, Command, Option
from babel.messages import frontend


DEFAULT_OPTIONS = {
  # Default options for babel i18n

pferreir

--- /usr/bin/ai-dump	2014-09-09 15:22:08.000000000 +0200
+++ ai-dump	2014-10-16 14:29:53.000000001 +0200
@@ -46,17 +46,15 @@
 
     url = roger.state_url(host)
     try:
-        answer = roger.open_url(url)
+        return roger.open_url(url)
     except urllib2.HTTPError, e:
         if e.code == 401:

pferreir

diff --git a/code/manifests/base/webserver.pp b/code/manifests/base/webserver.pp
index 4083752..c9b8aa9 100644
--- a/code/manifests/base/webserver.pp
+++ b/code/manifests/base/webserver.pp
@@ -90,7 +90,7 @@ class hg_indico::base::webserver inherits hg_indico::base::params {
   }
 
   $wsgi_daemon_options = {
-    processes          => 35,
+    processes          => hiera('wsgi_daemon_processes', 35),

pferreir

$ git clone https://github.com/indico/indico.git
$ cd indico
$ git checkout v1.2
$ python setup.py install
$ indico_initial_setup --existing-config=/opt/indico/etc/indico.conf

pferreir

(function(global) {
    "use strict";

    var default_i18n = new Jed({
        locale_data: TRANSLATIONS,
        domain: "indico"
    });

    global.i18n = default_i18n;
    global.$T = _.bind(default_i18n.gettext, default_i18n);

pferreir

diff --git a/indico/MaKaC/common/cache.py b/indico/MaKaC/common/cache.py
index dfce4ff..d4203f8 100644
--- a/indico/MaKaC/common/cache.py
+++ b/indico/MaKaC/common/cache.py
@@ -471,13 +471,28 @@ class FileCacheClient(CacheClient):
 
 
 class GenericCache(object):
-    def __init__(self, namespace):
+    def __init__(self, namespace, force_backend=None):

pferreir

diff --git a/indico/web/forms/widgets.py b/indico/web/forms/widgets.py
index 8c40bf3..fa7a5a0 100644
--- a/indico/web/forms/widgets.py
+++ b/indico/web/forms/widgets.py
@@ -16,6 +16,7 @@
 
 from flask import render_template
 from wtforms.widgets.core import HTMLString, PasswordInput
+from wtforms.validators import Length
 

pferreir

diff --git a/indico/modules/vc/controllers.py b/indico/modules/vc/controllers.py
index c0ee5cc..44eee64 100644
--- a/indico/modules/vc/controllers.py
+++ b/indico/modules/vc/controllers.py
@@ -28,6 +28,7 @@ from indico.modules.vc.views import WPVCManageEvent
 from indico.util.date_time import now_utc
 from indico.util.i18n import _
 from indico.web.flask.util import url_for
+
 from MaKaC.webinterface.rh.conferenceModif import RHConferenceModifBase

pferreir

diff --git a/vc_dummy/indico_vc_dummy/plugin.py b/vc_dummy/indico_vc_dummy/plugin.py
index 1b90df9..f6326b5 100644
--- a/vc_dummy/indico_vc_dummy/plugin.py
+++ b/vc_dummy/indico_vc_dummy/plugin.py
@@ -16,8 +16,19 @@
 
 from __future__ import unicode_literals
 
+from wtforms.fields.core import BooleanField
+