Merge branch 'master' into staging

Victor Costa
2 parents 40c630fd 24b3013c
Showing 2490 changed files with 297841 additions and 297897 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
AUTHORS.md
Gemfile
HACKING.md
app/api/entities.rb
app/api/helpers.rb
app/api/v1/articles.rb
app/api/v1/blocks.rb
app/api/v1/communities.rb
app/api/v1/profiles.rb
app/api/v1/session.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/profile_editor_controller.rb
app/controllers/public/account_controller.rb
app/controllers/public/chat_controller.rb
app/controllers/public/invite_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
@@ -59,18 +59,18 @@ selenium-6:
 # NOOSFERO_BUNDLE_OPTS=install makes migrations fails
 # probably because of rubygems-integration
 plugins-1:
-  script: SLICE=1/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-2:
-  script: SLICE=2/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-3:
-  script: SLICE=3/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-4:
-  script: SLICE=4/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
 plugins-5:
-  script: SLICE=5/5 bundle exec rake test:noosfero_plugins
+  script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
   stage: all-tests
@@ -19,6 +19,10 @@ language: ruby
 rvm:
   - 2.3.1
+services:
+  - postgresql
+  - elasticsearch
+
 addons:
   apt:
     packages:
@@ -8,38 +8,42 @@ noosfero, that&#39;s not a problem).
 Developers
 ==========
-Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
 Alan Freihof Tygel <alantygel@gmail.com>
+Alessandro Caetano <alesasndro.caetanob@gmail.com>
+Alessandro Caetano <alessandro.caetanob@gmail.com>
 Alessandro Palmeira <alessandro.palmeira@gmail.com>
+Alex Campelo <campelo.al1@gmail.com>
 Alexandre Barbosa <alexandreab@live.com>
 Alexandre Torres <alexandrekry@gmail.com>
-Alex Campelo <campelo.al1@gmail.com>
-Álvaro Fernando <alvarofernandoms@gmail.com>
+Alipio muñiz <alipio@ecoalternative.net>
 Ana Losnak <analosnak@gmail.com>
 Ana Paula Vargas <anapaulavnoronha@gmail.com>
 Andre Bedran <bedran.fleck@gmail.com>
-André Guedes <andrebsguedes@gmail.com>
 Andrey Aleksanyants <aaleksanyants@yahoo.com>
+André Guedes <andrebsguedes@gmail.com>
 Antonio Terceiro <terceiro@colivre.coop.br>
 Arthur Del Esposte <arthurmde@gmail.com>
+Arthur Jahn <stutrzbecher@gmail.com>
+Artur Bersan de Faria <arturbersan@gmail.com>
 Athos Ribeiro <athoscribeiro@gmail.com>
-Aurelio A. Heckert <aurelio@colivre.coop.br>
+Aurelio A. Heckert <aurium@colivre.coop.br>
+Becca Cook <b.cook28@gmail.com>
 Braulio Bhavamitra <braulio@eita.org.br>
 Brenddon Gontijo <brenddongontijo@msn.com>
 Caio Formiga <caio.formiga@gmail.com>
-Caio Salgado <caio.csalgado@gmail.com>
 Caio SBA <caio@colivre.coop.br>
+Caio Salgado <caio.csalgado@gmail.com>
 Caio Tiago Oliveira <caiotiago@colivre.coop.br>
 Carlos Andre de Souza <carlos.andre.souza@msn.com>
 Carlos Morais <carlos88morais@gmail.com>
 Carlos Purificacao <carloseugenio@gmail.com>
 Christophe DANIEL <papaeng@gmail.com>
-Daniela Feitosa <alessandro.palmeira@gmail.com>
 Daniel Alves <danpaulalves@gmail.com>
-Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+Daniel Henrique <danielhmarinho@gmail.com>
 Daniel Tygel <dtygel@eita.org.br>
+Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 David Carlos <ddavidcarlos1392@gmail.com>
 Diego Araujo <diegoamc90@gmail.com>
 Dylan Guedes <djmgguedes@gmail.com>
@@ -48,76 +52,91 @@ Eduardo Passos &lt;eduardosteps@gmail.com&gt;
 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
 Eduardo Vital <vitaldu@gmail.com>
 Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
-Fabio Teixeira <fabio1079@gmail.com>
 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
+Fabio Teixeira <fabio1079@gmail.com>
+Fagner Rodrigues <fagner128@gmail.com>
 Fernanda Lopes <nanda.listas+psl@gmail.com>
 Filipe Ribeiro <firibeiro77@live.com>
 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
-Gabriela Navarro <navarro1703@gmail.com>
 Gabriel Silva <gabriel93.silva@gmail.com>
+Gabriel Silva <grabriel93.silva@gmail.com>
+Gabriela Navarro <navarro1703@gmail.com>
 Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
 Grazieno Pellegrino <grazieno@gmail.com>
 Guilherme C. Muniz <guilherme.cmuniz@gmail.com>
 Guilherme Rojas <guilhermehrojas@gmail.com>
+Gustavo Cavalcante <gustavo.cavalcante.oliveira@live.com>
 Gustavo Coelho <gust.rod.coelho@gmail.com>
+Gustavo Jaruga <darkshades@gmail.com>
 Gustavo Jaruga <darksshades@gmail.com>
 Hebert Douglas <hebertdougl@gmail.com>
 Hugo Melo <hugo@riseup.net>
+Iago Rodrigues <iago006@hotmailcom>
 Iolane Andrade <andrade.icaa@gmail.com>
+Iryna Pruitt <jdpruitt2807@prodigy.net>
 Isaac Canan <isaac@intelletto.com.br>
 Italo Valcy <italo@dcc.ufba.br>
+Izharul Haq <atoz.chevara.2013@gmail.com>
 Jefferson Fernandes <jeffs.fernandes@gmail.com>
-Jérôme Jutteau <j.jutteau@gmail.com>
-Jéssica Cristina <jessica.cris1127@gmail.com>
-João Machini
-João M. M. da Silva <jaodsilv@linux.ime.usp.br>
 Joenio Costa <joenio@colivre.coop.br>
-Josef Spillner <josef.spillner@tu-dresden.de>
+Joenio Costa <joenio@joenio.me>
 Jose Pedro <1jpsneto@gmail.com>
+Josef Spillner <josef.spillner@tu-dresden.de>
+João M. M. da Silva <jaodsilv@linux.ime.usp.br>
+João Machini
 Junior Silva <juniorsilva1001@gmail.com>
+Jérôme Jutteau <j.jutteau@gmail.com>
+Jéssica Cristina <jessica.cris1127@gmail.com>
+Karine Valença <valenca.karine@gmail.com>
 Keilla Menezes <keilla@colivre.coop.br>
 Larissa Reis <larissa@colivre.coop.br>
 Leandro Alves <leandrosustenido@gmail.com>
 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
 Leandro Veloso <leandrovelosorodrigues@gmail.com>
 LinguÁgil 2010 <linguagil.bahia@gmail.com>
+Luan Guimarães <guimaraesluan@me.com>
 Lucas Couto <loc.unb@gmail.com>
 Lucas Kanashiro <kanashiro.duarte@gmail.com>
 Lucas Melo <lucaspradomelo@gmail.com>
+Lucas Moura <lucas.moura128@gmail.com>
+Lucas Severo <lucassalves65@gmail.com>
 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
 Luis David Aguilar Carlos <ludwig9003@gmail.com>
 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
 Luiz Matos <luizff.matos@gmail.com>
+M for Momo <mo@rtnp.org>
 Macartur de Sousa <macartur.sc@gmail.com>
 Marcelo Júnior <maljunior@gmail.com>
 Marcos Ramos <ms.ramos@outlook.com>
 Marcos Ronaldo <marcos.rpj2@gmail.com>
-María Vecino <mariavecino@ecoalternative.net>
 Mariel Zasso <noosfero-br@listas.softwarelivre.org>
 Martín Olivera <molivera@solar.org.ar>
+María Vecino <mariavecino@ecoalternative.net>
 Matheus Faria <matheus.sousa.faria@gmail.com>
+Matheus Miranda <matheusmirandalacerda@gmail.com>
 Maurilio Atila <cabelotaina@gmail.com>
 Melissa Wen <melissa.srw@gmail.com>
-M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
 Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
 Moises Machado <moises@colivre.coop.br>
-Naíla Alves <naila@colivre.coop.br>
+Murilo Duarte <muriloduartegoncalves@hotmail.com>
 Nanda Lopes <nanda.listas+psl@gmail.com>
+Naíla Alves <naila@colivre.coop.br>
 Niemand Jedermann <predatorix@web.de>
 Omar Junior <omarroinuj@gmail.com>
 Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles <paulo@softwarelivre.org>
-Pedro de Lyra <pedrodelyra@gmail.com>
+Paulo Tada <paulohtfs@gmail.com>
 Pedro Leal
+Pedro de Lyra <pedrodelyra@gmail.com>
 Phillip Rohmberger <rohmberger@hotmail.de>
-Rafael de Souza Queiroz <querafael@live.com>
 Rafael Gomes <rafaelgomes@techfree.com.br>
 Rafael Martins <rmmartins@gmail.com>
 Rafael Reggiani Manzo <rr.manzo@gmail.com>
+Rafael de Souza Queiroz <querafael@live.com>
 Raphaël Rousseau <raph@r4f.org>
-Raquel Lira <raquel.lira@gmail.com>
 Raquel <rcordioli@gmail.com>
+Raquel Lira <raquel.lira@gmail.com>
 Renan Costa <renan2727@hotmail.com>
 Renan Teruo <renanteruoc@gmail.com>
 Rodrigo Medeiros <rodrigo.mss01@gmail.com>
@@ -125,16 +144,18 @@ Rodrigo Siqueira &lt;siqueira@kuniri.org&gt;
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronnie Simon <ronniesimonf@gmail.com>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
+Sabryna Sousa <sabryna.sousa1323@gmail.com>
 Samuel R. C. Vale <srcvale@holoscopio.com>
 Simião Carvalho <simiaosimis@gmail.com>
+TWS <tablettws@gmail.com>
 Tallys Martins <tallysmartins@yahoo.com.br>
 Thiago Casotti <thiago.casotti@uol.com.br>
 Thiago Kairala <thiagor.kairala@gmail.com>
 Thiago Ribeiro <thiagitosouza@hotmail.com>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
-TWS <tablettws@gmail.com>
 Valessio Brito <contato@valessiobrito.com.br>
+Valet 322 <petymakar@gmail.com>
 Victor Costa <vfcosta@gmail.com>
 Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
 Victor Navarro <victor.matias.navarro@gmail.com>
@@ -142,6 +163,9 @@ Vinicius Brand &lt;viniciuscb@gmail.com&gt;
 Vitor Barbosa <vitornga15@gmail.com>
 Wilton Rodrigues <braynwilton@gmail.com>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
+Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
+Álvaro Fernando <alvarofernandoms@gmail.com>
+Вадим Кардашьян <iosphone77@gmail.com>
 Ideas, specifications and incentive
 ===================================
@@ -27,7 +27,7 @@ gem &#39;rest-client&#39;,              &#39;~&gt; 1.6&#39;
 gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 3.1', :require => false
 gem 'locale',                   '~> 2.1'
-gem 'whenever', :require => false
+gem 'whenever',                 '~> 0.9.4', :require => false
 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
 gem 'diffy',                    '~> 3.0'
 gem 'slim'
@@ -35,17 +35,16 @@ gem &#39;activerecord-session_store&#39;, (&#39;1.0.0.pre&#39; if RUBY_VERSION &gt;= &#39;2.3.0&#39;)
 # API dependencies
 gem 'grape',                    '~> 0.12'
-gem 'grape-entity',             '0.4.8'
+gem 'grape-entity',             '~>0.4.8'
 gem 'grape_logging'
 gem 'grape-swagger'
 gem 'swagger-ui_rails'
 gem 'kramdown'
 gem 'rack-cors'
 gem 'rack-contrib'
