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
     

12 Nov, 2015

1 commit


03 Nov, 2015

3 commits


28 Oct, 2015

1 commit


13 Oct, 2015

3 commits


07 Oct, 2015

2 commits


05 Oct, 2015

1 commit


02 Oct, 2015

1 commit


30 Sep, 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

2 commits


22 Sep, 2015

1 commit


15 Sep, 2015

1 commit


14 Sep, 2015

1 commit

  • - Add before_filter for check permission for open edit header and footer page
    - Change environment feature name of disable_appearance to enable_appearance
    - Update cucumber test change_appearance.feature
    
    Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
    Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
    Signed-off-by: Omar Junior <omarroinuj@gmail.com>
    Signed-off-by: vitorbaraujo <vitornga15@gmail.com>
    Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>
    Luciano Prestes
     

13 Sep, 2015

1 commit


11 Sep, 2015

4 commits


08 Sep, 2015

1 commit


07 Sep, 2015

1 commit

  • - Refreshing page no longer counts visits
    - Unlogged in users counts only once
    - Added test to page hits
    - Refactor already_visited? method
    
    Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Pedro de Lyra Pereira
     

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

4 commits


02 Sep, 2015

2 commits


29 Aug, 2015

1 commit


28 Aug, 2015

4 commits


25 Aug, 2015

1 commit