decidim 0.2.0 → 0.3.0

data/decidim-surveys/spec/shared/export_survey_user_answers_examples.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+RSpec.shared_examples "export survey user answers" do
+  let!(:survey_questions) { create_list :survey_question, 3, survey: survey }
+  let!(:survey_answers) do
+    survey_questions.map do |question|
+      create_list :survey_answer, 3, survey: survey, question: question
+    end.flatten
+  end
+
+  around do |example|
+    perform_enqueued_jobs do
+      example.run
+    end
+  end
+
+  it "exports a CSV" do
+    visit_feature_admin
+
+    find(".exports.dropdown").click
+    click_link "CSV"
+
+    within ".callout.success" do
+      expect(page).to have_content("in progress")
+    end
+
+    expect(last_email.subject).to include("survey_user_answers", "csv")
+    expect(last_email.attachments.length).to be_positive
+    expect(last_email.attachments.first.filename).to match(/^survey_user_answers.*\.zip$/)
+  end
+
+  it "exports a JSON" do
+    visit_feature_admin
+
+    find(".exports.dropdown").click
+    click_link "JSON"
+
+    within ".callout.success" do
+      expect(page).to have_content("in progress")
+    end
+
+    expect(last_email.subject).to include("survey_user_answers", "json")
+    expect(last_email.attachments.length).to be_positive
+    expect(last_email.attachments.first.filename).to match(/^survey_user_answers.*\.zip$/)
+  end
+end

data/decidim-surveys/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+require "decidim/dev/test/base_spec_helper"

data/decidim-system/app/controllers/decidim/system/devise/passwords_controller.rb

@@ -6,6 +6,8 @@ module Decidim
       # Custom Passwords controller for Devise in order to use a custom layout
       # and views.
       class PasswordsController < ::Devise::PasswordsController
+        helper Decidim::DecidimFormHelper
+
         layout "decidim/system/login"
       end
     end

data/decidim-system/app/helpers/decidim/system/menu_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module Decidim

data/decidim-system/bin/rails

