Software Público Brasileiro

27 Aug, 2014

1 commit

• 914ea967   Removing EnvironmentStatisticsBlock from core ... Browse Dir »

  PeopleBlock plugin overrides the EnvironmentStatisticsBlock
  
  (ActionItem3045)

  Joenio Costa

  2014-08-27 20:41:41 -0300  

18 Aug, 2014

1 commit

• f1cafcb8   Merge branch 'master' into AI3191-private_environment Browse Dir »
  Joenio Costa

  2014-08-18 15:02:17 -0300  

12 Aug, 2014

1 commit

• 2620604b   Change the category color selection to use a colorpicker component. ... Browse Dir »

  The field display_color has turned into char(6) and stores the color rgb hex code.
  (ActionItem2915)

  Victor Costa

  2014-08-12 09:44:00 -0300  

21 Jul, 2014

1 commit

• 889c79b5   Search by identifier on whitelist edition Browse Dir »
  Victor Costa

  2014-07-21 14:17:49 -0300  

17 Jul, 2014

1 commit

• 6c619a2d   Merge branch 'master' into AI3191-private_environment ... Browse Dir »

  Conflicts:
  	app/models/environment.rb
  	app/views/features/index.rhtml

  Victor Costa

  2014-07-17 14:29:19 -0300  

08 Jul, 2014

1 commit

• f468e3c4   Use tokeninput to edit members whitelist Browse Dir »
  Victor Costa

  2014-07-08 09:08:40 -0300  

15 Jun, 2014

1 commit

• c3d1e14e   Revert "putting back all references to People, Member and Friends blocks" ... Browse Dir »

  This reverts commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98.

  Joenio Costa

  2014-06-15 21:51:18 -0300  

14 Jun, 2014

1 commit

• f8bd2430   putting back all references to People, Member and Friends blocks ... Browse Dir »

  2

  the PeopleBlock plugin that comes with these blocks is enabled by
  default in any Noosfero's environment
  
  (ActionItem2859)

  Joenio Costa

  2014-06-14 00:46:20 -0300  

05 Jun, 2014

2 commits

• e6ca4fb7   Merge branch 'master' into AI2859-people_block ... Browse Dir »

  Conflicts:
  	app/controllers/admin/environment_design_controller.rb
  	app/models/friends_block.rb
  	app/models/members_block.rb
  	test/functional/environment_design_controller_test.rb
  	test/unit/members_block_test.rb

  Joenio Costa

  2014-06-05 15:57:38 -0300  
• 2f354a9e   Rename view (rhtml -> html.erb) and hide sideblocks ... Browse Dir »

  (ActionItem3042)

  Joenio Costa

  2014-06-05 17:36:18 +0000  

14 May, 2014

1 commit

• 31750a44   Move labelled_form_for to new api format Browse Dir »
  Rodrigo Souto

  2014-05-14 17:56:39 -0300  

06 May, 2014

1 commit

• 1182476c   Merge branch 'rails235' into rails3 ... Browse Dir »

  * 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

  2014-05-06 18:00:26 -0300  

16 Mar, 2014

2 commits

• 1c950250   Revert part of the last commit in order to not remove the EnvironmentStatisticsBlock ... Browse Dir »

  - EnvironmentStatisticsBlock was marked as DEPRECATED, it will be
    removed in the next Noosfero release, see ActionItem3045
  
  Thanks for the tip Daniela Feitosa ;)
  
  (ActionItem2851)

  Joenio Costa

  2014-03-16 22:49:21 -0300  
• c3453051   Make a plugin to display statistics from Environment and Profiles ... Browse Dir »

  - Removed EnvironmentStatisticsBlock from core. Environment's admins
    should enable the statistics block for its environment
  
  Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
  Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
  Signed-off-by: Victor Costa <vfcosta@gmail.com>
  
  (ActionItem2851)

  Eduardo Tourinho Edington

  2014-03-16 20:48:37 -0300  

13 Mar, 2014

1 commit

• f835862a   Avoid crash when try to remove unexistent profile ... Browse Dir »

  (ActionItem3021)

  Daniela Feitosa

  2014-03-13 19:22:06 +0000  

12 Mar, 2014

3 commits

• d0cd6046   Addded cucumber test ... Browse Dir »

  -Added tests for ban user
  -Added also tests for activate/deactivate users
  -Added also tests for set admin role
  
  (ActionItem3021)
  
  Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
  Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

  alcampelo

  2014-03-12 17:27:37 +0000  
• 2915c278   Add confirm message for ban, activate/deactivate ... Browse Dir »

  (ActionItem3021)
  
  Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
  Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>

  Gust

  2014-03-12 16:49:56 +0000  
• 377d910b   ban_user: Creating ban button and ban method in user controller ... Browse Dir »

  (ActionItemAI3021)
  
  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Eduardo Vital <vitaldu@gmail.com>

  David Silva

  2014-03-12 16:49:56 +0000  

07 Mar, 2014

2 commits

• 423aba17   Merge branch 'master' into rails3 ... Browse Dir »

  Conflicts:
  	config/initializers/dependencies.rb
  	debian/control
  	lib/noosfero/core_ext.rb
  	lib/noosfero/plugin/routes.rb

  Daniela Feitosa

  2014-03-07 14:35:37 +0000  
• d0561132   Merge branch 'stable' ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/profile_themes_controller.rb
  	test/unit/comment_test.rb
  	vendor/plugins/action_tracker_has_comments/init.rb

  Daniela Feitosa

  2014-03-07 13:17:54 +0000  

11 Feb, 2014

3 commits

• c51270d7   users-controller: default filter to all_users ... Browse Dir »

  (ActionItem2995)

  Rodrigo Souto

  2014-02-11 23:28:10 +0000  
• f8b1f66d   users-controller: order users by name ... Browse Dir »

  Also adding a new assert helper to test the order of a collection
  without assuming all elements inside it.
  
  (ActionItem2996)

  Rodrigo Souto

  2014-02-11 23:27:45 +0000  
• 1f0194be   Merge branch 'master' into rails3-merge ... Browse Dir »

  Conflicts:
  	app/views/profile_themes/add_css.rhtml
  	app/views/profile_themes/add_image.rhtml
  	app/views/profile_themes/css_editor.rhtml
  	app/views/profile_themes/edit.rhtml
  	app/views/profile_themes/new.rhtml
  	app/views/themes/add_css.html.erb
  	app/views/themes/add_css.rhtml
  	app/views/themes/add_image.html.erb
  	app/views/themes/add_image.rhtml
  	app/views/themes/css_editor.html.erb
  	app/views/themes/css_editor.rhtml
  	app/views/themes/edit.html.erb
  	app/views/themes/edit.rhtml
  	app/views/themes/index.html.erb
  	app/views/themes/new.html.erb
  	app/views/themes/new.rhtml
  	test/factories.rb
  	test/functional/profile_themes_controller_test.rb

  Rodrigo Souto

  2014-02-11 18:00:35 -0300  

28 Jan, 2014

1 commit

• 255c7f98   rails3: fix csv generation Browse Dir »
  Victor Costa

  2014-01-28 15:33:04 -0300  

23 Jan, 2014

1 commit

• b0874b74   Allow the admin users to change the environment theme on the admin panel. Browse Dir »
  Eduardo Tourinho Edington

  2014-01-23 16:23:02 -0200  

09 Jan, 2014

1 commit

• 6adc8bc2   Merge branch 'master' into rails3 ... Browse Dir »

  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

  2014-01-09 15:17:55 +0000  

06 Jan, 2014

1 commit

• d4f19d98   Added people_block plugin Browse Dir »
  Francisco Marcelo A. Lima Júnior

  2014-01-06 18:54:16 -0300  

02 Jan, 2014

1 commit

• 57843514   Merge remote branch 'unb-gama-mes/ActionItem2910-OrderFeaturesAlphabetically' Browse Dir »
  Daniela Feitosa

  2014-01-02 04:40:19 +0000  

16 Dec, 2013

1 commit

• a8ef1884   users-controller: refactor index action Browse Dir »
  Rodrigo Souto

  2013-12-16 04:26:10 -0300  

13 Dec, 2013

1 commit

• d747ca15   features_admin: Sort features list alphabetically on admin control panel. ... Browse Dir »

  (ActionItem2910)
  
  Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
  Signed-off-by: Rafael de Souza Queiroz <querafael@live.com>

  Marcos Ramos

  2013-12-13 19:49:22 -0200  

19 Nov, 2013

1 commit

• f4ebf2ab   fixing functional tests of users controller Browse Dir »
  Leandro Nunes dos Santos

  2013-11-19 09:27:48 -0300  

12 Nov, 2013

1 commit

• 3e453e44   Allow admins to activate and deactivate environment users. Browse Dir »
  Eduardo Tourinho Edington

  2013-11-12 16:43:38 -0300  

08 Nov, 2013

1 commit

• d09c5df5   Allow admins to set and reset admin role on environment users. ... Browse Dir »

  Allow admins to activate and deactivate environment users.

  Eduardo Tourinho Edington

  2013-11-08 16:30:34 -0300  

19 Jul, 2013

1 commit

• b05904aa   Merge branch 'master' into rails3 ... Browse Dir »

  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

  2013-07-19 15:36:31 -0300  

10 Jun, 2013

1 commit

• 36d9601b   provide interface to manage trusted sites ... Browse Dir »

  ActionItem2675

  Lucas Melo

  2013-06-10 16:03:56 -0300  

31 May, 2013

1 commit

• 3f754a9b   Merge branch 'master' into rails3 ... Browse Dir »

  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

  2013-05-31 21:09:47 -0300  

07 May, 2013

1 commit

• b2a0c431   Merge branch 'master' into pluginize-solr ... Browse Dir »

  Conflicts:
  	app/models/article.rb
  	app/views/layouts/application-ng.rhtml
  	lib/noosfero/plugin.rb
  	script/noosfero-plugins

  Rodrigo Souto

  2013-05-07 13:36:10 -0300  

24 Apr, 2013

1 commit

• 1451d7e5   Merge commit 'refs/merge-requests/259' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/259
  
  Conflicts:
  	app/controllers/admin/environment_design_controller.rb

  Rodrigo Souto

  2013-04-24 21:36:25 -0300  

20 Apr, 2013

1 commit

• 2d5abd83   mergin with master Browse Dir »
  root

  2013-04-20 21:31:06 -0300  

17 Apr, 2013

1 commit

• 527ee379   Merge branch 'stable' ... Browse Dir »

  Basically html_safe in some places that the stable branch had.
  
  Conflicts:
  	app/models/article_block.rb
  	app/models/tags_block.rb

  Rodrigo Souto

  2013-04-17 17:12:26 -0300