12 Jun, 2015

1 commit

03 Mar, 2015

1 commit

24 Feb, 2015

1 commit

23 Feb, 2015

1 commit

28 Jul, 2014

1 commit

26 Jun, 2014

2 commits

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

1 commit

07 Mar, 2014

1 commit

11 Feb, 2014

1 commit

29 Jan, 2014

1 commit

28 Jan, 2014

1 commit

24 Sep, 2013

1 commit

05 Sep, 2013

1 commit

19 Jul, 2013

1 commit

  • b05904aa   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control
    Antonio Terceiro
     

12 Jul, 2013

1 commit

11 Jul, 2013

1 commit

09 Jun, 2013

1 commit

20 Mar, 2013

1 commit

27 Dec, 2012

1 commit

25 Dec, 2012

1 commit

06 Nov, 2012

1 commit

15 Aug, 2012

1 commit

24 May, 2012

1 commit

19 May, 2012

1 commit

15 Apr, 2012

2 commits

03 Apr, 2012

1 commit

19 Feb, 2012

1 commit

22 Dec, 2011

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

16 Aug, 2011

1 commit

09 Aug, 2011

1 commit

05 Aug, 2011

1 commit

26 Jul, 2011

1 commit

18 May, 2011

1 commit

  • 9b733e18   Adapt acts_as_searcheable to Solr ... Browse File » 
    Change acts_as_searcheable to always index schema_path. If multitenancy
if off or the database isn't PostgreSQL, then schema_path method returns
an empty string and is not used at find_by_contents.

Change find_by_contents adding options separating options from paginate,
solr and rails's find. With Solr search capabilities, combined search
(solr + rails find) won't be necessary in the future.
Also change find_by_contents to return a hash where there are the
facets found and also the results.

Related tests pass with this change
    Braulio Bhavamitra
     

10 Apr, 2011

1 commit

04 Apr, 2011

1 commit

03 Apr, 2011

1 commit