06 Sep, 2016

1 commit

  • Notifications of private profiles or provite contents were not being
    generated. This patch generates these notifications and filter
    activities being displayed to the user according to her/his permissions.
    
    Making this work through pure sql is just too complex. It was needed to
    filter results after pagination, for performance reasons, and perform
    some workarounds to not mess with the paginated results.
    
    PS: Also refactoring presenters infra
    Rodrigo Souto
     

11 Aug, 2016

1 commit


10 May, 2016

1 commit


22 Mar, 2016

1 commit


28 Aug, 2015

1 commit


21 Aug, 2015

1 commit


13 Aug, 2015

1 commit


31 Jul, 2015

1 commit


24 Jul, 2015

1 commit


23 Feb, 2015

1 commit


26 Jan, 2015

1 commit


16 Jun, 2014

1 commit


20 Jan, 2014

1 commit


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
     

27 Sep, 2013

1 commit


26 Sep, 2013

1 commit


19 Aug, 2013

1 commit


31 May, 2013

1 commit

  • Conflicts:
    	Gemfile
    	Gemfile.lock
    	Rakefile
    	app/controllers/admin/users_controller.rb
    	app/helpers/application_helper.rb
    	app/models/article.rb
    	app/models/enterprise.rb
    	app/models/license.rb
    	app/models/product.rb
    	app/models/profile.rb
    	app/models/user.rb
    	app/views/account/_signup_form.html.erb
    	app/views/admin_panel/site_info.html.erb
    	app/views/box_organizer/_block_types.html.erb
    	app/views/layouts/application-ng.html.erb
    	app/views/search/_article.html.erb
    	app/views/search/_article.rhtml
    	app/views/search/_blog.html.erb
    	app/views/search/_blog.rhtml
    	app/views/search/_content.html.erb
    	app/views/search/_event.html.erb
    	app/views/search/_event.rhtml
    	app/views/search/_facets_menu.html.erb
    	app/views/search/_facets_menu.rhtml
    	app/views/search/_facets_unselect_menu.html.erb
    	app/views/search/_facets_unselect_menu.rhtml
    	app/views/search/_folder.html.erb
    	app/views/search/_folder.rhtml
    	app/views/search/_forum.html.erb
    	app/views/search/_forum.rhtml
    	app/views/search/_full_article.html.erb
    	app/views/search/_full_blog.html.erb
    	app/views/search/_full_enterprise.html.erb
    	app/views/search/_full_event.html.erb
    	app/views/search/_full_folder.html.erb
    	app/views/search/_full_forum.html.erb
    	app/views/search/_full_gallery.html.erb
    	app/views/search/_full_product.rhtml
    	app/views/search/_full_text_article.html.erb
    	app/views/search/_full_uploaded_file.html.erb
    	app/views/search/_gallery.html.erb
    	app/views/search/_gallery.rhtml
    	app/views/search/_product.html.erb
    	app/views/search/_product.rhtml
    	app/views/search/_profile.html.erb
    	app/views/search/_profile.rhtml
    	app/views/search/_text_article.html.erb
    	app/views/search/_text_article.rhtml
    	app/views/search/_uploaded_file.html.erb
    	app/views/search/_uploaded_file.rhtml
    	app/views/search/articles.html.erb
    	app/views/search/category_index.html.erb
    	app/views/search/communities.html.erb
    	app/views/search/contents.html.erb
    	app/views/search/enterprises.html.erb
    	app/views/search/events.html.erb
    	app/views/search/facets_browse.html.erb
    	app/views/search/facets_browse.rhtml
    	app/views/search/people.html.erb
    	app/views/search/products.html.erb
    	app/views/users/_user_csv.html.erb
    	app/views/users/index_csv.html.erb
    	app/views/users/send_mail.html.erb
    	config/environment.rb
    	features/support/fixtures.rb
    	features/support/selenium.rb
    	lib/noosfero.rb
    	lib/noosfero/plugin.rb
    	lib/tasks/cucumber.rake
    	plugins/mezuro/lib/kalibro/model.rb
    	plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
    	plugins/mezuro/test/features/echo_port_test.rb
    	plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
    	plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
    	plugins/mezuro/test/unit/kalibro/base_tool_test.rb
    	plugins/mezuro/test/unit/kalibro/compound_metric_test.rb
    	plugins/mezuro/test/unit/kalibro/compound_metric_with_error_test.rb
    	plugins/mezuro/test/unit/kalibro/error_test.rb
    	plugins/mezuro/test/unit/kalibro/metric_configuration_test.rb
    	plugins/mezuro/test/unit/kalibro/metric_result_test.rb
    	plugins/mezuro/test/unit/kalibro/module_node_test.rb
    	plugins/mezuro/test/unit/kalibro/module_result_test.rb
    	plugins/mezuro/test/unit/kalibro/native_metric_test.rb
    	plugins/mezuro/test/unit/kalibro/project_result_test.rb
    	plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
    	plugins/mezuro/test/unit/mezuro_plugin/helpers/content_viewer_helper_test.rb
    	plugins/mezuro/test/unit/mezuro_plugin/project_content_test.rb
    	plugins/mezuro/views/mezuro_plugin_myprofile/_edit_range.html.erb
    	plugins/mezuro/views/mezuro_plugin_myprofile/_new_range.html.erb
    	plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
    	plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
    	plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
    	plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
    	plugins/solr/lib/acts_as_faceted.rb
    	plugins/solr/lib/acts_as_searchable.rb
    	plugins/solr/test/test_helper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/.gitignore
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/.travis.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/Gemfile
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/LICENSE
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/README.markdown
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/Rakefile
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/VERSION
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/acts_as_solr_reloaded.gemspec
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/dynamic_attributes_migration_generator.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/dynamic_attributes_migration/templates/migration.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/local_migration/local_migration_generator.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/generators/local_migration/templates/migration.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/init.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/install.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/common_methods.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/dynamic_attribute.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/lazy_document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/local.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/mongo_mapper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/post.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/solr_fixtures.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/tasks.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr_reloaded.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/connection.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/exception.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/array_mapper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/delimited_file_source.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/hpricot_mapper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/mapper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/solr_source.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/importer/xpath_mapper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/indexer.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/base.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/commit.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/delete.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/dismax.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/index_info.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/json_update.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/modify_document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/optimize.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/ping.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/select.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/spellcheck.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/update.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/add_document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/base.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/commit.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/delete.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/dismax.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/index_info.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/modify_document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/optimize.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ping.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/ruby.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/select.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/spellcheck.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/standard.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/response/xml.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/util.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/xml.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/database.rake
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/test.rake
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/rails/init.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/admin-extra.html
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/elevate.xml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.aff
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/en_US.dic
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/mapping-ISOLatin1Accent.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.en.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/protwords.pt.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.aff
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/pt_PT.dic
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/schema.xml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/scripts.conf
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/solrconfig.xml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/spellings.en.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.en.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/stopwords.pt.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/synonyms.en.txt
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example.xsl
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_atom.xsl
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/example_rss.xsl
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/xslt/luke.xsl
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr_test_rakefile.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/config/solr.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/connections/mysql/connection.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/connections/sqlite/connection.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/001_create_books.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/002_create_movies.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/003_create_categories.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/004_create_electronics.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/005_create_authors.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/006_create_postings.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/007_create_posts.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/008_create_gadgets.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/009_create_dynamic_attributes.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/010_create_advertises.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/db/migrate/011_create_locals.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/advertises.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/authors.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/books.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/categories.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/db_definitions/mysql.sql
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/dynamic_attributes.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/electronics.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/movies.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/fixtures/postings.yml
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/acts_as_solr_test.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/association_indexing_test.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/faceted_search_test.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/functional/multi_solr_search_test.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/advertise.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/author.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/book.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/category.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/document.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/dynamic_attribute.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/electronic.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/gadget.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/local.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/movie.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/novel.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/post.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/models/posting.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/test_helper.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/acts_methods_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/class_methods_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/common_methods_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/instance_methods_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/lazy_document_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/parser_instance.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/parser_methods_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/solr_add_document_shoulda.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/solr_instance.rb
    	plugins/solr/vendor/plugins/acts_as_solr_reloaded/test/unit/test_helper.rb
    	plugins/solr/views/facets_browse.html.erb
    	plugins/solr/views/search/_facets_menu.html.erb
    	plugins/solr/views/search/_facets_unselect_menu.rhtml
    Antonio Terceiro
     

05 Mar, 2013

1 commit


27 Dec, 2012

1 commit


12 Dec, 2012

1 commit


18 Aug, 2012

1 commit


19 Jul, 2012

2 commits


21 May, 2012

1 commit


19 May, 2012

1 commit


17 May, 2012

2 commits


17 Apr, 2012

1 commit


19 Feb, 2012

2 commits


22 Dec, 2011

1 commit


27 Nov, 2011

1 commit

  • 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
     

27 Sep, 2011

1 commit


16 Aug, 2011

1 commit


18 May, 2011

1 commit

  • 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
     

22 Feb, 2011

1 commit


16 Feb, 2011

1 commit


18 Jan, 2011

1 commit


09 Dec, 2010

1 commit