03 Oct, 2016

1 commit


11 Aug, 2016

1 commit


25 Jul, 2016

1 commit


19 Jul, 2016

1 commit


18 Jul, 2016

4 commits


17 Jul, 2016

1 commit

  • Signed-off-by: Alessandro Caetano <alessandro.caetanob@gmail.com>
    Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com>
    Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
    Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
    Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>
    Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
    Marcos Pereira
     

16 Jul, 2016

1 commit


27 Apr, 2016

3 commits


25 Apr, 2016

1 commit

  • Conflicts:
    	.travis.yml
    	app/controllers/my_profile/tasks_controller.rb
    	app/helpers/application_helper.rb
    	app/views/profile_editor/_pending_tasks.html.erb
    	app/views/tasks/processed.html.erb
    	test/functional/tasks_controller_test.rb
    Victor Costa
     

22 Apr, 2016

1 commit


19 Apr, 2016

2 commits


11 Apr, 2016

1 commit


08 Apr, 2016

1 commit


06 Apr, 2016

1 commit

  • Add subtitle support to the following core blocks:
    * my_network
    * profile_search
    * categories
    * highlights
    * slideshow
    * article
    * blog_archives
    * featured_products
    * feed_reader
    * link_list
    * location
    * products
    * profile_list
    * raw_html
    * recent_documents
    * tags
    
    Add subtitle support to the following plugins blocks:
    * community_track: track_list
    * container_block: container
    * context_content: context_content
    * display_content: display_content_block
    * event: event
    * gallery_block: gallery_block
    * organization_ratings: organization_ratings_block
    * people_block: people_base
    * profile_members_headlines: headlines
    * recent_content: recent_content_block
    * relevant_content: relevant_content_block
    * site_tour: tour
    * sniffer: interests_block
    
    Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
    Arthur Esposte
     

01 Apr, 2016

1 commit


31 Mar, 2016

1 commit


29 Mar, 2016

1 commit


24 Mar, 2016

1 commit


09 Mar, 2016

4 commits


08 Mar, 2016

1 commit


26 Feb, 2016

1 commit

  • - Adds use of filtered members to mailing queue executed by send_mail action
    
    Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    Michel Felipe
     

22 Feb, 2016

6 commits


30 Nov, 2015

1 commit


23 Nov, 2015

1 commit

  • Custom fields can be added to any profile through the admin panel
    in the 'Fields' section. They have the same behaviour as the current
    Noosfero's fields (active, signup, required and privacy).
    
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     

19 Nov, 2015

1 commit


17 Nov, 2015

1 commit

  • Conflicts:
    	Gemfile
    	Rakefile
    	app/controllers/box_organizer_controller.rb
    	app/controllers/my_profile/tasks_controller.rb
    	app/controllers/public/profile_controller.rb
    	app/mailers/user_mailer.rb
    	app/models/article.rb
    	app/models/person.rb
    	app/models/product_category.rb
    	app/models/task.rb
    	config/application.rb
    	config/routes.rb
    	lib/acts_as_having_settings.rb
    	lib/noosfero/api/entities.rb
    	lib/noosfero/api/helpers.rb
    	lib/noosfero/api/session.rb
    	lib/noosfero/api/v1/articles.rb
    	lib/noosfero/api/v1/contacts.rb
    	lib/noosfero/api/v1/search.rb
    	lib/noosfero/api/v1/users.rb
    	test/functional/tasks_controller_test.rb
    	test/unit/api/articles_test.rb
    	test/unit/api/helpers_test.rb
    	test/unit/api/people_test.rb
    	test/unit/api/search_test.rb
    	test/unit/api/session_test.rb
    	test/unit/api/users_test.rb
    	test/unit/person_notifier_test.rb
    	test/unit/task_test.rb
    	vendor/plugins/access_control/lib/acts_as_accessible.rb
    Victor Costa