-gem 'liquid',                    '~> 3.0.3'
 gem 'api-pagination',           '>= 4.1.1'
-gem 'liquid',                    '~> 3.0.3'
+gem 'liquid',                    '>= 3.0.3'
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -81,10 +80,10 @@ end
 group :cucumber do
   gem 'capybara',               '~> 2.2'
   gem 'launchy'
-  gem 'cucumber'
+  gem 'cucumber',                '~> 1.3'
   gem 'cucumber-rails',         '~> 1.4.2', :require => false
   gem 'database_cleaner',       '~> 1.3'
-  gem 'selenium-webdriver',     '>= 2.50'
+  gem 'selenium-webdriver',     '>= 2.53'
   gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
 end
@@ -31,7 +31,7 @@ If you want to use a different port than 3000, pass `-p &lt;PORT&gt;` to `./script/dev
 Instructions for other systems
 ------------------------------
-On other OS, you have 2 options:
+On other OS, you have many options:
 ### 1) using a chroot or a VM with Debian stable (easier)
@@ -45,6 +45,14 @@ You can check `./script/install-dependencies/debian-squeeze.sh` to have an idea 
 If you write such script for your own OS, *please* share it with us at the development mailing list so that we can include it in the official repository. This way other people using the same OS will have to put less effort to develop Noosfero.
+### 3) Installing dependencies via Rubygems and RVM
+
+To setup the development environment through Rubygems you just need to install some basic deps and then install the gems defined on the Gemfile. Further instructions can be found on: http://noosfero.org/bin/view/Development/DepsWithRVMAndGems
+
+### 4) Using a docker image
+
+Use a docker image to run an out-of-the-box development environment. Further information can be found on: https://hub.docker.com/r/noosfero/dev-rails4/
+
 Submitting your changes back
 ----------------------------
@@ -38,9 +38,17 @@ module Api
       PERMISSIONS[current_permission] <= PERMISSIONS[permission]
     end
+    def self.expose_optional_field?(field, options = {})
+      return false if options[:params].nil?
+      optional_fields = options[:params][:optional_fields] || []
+      optional_fields.include?(field.to_s)
+    end
+
+
     class Image < Entity
       root 'images', 'image'
+      expose :filename
       expose  :url do |image, options|
         image.public_filename
       end
@@ -153,6 +161,9 @@ module Api
       expose :articles_count do |person, options|
         person.articles.count
       end
+      expose :friends_count do |person, options|
+        person.friends.size
+      end
     end
     class Enterprise < Profile
@@ -166,7 +177,8 @@ module Api
         community.admins.map{|admin| {"name"=>admin.name, "id"=>admin.id, "username" => admin.identifier}}
       end
       expose :categories, :using => Category
-      expose :members, :using => Person , :if => lambda{ |community, options| community.display_info_to? options[:current_person] }
+      expose :members_count
+      expose :members, :if => lambda {|community, options| Entities.expose_optional_field?(:members, options)}
     end
     class CommentBase < Entity
@@ -174,6 +186,10 @@ module Api
       expose :created_at, :format_with => :timestamp
       expose :author, :using => Profile
       expose :reply_of, :using => CommentBase
+      expose :permissions do |comment, options|
+        Entities.permissions_for_entity(comment, options[:current_person],
+        :allow_destroy?)
+      end
     end
     class Comment < CommentBase
@@ -209,7 +225,7 @@ module Api
       expose :comments_count
       expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
       expose :type
-      expose :comments, using: CommentBase, :if => lambda{|obj,opt| opt[:params] && ['1','true',true].include?(opt[:params][:show_comments])}
+      expose :comments, using: CommentBase, :if => lambda{|comment,options| Entities.expose_optional_field?(:comments, options)}
       expose :published
       expose :accept_comments?, as: :accept_comments
     end
@@ -304,7 +320,7 @@ module Api
       end
       expose :params, :if => lambda { |activity, options| activity.kind_of?(ActionTracker::Record)}
       expose :content, :if => lambda { |activity, options| activity.kind_of?(Scrap)}
-      expose :verb do |activity, options| 
+      expose :verb do |activity, options|
         activity.kind_of?(Scrap) ? 'leave_scrap' : activity.verb
       end
@@ -57,9 +57,11 @@ module Api
     def present_partial(model, options)
       if(params[:fields].present?)
         begin
-          fields = JSON.parse(params[:fields])
+          fields = JSON.parse((params.to_hash[:fields] || params.to_hash['fields']).to_json)
           if fields.present?
-            options.merge!(fields.symbolize_keys.slice(:only, :except))
+            fields = fields.symbolize_keys
+            options.merge!(:only => fields[:only]) if fields[:only].present?
+            options.merge!(:except => fields[:except]) if fields[:except].present?
           end
         rescue
           fields = params[:fields]
@@ -116,7 +118,7 @@ module Api
     def post_article(asset, params)
       return forbidden! unless current_person.can_post_content?(asset)
-      klass_type = params[:content_type] || params[:article].delete(:type) || TinyMceArticle.name
+      klass_type = params[:content_type] || params[:article].delete(:type) || TextArticle.name
       return forbidden! unless klass_type.constantize <= Article
       article = klass_type.constantize.new(params[:article])
@@ -447,12 +449,12 @@ module Api
     end
     def asset_with_image params
-      if params.has_key? :image_builder
+      if !params.nil? && params.has_key?(:image_builder)
         asset_api_params = params
         asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])
         return asset_api_params
       end
-        params
+      params
     end
     def base64_to_uploadedfile(base64_image)
@@ -503,11 +505,9 @@ module Api
     def parse_content_type(content_type)
       return nil if content_type.blank?
-      content_types = content_type.split(',').map do |content_type|
-        content_type = content_type.camelcase
-        content_type == 'TextArticle' ? Article.text_article_types : content_type
+      content_type.split(',').map do |content_type|
+        content_type.camelcase
       end
-      content_types.flatten.uniq
     end
     def period(from_date, until_date)
@@ -284,7 +284,7 @@ module Api
                 if params[:path].present?
                   article = profile.articles.find_by path: params[:path]
-                  if !article || !article.display_to?(current_person)
+                  if article && !article.display_to?(current_person)
                     article = forbidden!
                   end
@@ -6,6 +6,7 @@ module Api
         get ':id' do
           block = Block.find(params["id"])
           return forbidden! unless block.visible_to_user?(current_person) || block.allow_edit?(current_person)
+          block.api_content_params = params.except("id")
           present block, :with => Entities::Block, display_api_content: true, current_person: current_person
         end
@@ -18,7 +18,7 @@ module Api
           communities = select_filtered_collection_of(environment, 'communities', params)
           communities = profiles_for_person(communities, current_person)
           communities = communities.by_location(params) # Must be the last. May return Exception obj
-          present communities, :with => Entities::Community, :current_person => current_person
+          present communities, :with => Entities::Community, :current_person => current_person, :params => params
         end
@@ -49,7 +49,7 @@ module Api
         get ':id' do
           community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])
-          present community, :with => Entities::Community, :current_person => current_person
+          present community, :with => Entities::Community, :current_person => current_person, :params => params
         end
       end
@@ -28,7 +28,7 @@ module Api
           authenticate!
           profile = environment.profiles.find_by(id: params[:id])
           return forbidden! unless profile.allow_edit?(current_person)
-          profile.update_attributes!(params[:profile])
+          profile.update_attributes!(asset_with_image(params[:profile]))
           present profile, :with => Entities::Profile, :current_person => current_person
         end
@@ -174,14 +174,13 @@ module Api
       # Example Request:
       #   PATCH /new_password?code=xxxx&password=secret&password_confirmation=secret
       patch "/new_password" do
-        change_password = ChangePassword.find_by code: params[:code]
-        not_found! if change_password.nil?
-
-        if change_password.update_attributes(:password => params[:password], :password_confirmation => params[:password_confirmation])
+        begin
+          change_password = ChangePassword.find_by! code: params[:code]
+          change_password.update_attributes!(:password => params[:password], :password_confirmation => params[:password_confirmation])
           change_password.finish
           present change_password.requestor.user, :with => Entities::UserLogin, :current_person => current_person
-        else
-          something_wrong!
+        rescue Exception => ex
+          render_api_error!(ex.message, 400)
         end
       end
@@ -146,11 +146,14 @@ class CmsController &lt; MyProfileController
     parent = check_parent(params[:parent_id])
     if parent
       @article.parent = parent
+      @article.published = parent.published
+      @article.show_to_followers = parent.show_to_followers
       @parent_id = parent.id
     end
     @article.profile = profile
     @article.author = user
+    @article.editor = current_person.editor
     @article.last_changed_by = user
     @article.created_by = user
@@ -399,8 +402,7 @@ class CmsController &lt; MyProfileController
   def available_article_types
     articles = [
-      TinyMceArticle,
-      TextileArticle,
+      TextArticle,
       Event
     ]
     articles += special_article_types if params && params[:cms]
@@ -408,9 +410,6 @@ class CmsController &lt; MyProfileController
     if @parent && @parent.blog?
       articles -= Article.folder_types.map(&:constantize)
     end
-    if user.is_admin?(profile.environment)
-      articles << RawHTMLArticle
-    end
     articles
   end
@@ -12,7 +12,7 @@ class ProfileEditorController &lt; MyProfileController
   include CategoriesHelper
   def index
-    @pending_tasks = Task.to(profile).pending.without_spam.select{|i| user.has_permission?(i.permission, profile)}
+    @pending_tasks = Task.to(profile).pending.without_spam
     @show_appearance_option = user.is_admin?(environment) || environment.enabled?('enable_appearance')
     @show_header_footer_option = user.is_admin?(environment) || (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))
   end
@@ -95,7 +95,7 @@ class ProfileEditorController &lt; MyProfileController
   end
   def welcome_page
-    @welcome_page = profile.welcome_page || TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
+    @welcome_page = profile.welcome_page || TextArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
     if request.post?
       begin
         @welcome_page.update!(params[:welcome_page])
@@ -164,6 +164,7 @@ class AccountController &lt; ApplicationController
   def logout
     if logged_in?
       self.current_user.forget_me
+      current_user.update({:chat_status_at => DateTime.now}.merge({:last_chat_status => current_user.chat_status, :chat_status => 'offline'}))
     end
     reset_session
     session[:notice] = _("You have been logged out.")
@@ -113,8 +113,20 @@ class ChatController &lt; PublicController
   end
   #TODO Ideally this is done through roster table on ejabberd.
-  def roster_groups
-    render :text => user.memberships.map {|m| {:jid => m.jid, :name => m.name}}.to_json
+  def rosters
+    rooms = user.memberships.map {|m| {:jid => m.jid, :name => m.name}}
+    friends = user.friends.map {|f| {:jid => f.jid, :name => f.name}}
+    rosters = {:rooms => rooms, :friends => friends}
+    render :text => rosters.to_json
+  end
+
+  def availabilities
+    availabilities = user.friends.map do |friend|
+      status = friend.user.chat_status
+      status = 'offline' if status.blank?
+      {:jid => friend.jid, :status => status}
+    end
+    render :text => availabilities.to_json
   end
   protected
@@ -98,6 +98,8 @@ class InviteController &lt; PublicController
     scope = profile.invite_friends_only ? user.friends : environment.people
     scope = scope.not_members_of(profile) if profile.organization?
     scope = scope.not_friends_of(profile) if profile.person?
+    scope = scope.distinct(false).group("profiles.id")
+
     results = find_by_contents(:people, environment, scope, params['q'], {:page => 1}, {:joins => :user})[:results]
     render :text => prepare_to_token_input(results).to_json
   end
@@ -13,12 +13,13 @@ class ProfileController &lt; PublicController
   protect 'send_mail_to_members', :profile, :only => [:send_mail]
+  ACTIVITIES_PER_PAGE = 15
+
   def index
-    @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
-    if logged_in? && current_person.follows?(@profile)
-      @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
-      @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
-    end
+    @offsets = {:wall => 0, :network => 0}
+    page = (params[:page] || 1).to_i
+    @network_activities = loop_fetch_activities(@profile.tracked_notifications, :network, page) if !@profile.is_a?(Person) || follow_profile?
+    @activities = loop_fetch_activities(@profile.activities, :wall, page) if follow_profile?
     @tags = profile.article_tags
     allow_access_to_page
   end
@@ -231,6 +232,7 @@ class ProfileController &lt; PublicController
     @scrap = Scrap.new(params[:scrap])
     @scrap.sender= sender
     @scrap.receiver= receiver
+    @scrap.marked_people = treat_followed_entries(params[:filter_followed])
     @tab_action = params[:tab_action]
     @message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
     activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
@@ -249,18 +251,44 @@ class ProfileController &lt; PublicController
       render :partial => 'profile_activities_list', :locals => {:activities => activities}
     else
       network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
-      render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}
+      render :partial => 'profile_network_activities', :locals => {:activities => network_activities}
     end
   end
-  def view_more_activities
-    @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
-    render :partial => 'profile_activities_list', :locals => {:activities => @activities}
+  def search_followed
+    result = []
+    circles = find_by_contents(:circles, user, user.circles.where(:profile_type => 'Person'), params[:q])[:results]
+    followed = find_by_contents(:followed, user, Profile.followed_by(user), params[:q])[:results]
+    result = circles + followed
+    render :text => prepare_to_token_input_by_class(result).to_json
   end
-  def view_more_network_activities
-    @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
-    render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}
+  def loop_fetch_activities(base_activities, kind, page)
+    activities = nil
+    while activities.nil? || (activities.empty? && page <= activities.total_pages)
+      activities = base_activities.offset(@offsets[kind.to_sym]).paginate(:per_page => ACTIVITIES_PER_PAGE, :page => page)
+      activities = filter_activities(activities, kind.to_sym)
+      page += 1
+    end
+    activities
+  end
+
+  def view_more_activities
+    @activities = nil
+    @offsets = params[:offsets]
+    page = (params[:page] || 1).to_i
+    kind = params[:kind]
+
+    if kind == 'wall'
+      base_activities = @profile.activities
+      partial = 'profile_activities_list'
+    else
+      base_activities = @profile.tracked_notifications
+      partial = 'profile_network_activities'
+    end
+
+    @activities = loop_fetch_activities(base_activities, kind, page)
+    render :partial => partial, :locals => {:activities => @activities}
   end
   def more_comments
@@ -434,7 +462,6 @@ class ProfileController &lt; PublicController
     end
   end
-
   protected
   def check_access_to_profile
@@ -480,4 +507,39 @@ class ProfileController &lt; PublicController
     render_not_found unless profile.allow_followers?
   end
+  def treat_followed_entries(entries)
+    return [] if entries.blank? || profile != user
+
+    followed = []
+    entries.split(',').map do |entry|
+      klass, identifier = entry.split('_')
+      case klass
+      when 'Person'
+        followed << Person.find(identifier)
+      when 'Circle'
+        circle = Circle.find(identifier)
+        followed += Profile.in_circle(circle)
+      end
+    end
+    followed.uniq
+  end
+
+  def filter_activities(activities, kind)
+    @offsets ||= {:wall => 0, :network => 0}
+    return activities if environment.admins.include?(user)
+    activities = Array(activities)
+    initial_count = activities.count
+    activities.delete_if do |activity|
+      activity = ActivityPresenter.for(activity)
+      next if activity.involved?(user)
+      activity.hidden_for?(user)
+    end
+    @offsets[kind] = @offsets[kind].to_i
+    @offsets[kind] += initial_count - activities.count
+    activities
+  end
+
+  def follow_profile?
+    logged_in? && current_person.follows?(@profile)
+  end
 end
@@ -111,10 +111,6 @@ module ApplicationHelper
       content = capture(&block)
     end
-    if options[:type] == :textile
-      content = RedCloth.new(content).to_html
-    end
-
     options[:class] = '' if ! options[:class]
     options[:class] += ' button icon-help' # with-text
@@ -132,13 +128,6 @@ module ApplicationHelper
     text
   end
-  # alias for <tt>help(content, :textile)</tt>. You can pass a block in the
-  # same way you would do if you called <tt>help</tt> directly.
-  def help_textile(content = nil, link_name = nil, options = {}, &block)
-    options[:type] = :textile
-    help(content, link_name, options, &block)
-  end
-
   # TODO: do something more useful here
   # TODO: test this helper
   # TODO: add an icon?
@@ -531,8 +520,6 @@ module ApplicationHelper
       html = "\n"
       values.each { |val, h_val|
         id = object_name.to_s() +'_'+ method.to_s() +'_'+ val.to_s()
-        # Não está apresentando o sexo selecionado ao revisitar
-        # http://localhost:3000/myprofile/manuel/profile_editor/edit  :-(
         html += self.class.content_tag( 'span',
             @template.radio_button( object_name, method, val,
                                     :id => id, :object => @object ) +
@@ -543,6 +530,7 @@ module ApplicationHelper
           html += "<br />\n".html_safe
         end
       }
+      html = html.html_safe
       html += "<br />\n".html_safe if line_size == 0 || ( values.size % line_size ) > 0
       column = object.class.columns_hash[method.to_s] if object
       text =
@@ -552,7 +540,7 @@ module ApplicationHelper
         )
       label_html = self.class.content_tag 'label', text,
                                         :class => 'formlabel'
-      control_html = self.class.content_tag 'div', html,
+      control_html = self.class.content_tag 'div', html.html_safe,
                                         :class => 'formfield type-radio '+
                                         'fieldgroup linesize'+line_size.to_s()
@@ -977,11 +965,16 @@ module ApplicationHelper
     content_tag(:div, _('Source: %s') % source_url, :id => 'article-source') unless source_url.nil?
   end
-  def task_information(task)
+  def task_information(task, params = {})
     values = {}
     values.merge!(task.information[:variables]) if task.information[:variables]
     values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
-    values.merge!({:target => link_to(task.target.name, task.target.url)}) if (task.target && task.target.respond_to?(:url))
+    if (task.target && task.target.respond_to?(:url))
+      values.merge!({:target => link_to(task.target.name, task.target.url)})
+      target_detail = _("in %s").html_safe % values[:target]
+      target_detail = '' if task.target.identifier == params[:profile]
+      values.merge!({:target_detail => target_detail}) 
+    end
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
     (task.information[:message] % values).html_safe
@@ -992,8 +985,8 @@ module ApplicationHelper
   end
   def add_zoom_to_images
-    stylesheet_link_tag('jquery.fancybox') +
-    javascript_include_tag('jquery.fancybox.pack') +
+    stylesheet_link_tag('vendor/jquery.fancybox') +
+    javascript_include_tag('vendor/jquery.fancybox.pack') +
     javascript_tag("apply_zoom_to_images(#{_('Zoom in').to_json})")
   end
@@ -1185,10 +1178,10 @@ module ApplicationHelper
     end
     controller_target = suggestion.suggestion_type == 'Person' ? :friends : :memberships
-    profiles << link_to("<big> +#{suggestion.profile_connections.count - 4}</big>", :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.profile_connections.count > 4
+    profiles << link_to("<big> +#{suggestion.profile_connections.count - 4}</big>".html_safe, :controller => controller_target, :action => :connections, :id => suggestion.suggestion_id) if suggestion.profile_connections.count > 4
     if profiles.present?
-      content_tag(:div, profiles.join , :class => 'profile-connections')
+      content_tag(:div, profiles.safe_join , :class => 'profile-connections')
     else
       ''
     end
@@ -1245,4 +1238,15 @@ module ApplicationHelper
     content.html_safe
   end
+  def current_editor_is?(editor)
+    editor.blank? ? false : current_editor == editor
+  end
+
+  def current_editor(mode = '')
+    editor = @article.editor || Article::Editor::TINY_MCE unless @article.nil?
+    editor ||= (current_person.nil? || current_person.editor.nil?) ? Article::Editor::TINY_MCE : current_person.editor
+    editor += '_' + mode unless mode.blank?
+    editor
+  end
+
 end
@@ -61,7 +61,9 @@ module ArticleHelper
         'div',
         check_box(:article, :display_versions) +
         content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
-      ) : '')
+      ) : '') +
+
+      (self.respond_to?(:extra_options) ? self.extra_options : "")
     )
   end
@@ -161,6 +163,10 @@ module ArticleHelper
     array.map { |object| {:label => object.name, :value => object.name} }
   end
+  def prepare_to_token_input_by_class(array)
+    array.map { |object| {:id => "#{object.class.name}_#{object.id || object.name}", :name => "#{object.name} (#{_(object.class.name)})", :class => object.class.name}}
+  end
+
   def cms_label_for_new_children
     _('New article')
   end
@@ -14,7 +14,7 @@ module ChatHelper
         :class => icon_class + ' simplemenu-trigger'
       ) +
       content_tag('ul',
-        links.map{|link| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),
+        links.map{|link| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n").html_safe,
         :style => 'display: none; z-index: 100',
         :class => 'simplemenu-submenu'
       ),
@@ -6,7 +6,7 @@ module EmailTemplateHelper
       params[:subject] = params[:email_template].parsed_subject(params[:template_params])
       params[:content_type] = "text/html"
     end
-    mail(params.except(:email_template))
+    mail(params.except(:email_template, :template_params))
   end
 end
@@ -0,0 +1,13 @@
+module GalleryHelper
+
+  include ArticleHelper
+
+  def extra_options
+    content_tag(
+        'div',
+        check_box(:article, :allow_download) +
+        content_tag('label', _('Allow images from this gallery to be downloaded'), :for => 'article_allow_download')
+    )
+  end
+
+end
@@ -158,4 +158,8 @@ module ProfileEditorHelper
     end
   end
+  def select_editor(title, object, method, options)
+    labelled_form_field(title, select(object, method, current_person.available_editors.map { |k,v| [v, k] }))
+  end
+
 end
@@ -45,7 +45,8 @@ module SearchHelper
   def search_page_title(title, category = nil)
     title = "<h1>" + title
     title += ' - <small>' + category.name + '</small>' if category
-    title + "</h1>"
+    title += "</h1>"
+    title.html_safe
   end
   def category_context(category, url)
@@ -67,4 +67,17 @@ module TagsHelper
     end.join("\n").html_safe
   end
+  def linked_article_tags(article)
+    if @profile
+      # We are rendering a page inside a profile, so link to the profile tag search.
+      url = { :controller => 'profile', :profile => @profile.identifier, :action => 'tags' }
+      tagname_option = :id
+    else
+      # We are rendering a page outside a profile, so link to the global tag search.
+      url = { :action => 'tag' }
+      tagname_option = :tag
+    end
+    article.tags.map { |t| link_to(t, url.merge(tagname_option=>t.name) ) }.join("\n")
+  end
+
 end
@@ -18,7 +18,8 @@ module TinymceHelper
         insertdatetime media nonbreaking save table contextmenu directionality
         emoticons template paste textcolor colorpicker textpattern],
       :image_advtab => true,
-      :language => tinymce_language
+      :language => tinymce_language,
+      :selector => '.' + current_editor(options[:mode])
     options[:toolbar1] = toolbar1(options[:mode])
     options[:menubar] = menubar(options[:mode])
@@ -5,10 +5,11 @@ module TokenHelper
   end
   def token_input_field_tag(name, element_id, search_action, options = {}, text_field_options = {}, html_options = {})
-    options[:min_chars] ||= 3
+    options[:min_chars] ||= 2
     options[:hint_text] ||= _("Type in a search term")
     options[:no_results_text] ||= _("No results")
     options[:searching_text] ||= _("Searching...")
+    options[:placeholder] ||= 'null'
     options[:search_delay] ||= 1000
     options[:prevent_duplicates] ||=  true
     options[:backspace_delete_item] ||= false
@@ -20,6 +21,9 @@ module TokenHelper
     options[:on_delete] ||= 'null'
     options[:on_ready] ||= 'null'
     options[:query_param] ||= 'q'
+    options[:theme] ||= 'null'
+    options[:results_formatter] ||= 'null'
+    options[:token_formatter] ||= 'null'
     result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
     result += javascript_tag("jQuery('##{element_id}')
@@ -29,6 +33,7 @@ module TokenHelper
         hintText: #{options[:hint_text].to_json},
         noResultsText: #{options[:no_results_text].to_json},
         searchingText: #{options[:searching_text].to_json},
+        placeholder: #{options[:placeholder].to_json},
         searchDelay: #{options[:search_delay].to_json},
         preventDuplicates: #{options[:prevent_duplicates].to_json},
         backspaceDeleteItem: #{options[:backspace_delete_item].to_json},
@@ -39,6 +44,9 @@ module TokenHelper
         onAdd: #{options[:on_add]},
         onDelete: #{options[:on_delete]},
         onReady: #{options[:on_ready]},
+        theme: #{options[:theme] == 'null' ? options[:theme] : options[:theme].to_json},
+        resultsFormater: #{options[:results_formatter]},
+        tokenFormater: #{options[:token_formatter]},
       });
     ")
     result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
@@ -11,7 +11,7 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
     tracked_action = ActionTracker::Record.find(tracked_action_id)
     return unless tracked_action.user.present?
     target = tracked_action.target
-    if target.is_a?(Community) && ( NOTIFY_ONLY_COMMUNITY.include?(tracked_action.verb) || ! target.public_profile )
+    if target.is_a?(Community) && NOTIFY_ONLY_COMMUNITY.include?(tracked_action.verb)
       ActionTrackerNotification.create(:profile_id => target.id, :action_tracker_id => tracked_action.id)
       return
     end
@@ -19,8 +19,13 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
     # Notify the user
     ActionTrackerNotification.create(:profile_id => tracked_action.user.id, :action_tracker_id => tracked_action.id)
-    # Notify all followers
-    ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+    if target.is_a?(Scrap) && target.marked_people.present?
+      # Notify only marked people
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT profiles.id, #{tracked_action.id} FROM profiles WHERE profiles.id IN (#{target.marked_people.map(&:id).join(',')})")
+    else
+      # Notify all followers
+      ActionTrackerNotification.connection.execute("INSERT INTO action_tracker_notifications(profile_id, action_tracker_id) SELECT DISTINCT c.person_id, #{tracked_action.id} FROM profiles_circles AS p JOIN circles as c ON c.id = p.circle_id WHERE p.profile_id = #{tracked_action.user.id} AND (c.person_id NOT IN (SELECT atn.profile_id FROM action_tracker_notifications AS atn WHERE atn.action_tracker_id = #{tracked_action.id}))")
+    end
     if tracked_action.user.is_a? Organization
       ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " +
@@ -9,9 +9,6 @@ class ApproveArticle &lt; Task
       if target.person? && requestor != target
         self.errors.add(:requestor, _('You can not post articles to other users.'))
       end
-      if target.organization? && !target.members.include?(requestor) && target.environment.portal_community != target
-        self.errors.add(:requestor, _('Only members can post articles on communities.'))
-      end
     end
   end
 class Article < ApplicationRecord
+  module Editor
+    TEXTILE = 'textile'
+    TINY_MCE = 'tiny_mce'
+    RAW_HTML = 'raw_html'
+  end
+
   include SanitizeHelper
   attr_accessible :name, :body, :abstract, :profile, :tag_list, :parent,
@@ -11,7 +17,7 @@ class Article &lt; ApplicationRecord
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers, :archived,
-                  :author, :display_preview, :published_at, :person_followers
+                  :author, :display_preview, :published_at, :person_followers, :editor
   extend ActsAsHavingImage::ClassMethods
   acts_as_having_image
@@ -57,7 +63,7 @@ class Article &lt; ApplicationRecord
     _('Content')
   end
-  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.is_trackable? && !a.image? }
+  track_actions :create_article, :after_create, :keep_params => [:name, :url, :lead, :first_image], :if => Proc.new { |a| a.notifiable? }
   # xss_terminate plugin can't sanitize array fields
   # sanitize_tag_list is used with SanitizeHelper
@@ -177,10 +183,6 @@ class Article &lt; ApplicationRecord
     end
   end
-  def is_trackable?
-    self.published? && self.notifiable? && self.advertise? && self.profile.public_profile
-  end
-
   def external_link=(link)
     if !link.blank? && link !~ /^[a-z]+:\/\//i
       link = 'http://' + link
@@ -518,17 +520,12 @@ class Article &lt; ApplicationRecord
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
-  def self.text_article_types
-    ['TextArticle', 'TextileArticle', 'TinyMceArticle']
-  end
-
   scope :published, -> { where 'articles.published = ?', true }
   scope :folders, -> profile { where 'articles.type IN (?)', profile.folder_types }
   scope :no_folders, -> profile { where 'articles.type NOT IN (?)', profile.folder_types }
   scope :galleries, -> { where "articles.type IN ('Gallery')" }
   scope :images, -> { where :is_image => true }
   scope :no_images, -> { where :is_image => false }
-  scope :text_articles, -> { where 'articles.type IN (?)', text_article_types }
   scope :files, -> { where :type => 'UploadedFile' }
   scope :with_types, -> types { where 'articles.type IN (?)', types }
@@ -711,10 +708,6 @@ class Article &lt; ApplicationRecord
     false
   end
-  def tiny_mce?
-    false
-  end
-
   def folder?
     false
   end
@@ -848,7 +841,7 @@ class Article &lt; ApplicationRecord
   end
   def create_activity
-    if is_trackable? && !image?
+    if notifiable? && !image?
       save_action_for_verb 'create_article', [:name, :url, :lead, :first_image], Proc.new{}, :author
     end
   end
@@ -879,6 +872,10 @@ class Article &lt; ApplicationRecord
     true
   end
+  def editor?(editor)
+    self.editor == editor
+  end
+
   private
   def sanitize_tag_list
@@ -320,6 +320,8 @@ class Block &lt; ApplicationRecord
     false
   end
+  attr_accessor :api_content_params
+
   private
   def home_page_path
 class Circle < ApplicationRecord
+  SEARCHABLE_FIELDS = {
+    :name => {:label => _('Name'), :weight => 1}
+  }
+
+  _('Circle')
+
   has_many :profile_followers
   belongs_to :person
@@ -212,6 +212,9 @@ class Comment &lt; ApplicationRecord
     user == author || user == profile || user.has_permission?(:moderate_comments, profile)
   end
+  # method used by the API
+  alias_method :allow_destroy?, :can_be_destroyed_by?
+
   def can_be_marked_as_spam_by?(user)
     return if user.nil?
     user == profile || user.has_permission?(:moderate_comments, profile)
@@ -122,10 +122,6 @@ class Event &lt; Article
     true
   end
-  def tiny_mce?
-    true
-  end
-
   def notifiable?
     true
   end
@@ -25,7 +25,7 @@ class ExternalFeed &lt; ApplicationRecord
     end
     content = doc.to_s
-    article = TinyMceArticle.new
+    article = TextArticle.new
     article.name = title
     article.profile = blog.profile
     article.body = content
@@ -2,7 +2,7 @@ class FavoriteEnterprisePerson &lt; ApplicationRecord
   attr_accessible :person, :enterprise
-  track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ |f| f.is_trackable? }
+  track_actions :favorite_enterprise, :after_create, keep_params: [:enterprise_name, :enterprise_url], if: proc{ |f| f.notifiable? }
   belongs_to :enterprise
   belongs_to :person
@@ -13,7 +13,7 @@ class FavoriteEnterprisePerson &lt; ApplicationRecord
   protected
-  def is_trackable?
+  def notifiable?
     self.enterprise.public?
   end
 class Gallery < Folder
+  settings_items :allow_download, :type => :boolean, :default => false
+  attr_accessible :allow_download
+
   def self.type_name
     _('Gallery')
   end
@@ -20,33 +20,28 @@ class Organization &lt; Profile
   #   visible.
   #   4) The user is not a member of the organization but the organization is
   #   visible, public and enabled.
-  def self.listed_for_person(person)
+  scope :listed_for_person, lambda { |person|
+
     joins('LEFT JOIN "role_assignments" ON ("role_assignments"."resource_id" = "profiles"."id"
           AND "role_assignments"."resource_type" = \'Profile\') OR (
           "role_assignments"."resource_id" = "profiles"."environment_id" AND
           "role_assignments"."resource_type" = \'Environment\' )')
     .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
     .where(
-      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? )
-        OR
-        ( ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR
-            ( profiles.enabled = ? ) ) AND
-          ( profiles.visible = ? ) )',
-      'profile_admin', 'environment_administrator', Profile.name, person.id,
-      Profile.name, person.id, true, true]
-    ).uniq
-  end
-
-  def self.visible_for_person(person)
-    listed_for_person(person).where(
-      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? )
-        OR
+      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
+        ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR ( profiles.enabled = ?)) AND (profiles.visible = ?) )',
+         'profile_admin', 'environment_administrator', Profile.name, person.id, Profile.name, person.id,  true, true]
+     ).uniq
+  }
+
+  scope :visible_for_person, lambda { |person|
+	    listed_for_person(person).where( ['
         ( ( role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR
-          ( profiles.enabled = ? AND profiles.public_profile = ? ) )',
-      'profile_admin', 'environment_administrator', Profile.name, person.id,
+          ( profiles.enabled = ? AND profiles.public_profile = ? ) )',      
       Profile.name, person.id,  true, true]
     )
-  end
+  }
+
   settings_items :closed, :type => :boolean, :default => false
   def closed?
 # A person is the profile of an user holding all relationships with the rest of the system
 class Person < Profile
-  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles
+  attr_accessible :organization, :contact_information, :sex, :birth_date, :cell_phone, :comercial_phone, :jabber_id, :personal_website, :nationality, :address_reference, :district, :schooling, :schooling_status, :formation, :custom_formation, :area_of_study, :custom_area_of_study, :professional_activity, :organization_website, :following_articles, :editor
   SEARCH_FILTERS = {
     :order => %w[more_recent more_popular more_active],
@@ -124,6 +124,8 @@ class Person &lt; Profile
     where 'profile_suggestions.suggestion_type = ? AND profile_suggestions.enabled = ?', 'Community', true
   }, through: :suggested_profiles, source: :suggestion
+  has_and_belongs_to_many :marked_scraps, :join_table => :private_scraps, :class_name => 'Scrap'
+
   scope :more_popular, -> { order 'friends_count DESC' }
   scope :abusers, -> {
@@ -344,6 +346,8 @@ class Person &lt; Profile
   validates_associated :user
+  validates :editor, inclusion: { in: lambda { |p| p.available_editors } }
+
   def email
     self.user.nil? ? nil : self.user.email
   end
@@ -616,8 +620,21 @@ class Person &lt; Profile
     Profile.followed_by self
   end
+  def editor?(editor)
+    self.editor == editor
+  end
+
   def in_social_circle?(person)
     self.is_a_friend?(person) || super
   end
+  def available_editors
+    available_editors = {
+      Article::Editor::TINY_MCE => _('TinyMCE'),
+      Article::Editor::TEXTILE => _('Textile')
+    }
+    available_editors.merge!({Article::Editor::RAW_HTML => _('Raw HTML')}) if self.is_admin?
+    available_editors
+  end
+
 end
@@ -885,13 +885,14 @@ private :generate_url, :url_options
   # returns +true+ if the given +user+ can see profile information about this
   # +profile+, and +false+ otherwise.
-  def display_info_to?(user)
+  def display_info_to?(user = nil)
     if self.public?
       true
     else
       display_private_info_to?(user)
     end
   end
+  alias_method :display_to?, :display_info_to?
   after_save :update_category_from_region
   def update_category_from_region
@@ -1,17 +0,0 @@
-class RawHTMLArticle < TextArticle
-
-  def self.type_name
-    _('HTML')
-  end
-
-  def self.short_description
-    _('Raw HTML text article')
-  end
-
-  def self.description
-    _('Allows HTML without filter (only for admins).')
-  end
-
-  xss_terminate :only => [  ]
-
-end
@@ -2,7 +2,7 @@ class Scrap &lt; ApplicationRecord
   include SanitizeHelper
-  attr_accessible :content, :sender_id, :receiver_id, :scrap_id
+  attr_accessible :content, :sender_id, :receiver_id, :scrap_id, :marked_people
   SEARCHABLE_FIELDS = {
     :content => {:label => _('Content'), :weight => 1},
@@ -19,6 +19,8 @@ class Scrap &lt; ApplicationRecord
     where profile_activities: {activity_type: 'Scrap'}
   }, foreign_key: :activity_id, dependent: :destroy
+  has_and_belongs_to_many :marked_people, :join_table => :private_scraps, :class_name => 'Person'
+
   after_create :create_activity
   after_update :update_activity
@@ -65,6 +67,10 @@ class Scrap &lt; ApplicationRecord
     sender != receiver && (is_root? ? root.receiver.receives_scrap_notification? : receiver.receives_scrap_notification?)
   end
+  def display_to?(user = nil)
+    marked_people.blank? || marked_people.include?(user)
+  end
+
   protected
   def create_activity
@@ -44,7 +44,7 @@ class SuggestArticle &lt; Task
       type = article[:type].constantize
       return type if type < Article
     end
-    TinyMceArticle
+    TextArticle
   end
   def perform
@@ -65,7 +65,7 @@ class SuggestArticle &lt; Task
   def information
     variables = requestor.blank? ? {:requestor => sender} : {}
-    { :message => _('%{requestor} suggested the publication of the article: %{subject}.').html_safe,
+    { :message => _('%{requestor} suggested the publication %{target_detail} of the article: %{subject}.').html_safe,
       :variables => variables }
   end
 # a base class for all text article types.
 class TextArticle < Article
-  xss_terminate :only => [ :name ], :on => 'validation'
+  def self.short_description
+    _('Text article')
+  end
+
+  def self.description
+    _('Text article to create user content.')
+  end
+
+  xss_terminate :only => [ :name, :body, :abstract ], :with => 'white_list', :on => 'validation', :if => lambda { |a| !a.editor?(Article::Editor::TEXTILE) && !a.editor?(Article::Editor::RAW_HTML) }
+
+  include WhiteListFilter
+  filter_iframes :abstract, :body
+  def iframe_whitelist
+    profile && profile.environment && profile.environment.trusted_sites_for_iframe
+  end
   def self.type_name
     _('Article')
@@ -21,6 +35,18 @@ class TextArticle &lt; Article
     true
   end
+  def can_display_media_panel?
+    true
+  end
+
+  def self.can_display_blocks?
+    false
+  end
+
+  def notifiable?
+    true
+  end
+
   before_save :set_relative_path
   def set_relative_path
@@ -43,4 +69,24 @@ class TextArticle &lt; Article
     parent && parent.kind_of?(Blog) && parent.display_preview
   end
+  def to_html(options ={})
+    content = super(options)
+    content = convert_textile_to_html(content) if self.editor?(Article::Editor::TEXTILE)
+    content
+  end
+
+  def lead(length = nil)
+    content = super(length)
+    content = convert_textile_to_html(content) if self.editor?(Article::Editor::TEXTILE)
+    content
+  end
+
+  protected
+
+  def convert_textile_to_html(textile)
+    converter = RedCloth.new(textile|| '')
+    converter.hard_breaks = false
+    sanitize_html(converter.to_html, :white_list)
+  end
+
 end
@@ -1,44 +0,0 @@
-class TextileArticle < TextArticle
-  include SanitizeHelper
-
-  def self.short_description
-    _('Text article with Textile markup language')
-  end
-
-  def self.description
-    _('Accessible alternative for visually impaired users.')
-  end
-
-  def to_html(options ={})
-    convert_to_html(body)
-  end
-
-  def lead(length = nil)
-    if abstract.blank?
-      super
-    else
-      convert_to_html(abstract)
-    end
-  end
-
-  def notifiable?
-    true
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-  def self.can_display_blocks?
-    false
-  end
-
-  protected
-
-  def convert_to_html(textile)
-    converter = RedCloth.new(textile|| '')
-    converter.hard_breaks = false
-    sanitize_html(converter.to_html, :white_list)
-  end
-
-end
@@ -1,37 +0,0 @@
-class TinyMceArticle < TextArticle
-
-  def self.short_description
-    _('Text article with visual editor')
-  end
-
-  def self.description
-    _('Not accessible for visually impaired users.')
-  end
-
-  xss_terminate :only => [  ]
-
-  xss_terminate :only => [ :name, :abstract, :body ], :with => 'white_list', :on => 'validation'
-
-  include WhiteListFilter
-  filter_iframes :abstract, :body
-  def iframe_whitelist
-    profile && profile.environment && profile.environment.trusted_sites_for_iframe
-  end
-
-  def notifiable?
-    true
-  end
-
-  def tiny_mce?
-    true
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-  def self.can_display_blocks?
-    false
-  end
-
-end
@@ -9,6 +9,12 @@ class UploadedFile &lt; Article
   attr_accessible :uploaded_data, :title
+  include Noosfero::Plugin::HotSpot
+
+  def environment
+    profile.environment
+  end
+
   def self.type_name
     _('File')
   end
@@ -184,8 +190,12 @@ class UploadedFile &lt; Article
     true
   end
+  def image?
+    mime_type =~ /^image\//
+  end
+
   def notifiable?
-    true
+    !image?
   end
 end
@@ -0,0 +1,5 @@
+class ActivityPresenter::Generic < ActivityPresenter
+  def self.accepts?(instance)
+    1
+  end
+end
@@ -0,0 +1,44 @@
+class ActivityPresenter < Presenter
+  def self.base_class
+    ActionTracker::Record
+  end
+
+  def self.available?(instance)
+    instance.kind_of?(ActionTracker::Record) || instance.kind_of?(ProfileActivity)
+  end
+
+  def self.target(instance)
+    if instance.kind_of?(ProfileActivity)
+      target(instance.activity)
+    elsif instance.kind_of?(ActionTracker::Record)
+       instance.target
+    else
+      instance
+    end
+  end
+
+  def self.owner(instance)
+    instance.kind_of?(ProfileActivity) ? instance.profile : instance.user
+  end
+
+  def target
+    self.class.target(encapsulated_instance)
+  end
+
+  def owner
+    self.class.owner(encapsulated_instance)
+  end
+
+  def hidden_for?(user)
+    target.respond_to?(:display_to?) && !target.display_to?(user)
+  end
+
+  def involved?(user)
+    owner == user || target == user
+  end
+end
+
+# Preload ActivityPresenter subclasses to allow `Presenter.for()` to work
+Dir.glob(File.join('app', 'presenters', 'activity', '*.rb')) do |file|
+  load file
+end
@@ -0,0 +1,7 @@
+# Made to encapsulate any UploadedFile
+class FilePresenter::Generic < FilePresenter
+  # if returns low priority, because it is generic.
+  def self.accepts?(f)
+    1 if f.is_a? UploadedFile
+  end
+end
@@ -0,0 +1,23 @@
+class FilePresenter::Image < FilePresenter
+  def self.accepts?(f)
+    return nil unless f.respond_to? :image?
+    f.image? ? 10 : nil
+  end
+
+  def sized_icon(size)
+    public_filename size
+  end
+
+  def icon_name
+    public_filename :icon
+  end
+
+  def short_description
+    _('Image (%s)') % content_type.split('/')[1].upcase
+  end
+
+  #Overwriting method from FilePresenter to allow download of images
+  def download?(view = nil)
+    view.blank? || view == 'false'
+  end
+end
@@ -0,0 +1,80 @@
+class FilePresenter < Presenter
+  def self.base_class
+    Article
+  end
+
+  def self.available?(instance)
+    instance.kind_of?(UploadedFile) && !instance.kind_of?(Image)
+  end
+
+  def download? view = nil
+    view.blank?
+  end
+
+  def short_description
+    file_type = if content_type.present?
+      content_type.sub(/^application\//, '').sub(/^x-/, '').sub(/^image\//, '')
+    else
+      _('Unknown')
+    end
+    _("File (%s)") % file_type
+  end
+
+  # Define the css classes to style the page fragment with the file related
+  # content. If you want other classes to identify this area to your
+  # customized presenter, so do this:
+  #   def css_class_list
+  #     [super, 'myclass'].flatten
+  #   end
+  def css_class_list
+    [ encapsulated_instance.css_class_list,
+      'file-' + self.class.to_s.split(/:+/).map(&:underscore)[1..-1].join('-'),
+      'content-type_' + self.content_type.split('/')[0],
+      'content-type_' + self.content_type.gsub(/[^a-z0-9]/i,'-')
+    ].flatten
+  end
+
+  # Enable file presenter to customize the css classes on view_page.rhtml
+  # You may not overwrite this method on your customized presenter.
+  def css_class_name
+    [css_class_list].flatten.compact.join(' ')
+  end
+
+  # The generic icon class-name or the specific file path.
+  # You may replace this method on your custom FilePresenter.
+  # See the current used icons class-names in public/designs/icons/tango/style.css
+  def icon_name
+    if mime_type
+      [ mime_type.split('/')[0], mime_type.gsub(/[^a-z0-9]/i, '-') ]
+    else
+      'upload-file'
+    end
+  end
+
+  # Automatic render `file_presenter/<custom>.html.erb` to display your
+  # custom presenter html content.
+  # You may not overwrite this method on your customized presenter.
+  # A variable with the same presenter name will be created to refer
+  # to the file object.
+  # Example:
+  # The `FilePresenter::Image` render `file_presenter/image.html.erb`
+  # inside the `file_presenter/image.html.erb` you can access the
+  # required `FilePresenter::Image` instance in the `image` variable.
+  def to_html(options = {})
+    file = self
+    proc do
+      render :partial => file.class.to_s.underscore,
+             :locals => { :options => options },
+             :object => file
+    end
+  end
+end
+
+Dir.glob(File.join('app', 'presenters', 'file', '*.rb')) do |file|
+  load file
+end
+
+# Preload FilePresenters from plugins to allow `FilePresenter.for()` to work
+Dir.glob(File.join('plugins', '*', 'lib', 'presenters', '*.rb')) do |file|
+  load file
+end
@@ -1,7 +0,0 @@
-# Made to encapsulate any UploadedFile
-class FilePresenter::Generic < FilePresenter
-  # if returns low priority, because it is generic.
-  def self.accepts?(f)
-    1 if f.is_a? UploadedFile
-  end
-end
@@ -1,23 +0,0 @@
-class FilePresenter::Image < FilePresenter
-  def self.accepts?(f)
-    return nil unless f.respond_to? :image?
-    f.image? ? 10 : nil
-  end
-
-  def sized_icon(size)
-    public_filename size
-  end
-
-  def icon_name
-    public_filename :icon
-  end
-
-  def short_description
-    _('Image (%s)') % content_type.split('/')[1].upcase
-  end
-
-  #Overwriting method from FilePresenter to allow download of images
-  def download?(view = nil)
-    view.blank? || view == 'false'
-  end
-end
@@ -111,7 +111,7 @@
   <% unless @terms_of_use.blank? %>
     <div id='terms-of-use-box' class='formfieldline'>
-      <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
+      <%= labelled_check_box(_('I accept the %s').html_safe % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
     </div>
   <% end %>
@@ -2,4 +2,4 @@
   <%= _('This text will be shown to the user on the top of the sign up form.') %>
 </div>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_intro, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
 <div class='description'>
   <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %>
 </div>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
 <div class='description'>
   <%= _('If this content is left blank, the following page will be displayed to the user:') %>
@@ -4,4 +4,4 @@
 </div>
 <%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => current_editor)) %>
@@ -31,4 +31,4 @@
 <%= balanced_table(fields)%>
 <br />
-<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
+<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => current_editor) %>
-<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => 'mceEditor' %>
+<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => current_editor %>
 <h2><%= _('Site info') %></h2>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for :environment, :url => {:action => 'site_info'} do |f| %>
-  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
+  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%', :class => current_editor %>
   <%= button_bar do %>
     <%= submit_button(:save, _('Save')) %>
@@ -2,8 +2,6 @@
 <%= error_messages_for :environment %>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for :environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
 <h1>EndPoints</h1>
 <div style="float: right">
-  <%= s_('api-playground|Try the %s') % link_to('API Playground', {:controller => 'api', :action => 'playground'}) %>
+  <%= s_('api-playground|Try the %s').html_safe % link_to('API Playground', {:controller => 'api', :action => 'playground'}) %>
 </div>
 <%= endpoints.map do |endpoint|
   app = endpoint.options[:app].to_s
   unless app.blank?
-    content_tag(:h2, app.split('::').last.to_s, title: app) +
+    content_tag(:h2, app.split('::').last.to_s, title: app).html_safe +
     (content_tag :ul do
       endpoint.routes.map do |route|
         content_tag :li do
           content_tag(:strong, route.route_method) + ' ' +
-          route.route_path.gsub(':version', content_tag(:b, route.route_version))
+          route.route_path.gsub(':version', content_tag(:b, route.route_version)).html_safe
         end
-      end.join "\n"
+      end.safe_join "\n"
     end)
   end
-end.join "\n" %>
+end.safe_join "\n" %>
-<%= stylesheet_link_tag 'spectrum.css' %>
-<%= javascript_include_tag "spectrum.js" %>
+<%= stylesheet_link_tag 'vendor/spectrum.css' %>
+<%= javascript_include_tag "vendor/spectrum.js" %>
 <%= javascript_include_tag "colorpicker-noosfero.js" %>
 <%= error_messages_for 'category' %>
-_tiny_mce_article.html.erb
 \ No newline at end of file
+_text_article.html.erb
 \ No newline at end of file
@@ -2,8 +2,6 @@
 <h1><%= _('My Blog') %></h1>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
 <%= render :partial => 'general_fields' %>
@@ -53,7 +51,7 @@
   %>
 </div>
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :rows => 10, :class => current_editor)) %>
 <div id="blog-image-builder">
   <%= f.fields_for :image_builder, @article.image do |i| %>
-<%= render :file => 'shared/tiny_mce' %>
-
-<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%', :class => 'mceEditor')) %>
+<%= labelled_form_field(_('Text'), text_area(:article, 'body', :cols => 40, :style => 'width:99%', :class => current_editor)) %>
 <%= required_fields_message %>
-<%# TODO add Textile help here %>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field('name', :size => '64', :maxlength => 150) %>
 <%= render :partial => 'general_fields' %>
@@ -16,4 +13,4 @@
 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
-<%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :body_label => 'Information about the event:'} %>
+<%= render :partial => 'shared/lead_and_body', :locals => {:body_label => 'Information about the event:'} %>
@@ -4,18 +4,16 @@
 <%= required_fields_message %>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= required f.text_field(:name, :size => '64', :maxlength => 150, :onchange => "updateUrlField(this, 'article_slug')") %>
 <%= render :partial => 'general_fields' %>
-<%= labelled_form_field(_('Description:'), text_area(:article, :body, :class => 'mceEditor', :cols => 64, :rows => 10)) %>
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :class => current_editor, :cols => 64, :rows => 10)) %>
 <%= labelled_form_field(_('Posts per page:'), f.select(:posts_per_page, Forum.posts_per_page_options)) %>
 <%= labelled_form_field(_('Has terms of use:'), check_box(:article, :has_terms_of_use))%>
 <div id="text_area_terms_of_use">
-  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => 'mceEditor',:cols => 64, :rows => 10)) %>
+  <%= labelled_form_field(_('Terms of use:'), text_area(:article, :terms_of_use, :class => current_editor,:cols => 64, :rows => 10)) %>
 </div>
@@ -1,8 +0,0 @@
-<%= required_fields_message %>
-
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
-
-<%= render :partial => 'text_fields' %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-<%= render :partial => 'shared/lead_and_body' %>
@@ -0,0 +1,10 @@
+<%= required_fields_message %>
+
+<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
+
+<%= render :partial => 'text_fields' %>
+<%= render :partial => 'general_fields' %>
+<%= render :partial => 'translatable' %>
+
+<%= render :partial => 'shared/lead_and_body' %>
+
@@ -7,7 +7,7 @@
   <div class='header'><strong><%= _('Insert media') %></strong><%= button('vertical-toggle', _('Show/Hide'), '#') %></div>
-  <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
+  <%= render(:partial => 'textile_quick_reference') if @article.editor?(Article::Editor::TEXTILE) %>
   <div class='text-editor-sidebar-box' id='media-upload-box'>
     <div id='media-upload-form'>
       <%= form_tag({ :action => 'media_upload' }, :multipart => true) do %>
@@ -48,4 +48,4 @@
 </script>
 <%= render :partial => 'media_new_folder', :locals => {:default_folder => default_folder} %>
-<%= javascript_include_tag 'jquery.fileupload.js', 'tmpl.js', 'media-panel.js' %>
+<%= javascript_include_tag 'vendor/jquery.fileupload.js', 'vendor/tmpl.js', 'media-panel.js' %>
@@ -1,10 +0,0 @@
-<%= required_fields_message %>
-
-<%# TODO add Textile help here %>
-
-<%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '72', :maxlength => 150)) %>
-
-<%= render :partial => 'text_fields' %>
-<%= render :partial => 'general_fields' %>
-<%= render :partial => 'translatable' %>
-<%= render :partial => 'shared/lead_and_body' %>
@@ -1,12 +0,0 @@
-<%= required_fields_message %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<div>
-  <%= required labelled_form_field(_('Title'), text_field(:article, 'name', :size => '64', :maxlength => 150)) %>
-
-  <%= render :partial => 'text_fields' %>
-  <%= render :partial => 'general_fields' %>
-  <%= render :partial => 'translatable' %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true} %>
-</div>
@@ -34,7 +34,7 @@
   <br />
-  <%= f.text_field('tag_list', :size => 64) %>
+  <%= f.text_field 'tag_list', size: 64, value: @article.tag_list.join(',') %>
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
   <script>
@@ -2,8 +2,6 @@
 <%= required_fields_message %>
-<%= render :file => 'shared/tiny_mce' %>
-
 <%= labelled_form_for 'task' do |f| %>
   <%= required labelled_form_field(_('Title'), text_field('task[article]', 'name', :size => 50)) %>
@@ -17,7 +15,7 @@
     <%= required labelled_form_field(_('Email'), text_field(:task, 'email')) %>
   <% end %>
-  <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :object => 'task[article]'} %>
+  <%= render :partial => 'shared/lead_and_body', :locals => {:object => 'task[article]'} %>
   <%= hidden_field_tag('back_to', @back_to) %>
@@ -25,8 +25,7 @@
   <%= required f.text_field(:subject) %>
-  <%= render :file => 'shared/tiny_mce' %>
-  <%= required f.text_area(:message, :class => 'mceEditor') %>
+  <%= required f.text_area(:message, :class => current_editor) %>
   <%= labelled_form_field check_box(:contact, :receive_a_copy) + _('I want to receive a copy of the message in my e-mail.'), '' %>
@@ -19,8 +19,7 @@
         <%= @template_params_allowed %>
       </div>
     </div>
-    <%= render :file => 'shared/tiny_mce' %>
-    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => current_editor)) %>
   </div>
   <div class="actions">
 <% if image.gallery? && options[:gallery_view] %>
 <%
   images = image.parent.images
-  current_index = images.index(image.encapsulated_file)
+  current_index = images.index(image.encapsulated_instance)
   total_of_images = images.count
   link_to_previous = if current_index >= 1
    link_to(_('&laquo; Previous').html_safe, images[current_index - 1].view_url, :class => 'previous')
@@ -30,7 +30,10 @@
 <img src="<%= [Noosfero.root, image.public_filename(:display)].join %>" class="<%=image.css_class_name%>">
+<% if image.parent.is_a?(Gallery) && image.parent.allow_download %>
+  <%= link_to _('Download image'),  [Noosfero.root, image.public_filename(:display)].join, download: image.filename, id: 'download-image-id', class: "button with-text icon-save" %>
+<% end %>
+
 <div class="uploaded-file-description <%= 'empty' if image.abstract.blank? %>">
   <%= image.abstract %>
 </div>
-
 <h1><%= _('Terms of use - %s') % environment.name %></h1>
-<%= environment.terms_of_use %>
+<%= environment.terms_of_use.html_safe %>
@@ -35,6 +35,9 @@
       noosfero.profile = <%= (@profile.identifier if @profile).to_json.html_safe %>
     </script>
+    <% if current_editor_is?(Article::Editor::TINY_MCE) %>
+      <%= render :file => 'shared/tiny_mce' %>
+    <% end %>
   </head>
   <body class="<%= h body_classes %>">
     <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
@@ -72,7 +75,7 @@
         </div><!-- end id="content" -->
       </div><!-- end id="wrap-2" -->
     </div><!-- end id="wrap-1" -->
-    <%= render_environment_features(:logged_in) if logged_in? %>
+    <%= render_environment_features(:logged_in).html_safe if logged_in? %>
     <div id="footer">
       <div id="theme-footer">
         <%= theme_footer %>
@@ -86,9 +89,9 @@
     <%=
       str = (@plugins.dispatch(:body_ending).map do |content|
               if content.respond_to?(:call) then 
-                instance_exec(&content)
+                instance_exec(&content).html_safe
               else 
-                content
+                content.html_safe
               end
             end)
       safe_join(str, "\n")
@@ -11,7 +11,7 @@
     %></title>
     <%= stylesheet_import "slideshow" %>
-    <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose' %>
+    <%= javascript_include_tag 'jquery-2.1.1.min', 'vendor/sliderjs', 'vendor/pikachoose' %>
     <script type="text/javascript">
       $(document).ready(function (){
         $("#slideshow").PikaChoose({
@@ -2,7 +2,7 @@
   <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
 </div>
 <div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe(activity).html_safe %></p>
   <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'>
-    <%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %>
+    <%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe(activity).html_safe %>
   </p>
   <p class='profile-activity-time'><%= time_ago_in_words activity.created_at %></p>
@@ -2,7 +2,7 @@
   <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
 </div>
 <div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
+  <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe(activity).html_safe %></p>
   <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -12,6 +12,6 @@
 <% if activities.current_page < activities.total_pages %>
   <div id='profile_activities_page_<%= activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1)}, :update => "profile_activities_page_#{activities.current_page}" %>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1), :offsets => @offsets, :kind => 'wall'}, :update => "profile_activities_page_#{activities.current_page}" %>
   </div>
 <% end %>
 <h3><%= _("%s's network activity") % @profile.name %></h3>
 <ul id='network-activities' class='profile-activities'>
-  <%= render :partial => 'profile_network_activities', :locals => {:network_activities => @network_activities} %>
+  <%= render :partial => 'profile_network_activities', :locals => {:activities => @network_activities} %>
 </ul>
-<% network_activities.each do |activity| %>
+<% activities.each do |activity| %>
   <%= render :partial => 'profile_activity', :locals => { :activity => activity, :tab_action => 'network' } if activity.visible? %>
 <% end %>
-<% if network_activities.current_page < network_activities.total_pages %>
-  <div id='profile_network_activities_page_<%= network_activities.current_page %>'>
-    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_network_activities', :page => (network_activities.current_page + 1)}, :update => "profile_network_activities_page_#{network_activities.current_page}" %>
+<% if activities.current_page < activities.total_pages %>
+  <div id='profile_network_activities_page_<%= activities.current_page %>'>
+    <%= button_to_remote :add, _('View more'), :url => {:action => 'view_more_activities', :page => (activities.current_page + 1), :offsets => @offsets, :kind => 'network'}, :update => "profile_network_activities_page_#{activities.current_page}" %>
   </div>
 <% end %>
 <h3><%= _("%s's wall") % @profile.name %></h3>
 <div id='leave_scrap'>
   <%= flash[:error] %>
-  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val('')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
-    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :cols => 50, :rows => 2, :class => 'autogrow' %>
+  <%= form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :tab_action => 'wall' }, :update => 'profile_activities', :success => "jQuery('#leave_scrap_content').val(''); jQuery('#filter-followed').tokenInput('clear')", :complete => "jQuery('#leave_scrap_form').removeClass('loading').find('*').attr('disabled', false)", :loading => "jQuery('#leave_scrap_form').addClass('loading').find('*').attr('disabled', true)", :html => {:id => 'leave_scrap_form' } do %>
+    <%= limited_text_area :scrap, :content, 420, 'leave_scrap_content', :rows => 2, :class => 'autogrow' %>
+    <% if profile == user %>
+      <%= token_input_field_tag(:filter_followed, 'filter-followed', {:action => 'search_followed'}, {:theme => 'facebook', :placeholder => _('Filter followed, friends or group of friends to send them a private scrap...')}) %>
+    <% end %>
     <%= submit_button :new, _('Share') %>
   <% end %>
 </div>
@@ -22,8 +22,7 @@
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
-  <%= render :file => 'shared/tiny_mce' %>
-  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'body ' + current_editor)) %>
   <%= submit_button(:send, _('Send')) %>
   <%= button :cancel, _('Cancel e-mail'), :back %>
@@ -2,9 +2,9 @@
 <% unless @pending_tasks.empty? %>
   <div class='pending-tasks'>
-    <h2><%= _('You have pending requests') %></h2>
+    <h2><%= _('You have %s pending requests' % @pending_tasks.count) %></h2>
     <ul>
-      <%= safe_join(@pending_tasks.map {|task| content_tag('li', task_information(task).html_safe)}) %>
+      <%= safe_join(@pending_tasks.limit(5).map {|task| content_tag('li', task_information(task, params).html_safe)}) %>
     </ul>
     <%= button(:todo, _('Process requests'), :controller => 'tasks', :action => 'index') %>
   </div>
@@ -16,6 +16,8 @@
     </div>
   </div>
+  <%= select_editor(_('Editor'), 'profile_data', 'editor', {}) %>
+
   <%= safe_join(@plugins.dispatch(:profile_info_extra_contents).collect { |content| instance_exec(&content) }, "") %>
   <div class="formfieldline">
-<%= render :file => 'shared/tiny_mce' %>
-
 <h1><%= _('Editing header and footer') %></h1>
 <%= form_tag do %>
@@ -21,9 +19,9 @@
       </div>
     <% end %>
     <h2><%= _('Content for header ') %></h2>
-    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;', :class => current_editor) %>
     <h2><%= _('Content for footer') %></h2>
-    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => 'mceEditor') %>
+    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;', :class => current_editor) %>
     <%= button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
@@ -8,7 +8,7 @@
     <%= _('Your welcome page will only be displayed if this options is selected.') %>
   </div>
-  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor') %>
+  <%= f.text_area(:body, :cols => 40, :style => 'width: 100%', :class => current_editor) %>
   <div class='explanation'>
     <%= _('This page will be displayed to the user after his signup with this template.') %>
   </div>
@@ -17,5 +17,3 @@
     <%= submit_button('save',  _('Save'), :cancel => @back_to) %>
   <% end %>
 <% end %>
-
-<%= render :file => 'shared/tiny_mce' %>
@@ -3,7 +3,7 @@
 <% abstract_method ||= :abstract %>
 <% body_label ||= 'Text' %>
 <% body_method ||= :body %>
-<% editor_type = defined?(tiny_mce) && tiny_mce ? 'mceEditor' : '' %>
+<% editor_type = current_editor %>
 <% lead_id ||= 0%>
 <% f ||= false%>
@@ -4,7 +4,7 @@
     <ul class="profile-list">
       <% profiles.each do |profile| %>
         <li>
-        <%= link_to_profile profile_image(profile) + '<br/>' + profile.short_name,
+        <%= link_to_profile profile_image(profile) + '<br/>'.html_safe + profile.short_name,
                             profile.identifier, :class => 'profile-link' %>
         </li>
       <% end %>
-    <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', 'designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'vendor/perfect-scrollbar.min.js', 'vendor/perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js' %>
+    <%= javascript_include_tag 'vendor/strophejs-1.1.3/strophe.min', 'vendor/jquery.emoticon', 'designs/icons/pidgin/emoticons.js', 'vendor/ba-linkify', 'vendor/jquery.ba-hashchange', 'vendor/jquery.sound', 'chat', 'vendor/perfect-scrollbar.min.js', 'vendor/perfect-scrollbar.with-mousewheel.min.js', 'vendor/jquery.timeago.js' %>
     <%= stylesheet_link_tag 'vendor/perfect-scrollbar.min.css' %>
     <% extend ChatHelper %>
 <div id='not-found'>
-    <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1>
+    <h1><%= _('There is no such page: %s').html_safe % (content_tag('tt', @path)) %></h1>
     <p>
     <%= _('.You may have clicked an expired link or mistyped the address.') %>
     <%= _('.This page does not exist. Would you like to: Create a new content or locate existing content.') %>
@@ -47,7 +47,9 @@ function tinymce_macros_setup(editor) {
 tinymce.PluginManager.add('macrosPlugin', tinymce.plugins.MacrosPlugin);
 jQuery(document).ready(function () {
-  <%= tinymce_init_js :mode => mode %>
+  <%= tinymce_init_js %>
+  <%= tinymce_init_js :mode => 'simple' %>
+  <%= tinymce_init_js :mode => 'restricted' %>
 });
 </script>
	@@ -59,18 +59,18 @@ selenium-6:		@@ -59,18 +59,18 @@ selenium-6:
59	# NOOSFERO_BUNDLE_OPTS=install makes migrations fails	59	# NOOSFERO_BUNDLE_OPTS=install makes migrations fails
60	# probably because of rubygems-integration	60	# probably because of rubygems-integration
61	plugins-1:	61	plugins-1:
62	- script: SLICE=1/5 bundle exec rake test:noosfero_plugins	62	+ script: SLICE=1/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
63	stage: all-tests	63	stage: all-tests
64	plugins-2:	64	plugins-2:
65	- script: SLICE=2/5 bundle exec rake test:noosfero_plugins	65	+ script: SLICE=2/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
66	stage: all-tests	66	stage: all-tests
67	plugins-3:	67	plugins-3:
68	- script: SLICE=3/5 bundle exec rake test:noosfero_plugins	68	+ script: SLICE=3/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
69	stage: all-tests	69	stage: all-tests
70	plugins-4:	70	plugins-4:
71	- script: SLICE=4/5 bundle exec rake test:noosfero_plugins	71	+ script: SLICE=4/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
72	stage: all-tests	72	stage: all-tests
73	plugins-5:	73	plugins-5:
74	- script: SLICE=5/5 bundle exec rake test:noosfero_plugins	74	+ script: SLICE=5/5 bundle exec rake test:noosfero_plugins NOOSFERO_BUNDLE_OPTS=install
75	stage: all-tests	75	stage: all-tests
76		76
	@@ -27,7 +27,7 @@ gem 'rest-client', '~> 1.6'		@@ -27,7 +27,7 @@ gem 'rest-client', '~> 1.6'
27	gem 'exception_notification', '~> 4.0.1'	27	gem 'exception_notification', '~> 4.0.1'
28	gem 'gettext', '~> 3.1', :require => false	28	gem 'gettext', '~> 3.1', :require => false
29	gem 'locale', '~> 2.1'	29	gem 'locale', '~> 2.1'
30	-gem 'whenever', :require => false	30	+gem 'whenever', '~> 0.9.4', :require => false
31	gem 'eita-jrails', '~> 0.10.0', require: 'jrails'	31	gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
32	gem 'diffy', '~> 3.0'	32	gem 'diffy', '~> 3.0'
33	gem 'slim'	33	gem 'slim'
	@@ -35,17 +35,16 @@ gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')		@@ -35,17 +35,16 @@ gem 'activerecord-session_store', ('1.0.0.pre' if RUBY_VERSION >= '2.3.0')
35		35
36	# API dependencies	36	# API dependencies
37	gem 'grape', '~> 0.12'	37	gem 'grape', '~> 0.12'
38	-gem 'grape-entity', '0.4.8'	38	+gem 'grape-entity', '~>0.4.8'
39	gem 'grape_logging'	39	gem 'grape_logging'
40	gem 'grape-swagger'	40	gem 'grape-swagger'
41	gem 'swagger-ui_rails'	41	gem 'swagger-ui_rails'
42	gem 'kramdown'	42	gem 'kramdown'
43	gem 'rack-cors'	43	gem 'rack-cors'
44	gem 'rack-contrib'	44	gem 'rack-contrib'
45	-gem 'liquid', '~> 3.0.3'
46		45
47	gem 'api-pagination', '>= 4.1.1'	46	gem 'api-pagination', '>= 4.1.1'
48	-gem 'liquid', '~> 3.0.3'	47	+gem 'liquid', '>= 3.0.3'
49		48
50	# asset pipeline	49	# asset pipeline
51	gem 'uglifier', '>= 1.0.3'	50	gem 'uglifier', '>= 1.0.3'
	@@ -81,10 +80,10 @@ end		@@ -81,10 +80,10 @@ end
81	group :cucumber do	80	group :cucumber do
82	gem 'capybara', '~> 2.2'	81	gem 'capybara', '~> 2.2'
83	gem 'launchy'	82	gem 'launchy'
84	- gem 'cucumber'	83	+ gem 'cucumber', '~> 1.3'
85	gem 'cucumber-rails', '~> 1.4.2', :require => false	84	gem 'cucumber-rails', '~> 1.4.2', :require => false
86	gem 'database_cleaner', '~> 1.3'	85	gem 'database_cleaner', '~> 1.3'
87	- gem 'selenium-webdriver', '>= 2.50'	86	+ gem 'selenium-webdriver', '>= 2.53'
88	gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'	87	gem 'chromedriver-helper' if ENV['SELENIUM_DRIVER'] == 'chrome'
89	end	88	end
90		89
	@@ -284,7 +284,7 @@ module Api		@@ -284,7 +284,7 @@ module Api
284		284
285	if params[:path].present?	285	if params[:path].present?
286	article = profile.articles.find_by path: params[:path]	286	article = profile.articles.find_by path: params[:path]
287	- if !article \|\| !article.display_to?(current_person)	287	+ if article && !article.display_to?(current_person)
288	article = forbidden!	288	article = forbidden!
289	end	289	end
290		290
	@@ -6,6 +6,7 @@ module Api		@@ -6,6 +6,7 @@ module Api
6	get ':id' do	6	get ':id' do
7	block = Block.find(params["id"])	7	block = Block.find(params["id"])
8	return forbidden! unless block.visible_to_user?(current_person) \|\| block.allow_edit?(current_person)	8	return forbidden! unless block.visible_to_user?(current_person) \|\| block.allow_edit?(current_person)
		9	+ block.api_content_params = params.except("id")
9	present block, :with => Entities::Block, display_api_content: true, current_person: current_person	10	present block, :with => Entities::Block, display_api_content: true, current_person: current_person
10	end	11	end
11		12
	@@ -18,7 +18,7 @@ module Api		@@ -18,7 +18,7 @@ module Api
18	communities = select_filtered_collection_of(environment, 'communities', params)	18	communities = select_filtered_collection_of(environment, 'communities', params)
19	communities = profiles_for_person(communities, current_person)	19	communities = profiles_for_person(communities, current_person)
20	communities = communities.by_location(params) # Must be the last. May return Exception obj	20	communities = communities.by_location(params) # Must be the last. May return Exception obj
21	- present communities, :with => Entities::Community, :current_person => current_person	21	+ present communities, :with => Entities::Community, :current_person => current_person, :params => params
22	end	22	end
23		23
24		24
	@@ -49,7 +49,7 @@ module Api		@@ -49,7 +49,7 @@ module Api
49		49
50	get ':id' do	50	get ':id' do
51	community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])	51	community = profiles_for_person(environment.communities, current_person).find_by_id(params[:id])
52	- present community, :with => Entities::Community, :current_person => current_person	52	+ present community, :with => Entities::Community, :current_person => current_person, :params => params
53	end	53	end
54		54
55	end	55	end
	@@ -28,7 +28,7 @@ module Api		@@ -28,7 +28,7 @@ module Api
28	authenticate!	28	authenticate!
29	profile = environment.profiles.find_by(id: params[:id])	29	profile = environment.profiles.find_by(id: params[:id])
30	return forbidden! unless profile.allow_edit?(current_person)	30	return forbidden! unless profile.allow_edit?(current_person)
31	- profile.update_attributes!(params[:profile])	31	+ profile.update_attributes!(asset_with_image(params[:profile]))
32	present profile, :with => Entities::Profile, :current_person => current_person	32	present profile, :with => Entities::Profile, :current_person => current_person
33	end	33	end
34		34
	@@ -12,7 +12,7 @@ class ProfileEditorController < MyProfileController		@@ -12,7 +12,7 @@ class ProfileEditorController < MyProfileController
12	include CategoriesHelper	12	include CategoriesHelper
13		13
14	def index	14	def index
15	- @pending_tasks = Task.to(profile).pending.without_spam.select{\|i\| user.has_permission?(i.permission, profile)}	15	+ @pending_tasks = Task.to(profile).pending.without_spam
16	@show_appearance_option = user.is_admin?(environment) \|\| environment.enabled?('enable_appearance')	16	@show_appearance_option = user.is_admin?(environment) \|\| environment.enabled?('enable_appearance')
17	@show_header_footer_option = user.is_admin?(environment) \|\| (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))	17	@show_header_footer_option = user.is_admin?(environment) \|\| (!profile.enterprise? && !environment.enabled?('disable_header_and_footer'))
18	end	18	end
	@@ -95,7 +95,7 @@ class ProfileEditorController < MyProfileController		@@ -95,7 +95,7 @@ class ProfileEditorController < MyProfileController
95	end	95	end
96		96
97	def welcome_page	97	def welcome_page
98	- @welcome_page = profile.welcome_page \|\| TinyMceArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)	98	+ @welcome_page = profile.welcome_page \|\| TextArticle.new(:name => 'Welcome Page', :profile => profile, :published => false)
99	if request.post?	99	if request.post?
100	begin	100	begin
101	@welcome_page.update!(params[:welcome_page])	101	@welcome_page.update!(params[:welcome_page])
	@@ -113,8 +113,20 @@ class ChatController < PublicController		@@ -113,8 +113,20 @@ class ChatController < PublicController
113	end	113	end
114		114
115	#TODO Ideally this is done through roster table on ejabberd.	115	#TODO Ideally this is done through roster table on ejabberd.
116	- def roster_groups
117	- render :text => user.memberships.map {\|m\| {:jid => m.jid, :name => m.name}}.to_json	116	+ def rosters
		117	+ rooms = user.memberships.map {\|m\| {:jid => m.jid, :name => m.name}}
		118	+ friends = user.friends.map {\|f\| {:jid => f.jid, :name => f.name}}
		119	+ rosters = {:rooms => rooms, :friends => friends}
		120	+ render :text => rosters.to_json
		121	+ end
		122	+
		123	+ def availabilities
		124	+ availabilities = user.friends.map do \|friend\|
		125	+ status = friend.user.chat_status
		126	+ status = 'offline' if status.blank?
		127	+ {:jid => friend.jid, :status => status}
		128	+ end
		129	+ render :text => availabilities.to_json
118	end	130	end
119		131
120	protected	132	protected
	@@ -13,12 +13,13 @@ class ProfileController < PublicController		@@ -13,12 +13,13 @@ class ProfileController < PublicController
13		13
14	protect 'send_mail_to_members', :profile, :only => [:send_mail]	14	protect 'send_mail_to_members', :profile, :only => [:send_mail]
15		15
		16	+ ACTIVITIES_PER_PAGE = 15
		17	+
16	def index	18	def index
17	- @network_activities = !@profile.is_a?(Person) ? @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) : []
18	- if logged_in? && current_person.follows?(@profile)
19	- @network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page]) if @network_activities.empty?
20	- @activities = @profile.activities.paginate(:per_page => 15, :page => params[:page])
21	- end	19	+ @offsets = {:wall => 0, :network => 0}
		20	+ page = (params[:page] \|\| 1).to_i
		21	+ @network_activities = loop_fetch_activities(@profile.tracked_notifications, :network, page) if !@profile.is_a?(Person) \|\| follow_profile?
		22	+ @activities = loop_fetch_activities(@profile.activities, :wall, page) if follow_profile?
22	@tags = profile.article_tags	23	@tags = profile.article_tags
23	allow_access_to_page	24	allow_access_to_page
24	end	25	end
	@@ -231,6 +232,7 @@ class ProfileController < PublicController		@@ -231,6 +232,7 @@ class ProfileController < PublicController
231	@scrap = Scrap.new(params[:scrap])	232	@scrap = Scrap.new(params[:scrap])
232	@scrap.sender= sender	233	@scrap.sender= sender
233	@scrap.receiver= receiver	234	@scrap.receiver= receiver
		235	+ @scrap.marked_people = treat_followed_entries(params[:filter_followed])
234	@tab_action = params[:tab_action]	236	@tab_action = params[:tab_action]
235	@message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")	237	@message = @scrap.save ? _("Message successfully sent.") : _("You can't leave an empty message.")
236	activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?	238	activities = @profile.activities.paginate(:per_page => 15, :page => params[:page]) if params[:not_load_scraps].nil?
	@@ -249,18 +251,44 @@ class ProfileController < PublicController		@@ -249,18 +251,44 @@ class ProfileController < PublicController
249	render :partial => 'profile_activities_list', :locals => {:activities => activities}	251	render :partial => 'profile_activities_list', :locals => {:activities => activities}
250	else	252	else
251	network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])	253	network_activities = @profile.tracked_notifications.visible.paginate(:per_page => 15, :page => params[:page])
252	- render :partial => 'profile_network_activities', :locals => {:network_activities => network_activities}	254	+ render :partial => 'profile_network_activities', :locals => {:activities => network_activities}
253	end	255	end
254	end	256	end
255		257
256	- def view_more_activities
257	- @activities = @profile.activities.paginate(:per_page => 10, :page => params[:page])
258	- render :partial => 'profile_activities_list', :locals => {:activities => @activities}	258	+ def search_followed
		259	+ result = []
		260	+ circles = find_by_contents(:circles, user, user.circles.where(:profile_type => 'Person'), params[:q])[:results]
		261	+ followed = find_by_contents(:followed, user, Profile.followed_by(user), params[:q])[:results]
		262	+ result = circles + followed
		263	+ render :text => prepare_to_token_input_by_class(result).to_json
259	end	264	end
260		265
261	- def view_more_network_activities
262	- @activities = @profile.tracked_notifications.paginate(:per_page => 10, :page => params[:page])
263	- render :partial => 'profile_network_activities', :locals => {:network_activities => @activities}	266	+ def loop_fetch_activities(base_activities, kind, page)
		267	+ activities = nil
		268	+ while activities.nil? \|\| (activities.empty? && page <= activities.total_pages)
		269	+ activities = base_activities.offset(@offsets[kind.to_sym]).paginate(:per_page => ACTIVITIES_PER_PAGE, :page => page)
		270	+ activities = filter_activities(activities, kind.to_sym)
		271	+ page += 1
		272	+ end
		273	+ activities
		274	+ end
		275	+
		276	+ def view_more_activities
		277	+ @activities = nil
		278	+ @offsets = params[:offsets]
		279	+ page = (params[:page] \|\| 1).to_i
		280	+ kind = params[:kind]
		281	+
		282	+ if kind == 'wall'
		283	+ base_activities = @profile.activities
		284	+ partial = 'profile_activities_list'
		285	+ else
		286	+ base_activities = @profile.tracked_notifications
		287	+ partial = 'profile_network_activities'
		288	+ end
		289	+
		290	+ @activities = loop_fetch_activities(base_activities, kind, page)
		291	+ render :partial => partial, :locals => {:activities => @activities}
264	end	292	end
265		293
266	def more_comments	294	def more_comments
	@@ -434,7 +462,6 @@ class ProfileController < PublicController		@@ -434,7 +462,6 @@ class ProfileController < PublicController
434	end	462	end
435	end	463	end
436		464
437	-
438	protected	465	protected
439		466
440	def check_access_to_profile	467	def check_access_to_profile
	@@ -480,4 +507,39 @@ class ProfileController < PublicController		@@ -480,4 +507,39 @@ class ProfileController < PublicController
480	render_not_found unless profile.allow_followers?	507	render_not_found unless profile.allow_followers?
481	end	508	end
482		509
		510	+ def treat_followed_entries(entries)
		511	+ return [] if entries.blank? \|\| profile != user
		512	+
		513	+ followed = []
		514	+ entries.split(',').map do \|entry\|
		515	+ klass, identifier = entry.split('_')
		516	+ case klass
		517	+ when 'Person'
		518	+ followed << Person.find(identifier)
		519	+ when 'Circle'
		520	+ circle = Circle.find(identifier)
		521	+ followed += Profile.in_circle(circle)
		522	+ end
		523	+ end
		524	+ followed.uniq
		525	+ end
		526	+
		527	+ def filter_activities(activities, kind)
		528	+ @offsets \|\|= {:wall => 0, :network => 0}
		529	+ return activities if environment.admins.include?(user)
		530	+ activities = Array(activities)
		531	+ initial_count = activities.count
		532	+ activities.delete_if do \|activity\|
		533	+ activity = ActivityPresenter.for(activity)
		534	+ next if activity.involved?(user)
		535	+ activity.hidden_for?(user)
		536	+ end
		537	+ @offsets[kind] = @offsets[kind].to_i
		538	+ @offsets[kind] += initial_count - activities.count
		539	+ activities
		540	+ end
		541	+
		542	+ def follow_profile?
		543	+ logged_in? && current_person.follows?(@profile)
		544	+ end
483	end	545	end
	@@ -14,7 +14,7 @@ module ChatHelper		@@ -14,7 +14,7 @@ module ChatHelper
14	:class => icon_class + ' simplemenu-trigger'	14	:class => icon_class + ' simplemenu-trigger'
15	) +	15	) +
16	content_tag('ul',	16	content_tag('ul',
17	- links.map{\|link\| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n"),	17	+ links.map{\|link\| content_tag('li', link_to(link[1], '', :class => link[0], :id => link[2], 'data-jid' => user.jid), :class => 'simplemenu-item') }.join("\n").html_safe,
18	:style => 'display: none; z-index: 100',	18	:style => 'display: none; z-index: 100',
19	:class => 'simplemenu-submenu'	19	:class => 'simplemenu-submenu'
20	),	20	),