22 Jul, 2016

1 commit


18 Jul, 2016

3 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
     

05 Jul, 2016

1 commit


04 Jul, 2016

2 commits

  • Larissa Reis
     
  • * Creates concerns for concealing common attributes for different types of person
    * Starting federated login
    * Removing call to lib
    * Adapt external person attributes and current_user to allow for external login
    * Fix functional tests
    * Get profile image with fixed link to profile image
    * Adding API endpoint to get profile icon
    * Ensure that the federated user has e-mail
    * Get person or external person
    * Adding Selenium test for federated login
    * Last tests for federated login feature
    * Creates initial tests for ExternalProfile
    * Makes ExternalProfile respond to all Profile methods to avoid breakage
    * Makes ExternalProfile respond to all Person methods to avoid breakage
    * Adds more tests for ExternalPerson
    * Skip certificate verification over ssl authentications
    
    Signed-off-by: Caio SBA <caiosba@gmail.com>
    Larissa Reis
     

05 May, 2016

1 commit


04 May, 2016

1 commit

  • - Confirmation modal when joining community
    - Moderation option in community control panel
    
    Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
    Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Marcos Pereira
     

08 Apr, 2016

1 commit


07 Apr, 2016

1 commit


01 Apr, 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

1 commit

  • - Every article can be followed so the user can receive notifications without
      having to comment on it
    
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Caio SBA <caio@colivre.coop.br>
    Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
    Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    Signed-off-by: Evandro Jr <evandrojr@gmail.com>
    Marcos Ramos
     

18 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
     

11 Sep, 2015

1 commit


05 Sep, 2015

2 commits

  • Also:
    - Removed needless hidden_field_tag
    - Moved repeated code to partial
    Daniela Feitosa
     
  •   - Order members by name
      - Removed white spaces
      - Changed strings to be translated
      - Renamed div id and test
      - Adjust ul tag members
      - Fixed plugin dependency
    
    Signed-off-by: Omar Junior <omarroinuj@gmail.com>
    Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
    Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
    Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
    Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Omar Junior
     

13 Aug, 2015

1 commit


06 Aug, 2015

1 commit


24 Jul, 2015

2 commits


09 Feb, 2015

1 commit

  • - Create tests for private and invisible communities using the privace methods
     - Executing filters for events and contact pages in private profiles
    
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Tallys Martins
     

03 Dec, 2014

1 commit


31 Oct, 2014

1 commit


20 Oct, 2014

1 commit


14 Oct, 2014

1 commit


31 Jul, 2014

2 commits


02 Jun, 2014

1 commit


16 Apr, 2014

1 commit


16 Mar, 2014

1 commit


07 Mar, 2014

1 commit


20 Feb, 2014

2 commits


05 Feb, 2014

1 commit


15 Jan, 2014

2 commits


09 Jan, 2014

1 commit

  • Conflicts:
    	app/controllers/my_profile/memberships_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/boxes_helper.rb
    	app/models/article.rb
    	app/models/category.rb
    	app/models/change_password.rb
    	app/models/comment.rb
    	app/models/environment.rb
    	app/models/event.rb
    	app/models/profile.rb
    	app/models/recent_documents_block.rb
    	app/models/region.rb
    	app/models/task.rb
    	app/models/uploaded_file.rb
    	app/views/account/forgot_password.html.erb
    	app/views/events/_events_by_day.html.erb
    	app/views/profile/_person_profile.html.erb
    	app/views/shared/_manage_enterprises.html.erb
    	config/environment.rb
    	config/initializers/plugins.rb
    	config/routes.rb
    	db/schema.rb
    	debian/control
    	lib/noosfero/plugin.rb
    	test/unit/article_test.rb
    	test/unit/category_test.rb
    	test/unit/change_password_test.rb
    	test/unit/cms_helper_test.rb
    	test/unit/comment_test.rb
    	test/unit/content_viewer_helper_test.rb
    	test/unit/event_test.rb
    	test/unit/folder_helper_test.rb
    	test/unit/person_test.rb
    	test/unit/price_detail_test.rb
    	test/unit/profile_helper_test.rb
    	test/unit/recent_documents_block_test.rb
    	test/unit/scrap_test.rb
    	test/unit/user_mailer_test.rb
    	vendor/plugins/action_tracker_has_comments/init.rb
    	vendor/plugins/delayed_job/lib/delayed/worker.rb
    	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto