23 Feb, 2015

1 commit


22 Jan, 2015

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
     

16 Sep, 2014

1 commit


11 Sep, 2014

1 commit


26 Sep, 2013

1 commit


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

17 May, 2013

1 commit


25 Dec, 2012

1 commit


24 Oct, 2012

1 commit


19 Jul, 2012

1 commit


22 May, 2012

1 commit


27 Oct, 2009

1 commit

  •   * transformed script/feed-updater into a controller script. It starts
        and stops together with the production system (script/production)
      * moved the update (daemon) logic into FeedUpdater class. It knows which
        feeds must be updated and when, and when it should stop running.
      * concentrated the fetch (download) logic into FeedHandler class. It
        knows how to update a specific feed.
      * implemented the concept of "enabled" and "expired" in both
        ExternalFeed and FeedReaderBlock. The feed updater looks for feeds
        that are both enabled *and* expired to update.
      * Disabled feed reader blocks get re-enabled when their address is
        changed.
      * fixed a bug that made some feeds crash when using PostgreSQL
        (CGI::unescapeHTML transforms Numeric Character References into
        iso-8859-1 data and PostgreSQL won't accept that into a UTF-8
        database)
      * Removed sleep(1) calls from script/production, they don't seem to be
        useful
      * Added an index for the type column in `blocks` table.
    
    (ActionItem1243)
    Antonio Terceiro
     

03 Apr, 2009

1 commit