@@ -4,11 +4,11 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
-ENGINE_ROOT = File.expand_path("../..", __FILE__)
-ENGINE_PATH = File.expand_path("../../lib/decidim/system/engine", __FILE__)
+ENGINE_ROOT = File.expand_path("..", __dir__)
+ENGINE_PATH = File.expand_path("../lib/decidim/system/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
 require "rails/all"

data/decidim-system/config/locales/it.yml

@@ -0,0 +1,66 @@
+it:
+  decidim:
+    system:
+      actions:
+        confirm_destroy: Sei sicuro di voler cancellare?
+        destroy: Elimina
+        edit: Modifica
+        new: Nuovo
+        save: Salva
+        title: Azioni
+      admins:
+        create:
+          error: C'è stato un errore durante la creazione del nuovo utente con profilo Admin.
+          success: L'utente Admin è stato creato.
+        destroy:
+          success: L'utente Admin è stato eliminato
+        edit:
+          title: Modifica Admin
+          update: Aggiorna
+        index:
+          title: Amministratori
+        new:
+          create: Crea
+          title: Nuovo Amministratore
+        update:
+          error: E' successo un errore durante la modifica di questo utente Admin.
+          success: Admin modificato con successo
+      default_pages:
+        placeholders:
+          content: Possibilmente aggiungi dei contenuto  significativo a questa pagina sul cruscotto Admin.
+          title: Titolo predefinito per %{page}
+      menu:
+        admins: Amministratori
+        dashboard: Cruscotto
+        organizations: Organizzazioni
+      models:
+        admin:
+          fields:
+            created_at: Data/ora di creazione
+          validations:
+            email_uniqueness: Esiste già un utente Admin con l'email che hai indicato.
+        organization:
+          actions:
+            save_and_invite: Crea una nuova organizzazione e invita un utente Admin
+          fields:
+            created_at: Data/ora di creazione
+            name: Nome
+          name: Organizzazione
+        page:
+          name: Pagina
+      organizations:
+        create:
+          error: C'è stato un errore durante la creazione di una nuova organizzazione.
+          success: OK, è stata aggiunta la nuova organizzazione.
+        edit:
+          secondary_hosts_hint: Inserisci ciascun elemento in una nuova linea
+        index:
+          title: Organizzazioni
+        new:
+          secondary_hosts_hint: Inserisci ciascun elemento in una nuova linea
+          title: Nuova Organizzazione
+        update:
+          error: C'è stato un errore durante l'aggiornamento di questa organizzazione.
+          success: OK, l'Organizzazione è stata aggiornata.
+      titles:
+        dashboard: Cruscotto

data/decidim-system/db/migrate/20160919105637_devise_create_decidim_admins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DeviseCreateDecidimAdmins < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_system_admins do |t|

data/decidim-system/decidim-system.gemspec

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require_relative "../decidim-core/lib/decidim/core/version"

data/decidim-system/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
+
 require "decidim/dev/test/base_spec_helper"
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{__dir__}/support/**/*.rb"].each { |f| require f }

data/decidim.gemspec

@@ -1,7 +1,9 @@
-# coding: utf-8
 # frozen_string_literal: true
-lib = File.expand_path("../lib", __FILE__)
+
+lib = File.expand_path("lib", __dir__)
+
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require_relative "decidim-core/lib/decidim/core/version"
 
 Gem::Specification.new do |spec|
@@ -27,8 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "decidim-proposals", Decidim.version
   spec.add_dependency "decidim-results", Decidim.version
   spec.add_dependency "decidim-budgets", Decidim.version
-  spec.add_dependency "rails", Decidim.rails_version
-  spec.add_dependency "rails-i18n", Decidim.rails_version
+  spec.add_dependency "decidim-surveys", Decidim.version
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 12.0.0"

data/docs/geocoding.md

@@ -10,8 +10,8 @@ After generating your app, you'll see that your `config/initializers/decidim.rb`
 # Geocoder configuration
 # config.geocoder = {
 #   static_map_url: "https://image.maps.cit.api.here.com/mia/1.6/mapview",
-#   here_app_id: Rails.application.secrets.geocoder["here_app_id"],
-#   here_app_code: Rails.application.secrets.geocoder["here_app_code"]
+#   here_app_id: Rails.application.secrets.geocoder[:here_app_id],
+#   here_app_code: Rails.application.secrets.geocoder[:here_app_code]
 # }
 ```
 

data/docs/how_to_create_a_plugin.md

@@ -12,7 +12,7 @@
 
     ```ruby
     # frozen_string_literal: true
-    $LOAD_PATH.push File.expand_path("../lib", __FILE__)
+    $LOAD_PATH.push File.expand_path("lib", __dir__)
 
     require_relative "../decidim-core/lib/decidim/core/version"
 
@@ -40,11 +40,11 @@
     # This command will automatically be run when you run "rails" with Rails gems
     # installed from the root of your application.
 
-    ENGINE_ROOT = File.expand_path("../..", __FILE__)
-    ENGINE_PATH = File.expand_path("../../lib/decidim/<engine_name>/engine", __FILE__)
+    ENGINE_ROOT = File.expand_path("..", __dir__)
+    ENGINE_PATH = File.expand_path("..lib/decidim/<engine_name>/engine", __dir__)
 
     # Set up gems listed in the Gemfile.
-    ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+    ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
     require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
 
     require "rails/all"
@@ -56,6 +56,7 @@
     ```ruby
     # frozen_string_literal: true
     require "decidim/<engine_name>/engine"
+    require "decidim/<engine_name>/feature"
     ```
 
 1. Remove `lib/decidim/<engine_name>/version.rb`
@@ -92,7 +93,6 @@
 
     Decidim.register_feature(:<engine_name>) do |feature|
       feature.engine = Decidim::<EngineName>::Engine
-      feature.admin_engine = Decidim::<EngineName>::AdminEngine
       feature.icon = "decidim/<engine_name>/icon.svg"
 
       feature.on(:before_destroy) do |instance|
@@ -112,11 +112,11 @@
         # Add your settings per step
       end
 
-      feature.register_resource do |resource|
-        # Register a optional resource that can be references from other resources.
-        # resource.model_class_name = "Decidim::<EngineName>::<ResourceName>"
-        # resource.template = "decidim/<engine_name>/<resource_view_folder>/linked_<resource_name_plural>"
-      end
+      # # Register an optional resource that can be referenced from other resources.
+      # feature.register_resource do |resource|
+      #   resource.model_class_name = "Decidim::<EngineName>::<ResourceName>"
+      #   resource.template = "decidim/<engine_name>/<resource_view_folder>/linked_<resource_name_plural>"
+      # end
 
       feature.register_stat :some_stat do |features, start_at, end_at|
         # Register some stat number to the application
@@ -141,7 +141,7 @@
 
     ```ruby
     # frozen_string_literal: true
-    ENV["ENGINE_NAME"] = File.dirname(File.dirname(__FILE__)).split("/").last
+    ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
     require "decidim/test/base_spec_helper"
     ```
 

data/lib/decidim.rb

@@ -10,6 +10,7 @@ require "decidim/meetings"
 require "decidim/proposals"
 require "decidim/results"
 require "decidim/budgets"
+require "decidim/surveys"
 
 # Module declaration.
 module Decidim

data/lib/generators/decidim/app_generator.rb

@@ -16,11 +16,11 @@ module Decidim
     class AppGenerator < Rails::Generators::AppGenerator
       hide!
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       def source_paths
         [
-          File.expand_path("../templates", __FILE__),
+          File.expand_path("templates", __dir__),
           File.expand_path(File.join(Gem::Specification
                                                   .find_by_name("railties").gem_dir,
                                      "lib", "rails", "generators", "rails",
@@ -111,6 +111,7 @@ module Decidim
 
       private
 
+      # rubocop:disable Style/AccessorMethodName
       def get_builder_class
         AppBuilder
       end

data/lib/generators/decidim/demo_generator.rb

@@ -12,7 +12,7 @@ module Decidim
     class DemoGenerator < Rails::Generators::Base
       def source_paths
         [
-          File.expand_path("../../../../decidim-dev/lib/decidim/dev", __FILE__)
+          File.expand_path("../../../decidim-dev/lib/decidim/dev", __dir__)
         ]
       end
 

data/lib/generators/decidim/docker_generator.rb

@@ -12,11 +12,11 @@ module Decidim
       class_option :path, type: :string,
                           desc: "The path to generate the docker app"
 
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       def source_paths
         [
-          File.expand_path("../templates", __FILE__)
+          File.expand_path("templates", __dir__)
         ]
       end
 

data/lib/generators/decidim/install_generator.rb

@@ -12,14 +12,14 @@ module Decidim
     # definition order of the public methods.
     class InstallGenerator < Rails::Generators::Base
       desc "Install decidim"
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       class_option :app_name, type: :string, default: nil,
                               desc: "The name of the app"
       class_option :migrate, type: :boolean, default: false,
                              desc: "Run migrations after installing decidim"
       class_option :recreate_db, type: :boolean, default: false,
-                                 desc: "Run migrations after installing decidim"
+                                 desc: "Recreate db after installing decidim"
 
       def install
         route "mount Decidim::Core::Engine => '/'"
@@ -106,10 +106,7 @@ module Decidim
       private
 
       def recreate_db
-        unless ENV["CI"]
-          rake "db:environment:set", env: "development"
-          rake "db:drop"
-        end
+        rake "db:environment:set db:drop" unless ENV["CI"]
         rake "db:create"
         rake "db:migrate"
         rake "db:test:prepare"

data/lib/generators/decidim/templates/initializer.rb

@@ -12,8 +12,8 @@ Decidim.configure do |config|
   # Geocoder configuration
   # config.geocoder = {
   #   static_map_url: "https://image.maps.cit.api.here.com/mia/1.6/mapview",
-  #   here_app_id: Rails.application.secrets.geocoder["here_app_id"],
-  #   here_app_code: Rails.application.secrets.geocoder["here_app_code"]
+  #   here_app_id: Rails.application.secrets.geocoder[:here_app_id],
+  #   here_app_code: Rails.application.secrets.geocoder[:here_app_code]
   # }
 
   # Currency unit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,168 +18,154 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.2
-- !ruby/object:Gem::Dependency
-  name: rails-i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +250,7 @@ files:
 - decidim-admin/app/assets/config/decidim_admin_manifest.js
 - decidim-admin/app/assets/images/decidim/admin/.keep
 - decidim-admin/app/assets/javascripts/decidim/admin/application.js.es6
-- decidim-admin/app/assets/javascripts/decidim/admin/sort_steps.js.es6
+- decidim-admin/app/assets/javascripts/decidim/admin/sort_list.component.js.es6
 - decidim-admin/app/assets/javascripts/decidim/admin/tab_focus.js.es6
 - decidim-admin/app/assets/javascripts/decidim/admin/toggle_nav.js.es6
 - decidim-admin/app/assets/stylesheets/decidim/admin/_decidim.scss
@@ -276,8 +262,10 @@ files:
 - decidim-admin/app/assets/stylesheets/decidim/admin/extra/_dropdown_inverted.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/extra/_editor.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/extra/_email_preview.scss
+- decidim-admin/app/assets/stylesheets/decidim/admin/extra/_language-chooser.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/extra/_login.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/extra/_select_multiple.scss
+- decidim-admin/app/assets/stylesheets/decidim/admin/extra/_sort.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/extra/_title_bar.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/modules/_action-icon.scss
 - decidim-admin/app/assets/stylesheets/decidim/admin/modules/_buttons.scss
@@ -513,6 +501,7 @@ files:
 - decidim-admin/config/locales/eu.yml
 - decidim-admin/config/locales/fi.yml
 - decidim-admin/config/locales/fr.yml
+- decidim-admin/config/locales/it.yml
 - decidim-admin/config/locales/nl.yml
 - decidim-admin/config/routes.rb
 - decidim-admin/db/migrate/20161102144648_add_admin_participatory_process_user_roles.rb
@@ -708,6 +697,7 @@ files:
 - decidim-budgets/config/locales/eu.yml
 - decidim-budgets/config/locales/fi.yml
 - decidim-budgets/config/locales/fr.yml
+- decidim-budgets/config/locales/it.yml
 - decidim-budgets/config/locales/nl.yml
 - decidim-budgets/db/migrate/20170127114122_create_projects.rb
 - decidim-budgets/db/migrate/20170130095615_create_orders.rb
@@ -715,6 +705,7 @@ files:
 - decidim-budgets/db/migrate/20170207101750_remove_short_description_from_decidim_projects.rb
 - decidim-budgets/db/migrate/20170215132708_add_reference_to_projects.rb
 - decidim-budgets/db/migrate/20170410074214_remove_not_null_reference_budgets.rb
+- decidim-budgets/db/migrate/20170612101846_migrate_projects_category.rb
 - decidim-budgets/decidim-budgets.gemspec
 - decidim-budgets/lib/decidim/budgets.rb
 - decidim-budgets/lib/decidim/budgets/admin.rb
@@ -744,7 +735,6 @@ files:
 - decidim-budgets/spec/models/project_spec.rb
 - decidim-budgets/spec/queries/decidim/budgets/filtered_projects_spec.rb
 - decidim-budgets/spec/services/project_search_spec.rb
-- decidim-budgets/spec/shared/admin_shared_context.rb
 - decidim-budgets/spec/shared/manage_attachments_examples.rb
 - decidim-budgets/spec/shared/manage_projects_examples.rb
 - decidim-budgets/spec/spec_helper.rb
@@ -821,6 +811,7 @@ files:
 - decidim-comments/config/locales/eu.yml
 - decidim-comments/config/locales/fi.yml
 - decidim-comments/config/locales/fr.yml
+- decidim-comments/config/locales/it.yml
 - decidim-comments/config/locales/nl.yml
 - decidim-comments/db/migrate/20161130143508_create_comments.rb
 - decidim-comments/db/migrate/20161214082645_add_depth_to_comments.rb
@@ -866,7 +857,7 @@ files:
 - decidim-comments/spec/models/comment_vote_spec.rb
 - decidim-comments/spec/models/seed_spec.rb
 - decidim-comments/spec/queries/sorted_comments_spec.rb
-- decidim-comments/spec/shared/admin_shared_context.rb
+- decidim-comments/spec/shared/author_localised_email.rb
 - decidim-comments/spec/spec_helper.rb
 - decidim-comments/spec/types/comment_mutation_type_spec.rb
 - decidim-comments/spec/types/comment_type_spec.rb
@@ -885,6 +876,7 @@ files:
 - decidim-dev/config/locales/eu.yml
 - decidim-dev/config/locales/fi.yml
 - decidim-dev/config/locales/fr.yml
+- decidim-dev/config/locales/it.yml
 - decidim-dev/config/locales/nl.yml
 - decidim-dev/decidim-dev.gemspec
 - decidim-dev/lib/decidim/dev.rb
@@ -985,6 +977,7 @@ files:
 - decidim-meetings/config/locales/eu.yml
 - decidim-meetings/config/locales/fi.yml
 - decidim-meetings/config/locales/fr.yml
+- decidim-meetings/config/locales/it.yml
 - decidim-meetings/config/locales/nl.yml
 - decidim-meetings/db/migrate/20161130121354_create_meetings.rb
 - decidim-meetings/db/migrate/20170110142105_close_a_meeting.rb
@@ -992,6 +985,7 @@ files:
 - decidim-meetings/db/migrate/20170129153716_remove_short_description_from_meetings.rb
 - decidim-meetings/db/migrate/20170215132546_add_reference_to_meetings.rb
 - decidim-meetings/db/migrate/20170410074252_remove_not_null_reference_meetings.rb
+- decidim-meetings/db/migrate/20170612101925_migrate_meetings_category.rb
 - decidim-meetings/decidim-meetings.gemspec
 - decidim-meetings/lib/decidim/meetings.rb
 - decidim-meetings/lib/decidim/meetings/admin.rb
@@ -1015,7 +1009,6 @@ files:
 - decidim-meetings/spec/i18n_spec.rb
 - decidim-meetings/spec/models/meeting_spec.rb
 - decidim-meetings/spec/services/meeting_search_spec.rb
-- decidim-meetings/spec/shared/admin_shared_context.rb
 - decidim-meetings/spec/shared/manage_attachments_examples.rb
 - decidim-meetings/spec/shared/manage_meetings_examples.rb
 - decidim-meetings/spec/spec_helper.rb
@@ -1044,6 +1037,7 @@ files:
 - decidim-pages/config/locales/eu.yml
 - decidim-pages/config/locales/fi.yml
 - decidim-pages/config/locales/fr.yml
+- decidim-pages/config/locales/it.yml
 - decidim-pages/config/locales/nl.yml
 - decidim-pages/db/migrate/20161116121353_create_decidim_pages.rb
 - decidim-pages/db/migrate/20161214150429_add_commentable_to_pages.rb
@@ -1079,6 +1073,8 @@ files:
 - decidim-proposals/app/commands/decidim/proposals/admin/create_proposal.rb
 - decidim-proposals/app/commands/decidim/proposals/create_proposal.rb
 - decidim-proposals/app/commands/decidim/proposals/create_proposal_export.rb
+- decidim-proposals/app/commands/decidim/proposals/unvote_proposal.rb
+- decidim-proposals/app/commands/decidim/proposals/vote_proposal.rb
 - decidim-proposals/app/controllers/concerns/decidim/proposals/orderable.rb
 - decidim-proposals/app/controllers/decidim/proposals/admin/application_controller.rb
 - decidim-proposals/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb
@@ -1107,6 +1103,7 @@ files:
 - decidim-proposals/app/views/decidim/proposals/admin/proposals/new.html.erb
 - decidim-proposals/app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
 - decidim-proposals/app/views/decidim/proposals/proposal_widgets/show.html.erb
+- decidim-proposals/app/views/decidim/proposals/proposals/_author.html.erb
 - decidim-proposals/app/views/decidim/proposals/proposals/_count.html.erb
 - decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb
 - decidim-proposals/app/views/decidim/proposals/proposals/_filters_small_view.html.erb
@@ -1132,6 +1129,7 @@ files:
 - decidim-proposals/config/locales/eu.yml
 - decidim-proposals/config/locales/fi.yml
 - decidim-proposals/config/locales/fr.yml
+- decidim-proposals/config/locales/it.yml
 - decidim-proposals/config/locales/nl.yml
 - decidim-proposals/db/migrate/20161212110850_create_decidim_proposals.rb
 - decidim-proposals/db/migrate/20170112115253_create_proposal_votes.rb
@@ -1147,6 +1145,7 @@ files:
 - decidim-proposals/db/migrate/20170228105156_add_geolocalization_fields_to_proposals.rb
 - decidim-proposals/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb
 - decidim-proposals/db/migrate/20170410073742_remove_not_null_reference_proposals.rb
+- decidim-proposals/db/migrate/20170612101809_migrate_proposals_category.rb
 - decidim-proposals/decidim-proposals.gemspec
 - decidim-proposals/lib/decidim/proposals.rb
 - decidim-proposals/lib/decidim/proposals/admin.rb
@@ -1158,6 +1157,8 @@ files:
 - decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_spec.rb
 - decidim-proposals/spec/commands/decidim/proposals/answer_proposal_spec.rb
 - decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb
+- decidim-proposals/spec/commands/decidim/proposals/unvote_proposal_spec.rb
+- decidim-proposals/spec/commands/decidim/proposals/vote_proposal_spec.rb
 - decidim-proposals/spec/controllers/concerns/orderable_test.rb
 - decidim-proposals/spec/controllers/decidim/admin/proposal_answers_controller_spec.rb
 - decidim-proposals/spec/controllers/decidim/proposal_votes_controller_spec.rb
@@ -1183,7 +1184,6 @@ files:
 - decidim-proposals/spec/queries/decidim/proposals/filtered_proposals_spec.rb
 - decidim-proposals/spec/services/decidim/proposals/proposal_search_spec.rb
 - decidim-proposals/spec/services/decidim/proposals/proposal_serializer_spec.rb
-- decidim-proposals/spec/shared/admin_shared_context.rb
 - decidim-proposals/spec/shared/create_proposal_examples.rb
 - decidim-proposals/spec/shared/export_proposals_examples.rb
 - decidim-proposals/spec/shared/manage_proposals_examples.rb
@@ -1228,11 +1228,13 @@ files:
 - decidim-results/config/locales/eu.yml
 - decidim-results/config/locales/fi.yml
 - decidim-results/config/locales/fr.yml
+- decidim-results/config/locales/it.yml
 - decidim-results/config/locales/nl.yml
 - decidim-results/db/migrate/20170116104125_create_results.rb
 - decidim-results/db/migrate/20170129164553_remove_short_description_from_results.rb
 - decidim-results/db/migrate/20170215132624_add_reference_to_results.rb
 - decidim-results/db/migrate/20170410074358_remove_not_null_reference_results.rb
+- decidim-results/db/migrate/20170612101951_migrate_results_category.rb
 - decidim-results/decidim-results.gemspec
 - decidim-results/lib/decidim/results.rb
 - decidim-results/lib/decidim/results/admin.rb
@@ -1254,9 +1256,89 @@ files:
 - decidim-results/spec/queries/decidim/results/filtered_results_spec.rb
 - decidim-results/spec/services/result_search_spec.rb
 - decidim-results/spec/services/result_stats_calculator_spec.rb
-- decidim-results/spec/shared/admin_shared_context.rb
 - decidim-results/spec/shared/manage_results_examples.rb
 - decidim-results/spec/spec_helper.rb
+- decidim-surveys/README.md
+- decidim-surveys/Rakefile
+- decidim-surveys/app/assets/config/admin/decidim_surveys_manifest.js
+- decidim-surveys/app/assets/images/decidim/surveys/icon.svg
+- decidim-surveys/app/assets/javascripts/decidim/surveys/admin/auto_label_by_position.component.js.es6
+- decidim-surveys/app/assets/javascripts/decidim/surveys/admin/dynamic_fields.component.js.es6
+- decidim-surveys/app/assets/javascripts/decidim/surveys/admin/surveys.js.es6
+- decidim-surveys/app/assets/stylesheets/decidim/surveys/surveys.scss
+- decidim-surveys/app/commands/decidim/surveys/admin/update_survey.rb
+- decidim-surveys/app/commands/decidim/surveys/answer_survey.rb
+- decidim-surveys/app/commands/decidim/surveys/create_survey.rb
+- decidim-surveys/app/controllers/decidim/surveys/admin/application_controller.rb
+- decidim-surveys/app/controllers/decidim/surveys/admin/surveys_controller.rb
+- decidim-surveys/app/controllers/decidim/surveys/application_controller.rb
+- decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
+- decidim-surveys/app/forms/decidim/surveys/admin/survey_form.rb
+- decidim-surveys/app/forms/decidim/surveys/admin/survey_question_answer_option_form.rb
+- decidim-surveys/app/forms/decidim/surveys/admin/survey_question_form.rb
+- decidim-surveys/app/forms/decidim/surveys/survey_answer_form.rb
+- decidim-surveys/app/forms/decidim/surveys/survey_form.rb
+- decidim-surveys/app/helpers/decidim/surveys/admin/application_helper.rb
+- decidim-surveys/app/models/decidim/surveys/abilities/admin_user.rb
+- decidim-surveys/app/models/decidim/surveys/abilities/current_user.rb
+- decidim-surveys/app/models/decidim/surveys/abilities/process_admin_user.rb
+- decidim-surveys/app/models/decidim/surveys/application_record.rb
+- decidim-surveys/app/models/decidim/surveys/survey.rb
+- decidim-surveys/app/models/decidim/surveys/survey_answer.rb
+- decidim-surveys/app/models/decidim/surveys/survey_question.rb
+- decidim-surveys/app/queries/decidim/surveys/survey_user_answers.rb
+- decidim-surveys/app/views/decidim/surveys/admin/surveys/_answer_option.html.erb
+- decidim-surveys/app/views/decidim/surveys/admin/surveys/_form.html.erb
+- decidim-surveys/app/views/decidim/surveys/admin/surveys/_question.html.erb
+- decidim-surveys/app/views/decidim/surveys/admin/surveys/edit.html.erb
+- decidim-surveys/app/views/decidim/surveys/surveys/show.html.erb
+- decidim-surveys/bin/rails
+- decidim-surveys/config/i18n-tasks.yml
+- decidim-surveys/config/locales/ca.yml
+- decidim-surveys/config/locales/en.yml
+- decidim-surveys/config/locales/es.yml
+- decidim-surveys/config/locales/eu.yml
+- decidim-surveys/config/locales/fi.yml
+- decidim-surveys/config/locales/fr.yml
+- decidim-surveys/config/locales/it.yml
+- decidim-surveys/config/locales/nl.yml
+- decidim-surveys/db/migrate/20170511092231_create_decidim_surveys.rb
+- decidim-surveys/db/migrate/20170515090916_create_decidim_survey_questions.rb
+- decidim-surveys/db/migrate/20170515144119_create_decidim_survey_answers.rb
+- decidim-surveys/db/migrate/20170518085302_add_position_to_surveys_questions.rb
+- decidim-surveys/db/migrate/20170522075938_add_mandatory_to_surveys_questions.rb
+- decidim-surveys/db/migrate/20170524122229_add_question_type_to_surveys_questions.rb
+- decidim-surveys/db/migrate/20170525132233_add_answer_options_to_surveys_questions.rb
+- decidim-surveys/decidim-surveys.gemspec
+- decidim-surveys/lib/decidim/surveys.rb
+- decidim-surveys/lib/decidim/surveys/admin.rb
+- decidim-surveys/lib/decidim/surveys/admin_engine.rb
+- decidim-surveys/lib/decidim/surveys/engine.rb
+- decidim-surveys/lib/decidim/surveys/feature.rb
+- decidim-surveys/lib/decidim/surveys/survey_user_answers_serializer.rb
+- decidim-surveys/lib/decidim/surveys/test/factories.rb
+- decidim-surveys/spec/commands/decidim/surveys/admin/update_survey_spec.rb
+- decidim-surveys/spec/commands/decidim/surveys/answer_survey_spec.rb
+- decidim-surveys/spec/commands/decidim/surveys/create_survey_spec.rb
+- decidim-surveys/spec/factories.rb
+- decidim-surveys/spec/features/admin_manages_surveys_spec.rb
+- decidim-surveys/spec/features/process_admin_manages_surveys_spec.rb
+- decidim-surveys/spec/features/survey_spec.rb
+- decidim-surveys/spec/forms/decidim/surveys/admin/survey_form_spec.rb
+- decidim-surveys/spec/forms/decidim/surveys/admin/survey_question_form_spec.rb
+- decidim-surveys/spec/forms/decidim/surveys/survey_answer_form_spec.rb
+- decidim-surveys/spec/forms/decidim/surveys/survey_form_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/abilities/admin_user_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/abilities/current_user_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/abilities/process_admin_user_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/survey_answer_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/survey_question_spec.rb
+- decidim-surveys/spec/models/decidim/surveys/survey_spec.rb
+- decidim-surveys/spec/queries/decidim/surveys/survey_user_answers_spec.rb
+- decidim-surveys/spec/services/decidim/surveys/surveys/survey_user_answer_serializer_spec.rb
+- decidim-surveys/spec/shared/edit_survey_examples.rb
+- decidim-surveys/spec/shared/export_survey_user_answers_examples.rb
+- decidim-surveys/spec/spec_helper.rb
 - decidim-system/README.md
 - decidim-system/Rakefile
 - decidim-system/app/assets/config/decidim_system_manifest.js
@@ -1319,6 +1401,7 @@ files:
 - decidim-system/config/locales/eu.yml
 - decidim-system/config/locales/fi.yml
 - decidim-system/config/locales/fr.yml
+- decidim-system/config/locales/it.yml
 - decidim-system/config/locales/nl.yml
 - decidim-system/config/routes.rb
 - decidim-system/db/migrate/20160919105637_devise_create_decidim_admins.rb