11 Aug, 2016

1 commit


26 Jul, 2016

1 commit


25 Jul, 2016

1 commit


18 Jul, 2016

1 commit


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
     

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
     

27 Apr, 2016

1 commit

  • This will many further improvements to the products, such as:
    - Interaction with other plugins such as suppliers, stock and
    currencies. The inteface can change in such a way that if done
    usings hotspots would hurt usability and coherence.
    - More autonomy to develop and integrate other features
    (in the next months we will integrate batch edition and stock,
    currencies might come next)
    - More declouping from core and other components
    Braulio Bhavamitra
     

18 Apr, 2016

1 commit

  • Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
    Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Carlos Purificação
     

01 Apr, 2016

1 commit


08 Mar, 2016

1 commit


03 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

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
     

02 Dec, 2015

1 commit


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

13 Oct, 2015

1 commit


02 Oct, 2015

1 commit


26 Sep, 2015

1 commit

  •   This fixes a bug in which some pages (eg. a profile page) were visible
      to unlogged users even if the environment has enabled "show content
      only to members".
    
      The problem happened because some controllers use `before_filter
      :login_required` so they can apply it to some specific methods,
      effectively overriding the one set in `application_controller`. That
      before filter set in `application_controller` is the one used to make
      the environment private when that feature is enabled, so when a
      controller overrides it, some methods are not required login even when
      the environment is private. So I fixed the problem by using a
      different `before_filter` to take care specifically of private
      environments.
    
      Now every page requires login when an environment is private, except
      the pages in `account_controller` necessary for login and signup.
    Larissa Reis
     

24 Sep, 2015

1 commit


22 Sep, 2015

1 commit


11 Sep, 2015

1 commit


05 Sep, 2015

1 commit

  •   - 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
     

04 Sep, 2015

2 commits

  • Victor Costa
     
  • Tests in scrap_test were failing in some random executions.
    It was caused by the way that action_tracker gets the current user when
    there is no custom_user setted in track_actions calls.
    
    The current logged in used is obtained with ActionTracker::Record.current_user but it's not setted from unit tests.
    The solution is to set the custom_user as the scrap sender, since that it will always be the same user that is logged in when a scrap is created.
    Victor Costa
     

15 Aug, 2015

1 commit


13 Aug, 2015

2 commits


11 Aug, 2015

1 commit


10 Aug, 2015

2 commits


01 Aug, 2015

1 commit


31 Jul, 2015

1 commit


24 Jul, 2015

2 commits


16 Jun, 2015

1 commit


11 Jun, 2015

1 commit


26 Jan, 2015

1 commit


23 Oct, 2014

1 commit


22 Oct, 2014

1 commit

  • Conflicts:
    	app/helpers/profile_helper.rb
    	app/views/content_viewer/_article_toolbar.rhtml
    	app/views/profile/_common.rhtml
    	app/views/profile/_organization_profile.rhtml
    	app/views/profile/_person_profile.rhtml
    	db/schema.rb
    	public/stylesheets/application.css
    Daniela Feitosa