29 Jun, 2016

1 commit

30 May, 2016

1 commit

02 May, 2016

2 commits

27 Apr, 2016

2 commits

08 Apr, 2016

1 commit

05 Dec, 2015

1 commit

11 Sep, 2015

1 commit

04 Sep, 2015

1 commit

13 Aug, 2015

1 commit

11 Aug, 2015

1 commit

24 Jul, 2015

3 commits

25 Jun, 2015

1 commit

20 Jun, 2015

1 commit

  • c366e6ec   api: only search visible organization in current model ... Browse File » 
      scopes are defined as class methods on the singleton of the class they
  were named instead of the class that calls them, so regardless if they
  are called by Enterprise or Community, they were defined on
  Organization, so #visible_for_person() always gives us
    `WHERE "profiles"."type" IN ('Organization', 'Enterprise', 'Community')`

  This wouldn't be a problem if rails 3.2 didn't merge the WHERE clauses
  of nested scopes, which causes the previous filtering by type of
  Enterprise/Community to be thrown away in favor of the broader one.

  This was fixed in later rails versions but we want to be able to
  search only for Enterprises or Communities, so I translated the scope
  to a class method on the parent class Organization, so it can be
  inherited by the other.
    Larissa Reis
     

19 Jun, 2015

1 commit

17 Jun, 2015

1 commit

02 Jun, 2015

3 commits

08 May, 2015

1 commit

09 Apr, 2015

1 commit

02 Feb, 2015

1 commit

20 Nov, 2014

1 commit

28 Oct, 2014

1 commit

26 Sep, 2014

1 commit

30 Jun, 2014

1 commit

15 Jun, 2014

1 commit

14 Jun, 2014

1 commit

05 Jun, 2014

1 commit

06 May, 2014

1 commit

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse File » 
    * rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb
    Victor Costa
     

18 Mar, 2014

2 commits

18 Feb, 2014

1 commit

11 Feb, 2014

1 commit

31 Jan, 2014

2 commits

28 Jan, 2014

1 commit