Software Publico / Noosfero

07 Aug, 2014

1 commit

34f8f4d7 Merge remote-tracking branch 'origin/stable' ... Browse File »

Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb

2014-08-07 14:20:39 -0300

24 Jun, 2014

1 commit

0d740187 profile_editor: added mass-assign support for enterprise fields ... Browse File »
```
Added mass-assign support for all enterprise's field that are configurable on
the fields environment page.

(ActionItem3147)
```
Daniel
2014-06-24 14:39:07 -0300

13 May, 2014

2 commits

f0acdba6 Fix save without validation new api call Browse File »

Rodrigo Souto
2014-05-13 19:24:44 +0000

23914711 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb

2014-05-13 10:43:37 -0300

24 Apr, 2014

1 commit

d0e93a31 Validate products per page ... Browse File »
```
(ActionItem3105)
```
Braulio Bhavamitra
2014-04-24 10:58:22 -0300

23 Apr, 2014

1 commit

d08608af Merge remote-tracking branch 'origin' into stable ... Browse File »

Conflicts:
	app/views/content_viewer/view_page.rhtml
	app/views/profile_editor/index.rhtml
	debian/changelog
	lib/noosfero.rb
	plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb

2014-04-23 10:52:54 -0300

14 Apr, 2014

1 commit

533f3100 Remove spaces Browse File »

Rodrigo Souto
2014-04-14 11:50:05 -0300

03 Apr, 2014

1 commit

c84e0cab product-category: fetch only necessary categories ... Browse File »

Instead of fetching every category to display the icons, fetch only 3 of
them through the correct sql query. This also fixes a big memory leak.

(ActionItem3084)

2014-04-03 21:22:12 +0000

22 Mar, 2014

1 commit

db63c60a Associate EnterpriseActivation with Task's target ... Browse File »

This allow the task to been seen on the control panel

Besides, requestor is not required. In CIRANDAS, for example,
all EnterpriseActivation don't have requestor filled

Also finish the task if Enterprise#enable is called manually

2014-03-22 10:58:02 -0300

11 Feb, 2014

1 commit

e9fea38f Merge branch 'master' into rails3-merge ... Browse File »

Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

2014-02-11 17:35:19 -0300

31 Jan, 2014

1 commit

15c2ef25 rails3: move zip_code, city, state and country settings to organization Browse File »

Victor Costa
2014-01-31 10:57:11 -0300

22 Jan, 2014

1 commit

99c4da00 Merge commit 'refs/merge-requests/342' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/342

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000

21 Jan, 2014

1 commit

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse File »

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

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

09 Oct, 2013

1 commit

29f6b68e rails3: fix enterprise tests ... Browse File »
```
PS: still tests failin
```
Rodrigo Souto
2013-10-09 20:13:01 +0000

15 Jul, 2013

1 commit

196faf05 Add STI, serialized field and rename enterprise_id Browse File »

Braulio Bhavamitra
2013-07-15 09:08:27 -0300

26 Jun, 2013

1 commit

5627e415 Add ProductCategoriesBlock to default enterprise creation ... Browse File »
```
ActionItem896
```
Aurélio A. Heckert
2013-06-26 16:39:56 -0300

17 Jun, 2013

1 commit

72889f54 Adds configuration for products per page on catalog ... Browse File »
```
related to ActionItem896
```
Aurélio A. Heckert
2013-06-17 18:34:51 -0300

01 Jun, 2013

1 commit

5a86933d Translate disable_products_for_enterprises_enabled env setting ... Browse File »

The disable_* settings for environment are incoherent with the
user interface and with the code itself. This changes correct
only one incoherent setting as an example how to do with all
others.

2013-06-01 09:54:17 -0300

31 May, 2013

1 commit

3f754a9b Merge branch 'master' into rails3 ... Browse File »

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

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

21 May, 2013

1 commit

e7b5205f Merge branch 'pluginize-solr' into merge-solr Browse File »

Rodrigo Souto
2013-05-21 19:45:04 -0300

17 May, 2013

1 commit

083eca4e Fixing enterprise activities crash on postgres ... Browse File »
```
(ActionItem2668)
```
Rodrigo Souto
2013-05-17 14:09:06 -0300

09 May, 2013

1 commit

df6d2864 Including a link to the start of the catalog on catalog categories left block Browse File »

Rodrigo Souto
2013-05-09 13:34:35 -0300

06 Mar, 2013

1 commit

1bac841f Fixing search controller tests Browse File »

Rodrigo Souto
2013-03-06 19:52:59 +0000

28 Feb, 2013

1 commit

cd53e5e5 On the way of search display options Browse File »

Rodrigo Souto
2013-02-28 22:00:28 +0000

25 Dec, 2012

2 commits

86ecb14f Finish removal of the deprecated terminology thing Browse File »

Antonio Terceiro
2012-12-25 21:33:53 -0300
c7ef7029 Rails 3 porting: bootstrap development environment ... Browse File »
```
./script/quick-start runs back to back now

You will notice that solr was removed.
```
Antonio Terceiro
2012-12-25 14:57:51 -0300

12 Dec, 2012

1 commit

56f7c497 [pluginize-solr] Moving extra_data_for_index to plugin Browse File »

Rodrigo Souto
2012-12-12 00:23:53 +0000

11 Dec, 2012

1 commit

9c9311bd [pluginize-solr] Moving solr reindex to a plugin ... Browse File »
```
Starting pluginization of solr!
```
Rodrigo Souto
2012-12-11 23:42:12 +0000

13 Sep, 2012

1 commit

d482447c [performance] Reducing overall database queries Browse File »

Rodrigo Souto
2012-09-13 17:16:26 -0300

07 Aug, 2012

1 commit

fdf61a5a [multiple-templates] Adding templates field and relations to profile ... Browse File »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:31 -0300

19 Jul, 2012

1 commit

75524307 Merging AI1826 with master ... Browse File »

Conflicts:
	app/models/article.rb
	app/models/profile.rb
	app/models/uploaded_file.rb
	public/javascripts/application.js
	public/stylesheets/application.css
	test/unit/article_test.rb
	test/unit/category_finder_test.rb
	test/unit/enterprise_test.rb

2012-07-19 09:19:22 -0300

18 Jul, 2012

1 commit

91bf3f94 Some enhancements on solr ... Browse File »

Removed whitespaces
Recovered schema.rb without plugins fields
Included info about solr support of multitenancy on solr.yml.dist

2012-07-18 10:38:00 -0300

21 May, 2012

1 commit

173bc36f Enhancements on wall Browse File »

Daniela Feitosa
2012-05-21 04:28:47 -0300

04 Apr, 2012

1 commit

3c0d99a5 Merge commit 'refs/merge-requests/145' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/145
```
Daniela Feitosa
2012-04-04 21:52:02 -0300

03 Apr, 2012

1 commit

51533efa Remove lat/lng from product and load them from enterprise Browse File »

Braulio Bhavamitra
2012-04-03 18:27:27 -0300

13 Mar, 2012

1 commit

b41cf2b2 Save enterprise updates products position with a delayed job ... Browse File »
```
(ActionItem2307)
```
Rodrigo Souto
2012-03-13 16:50:18 -0300

24 Feb, 2012

1 commit

04d456df Sync city/state with Region Browse File »

Braulio Bhavamitra
2012-02-24 22:31:33 -0200

19 Feb, 2012

2 commits

50def845 Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse File »

Conflicts:
	app/controllers/application.rb
	app/controllers/public/browse_controller.rb
	app/helpers/application_helper.rb
	app/helpers/display_helper.rb
	app/models/environment_finder.rb
	app/models/product.rb
	app/views/layouts/_javascript.rhtml
	app/views/layouts/application-ng.rhtml
	public/javascripts/application.js
	public/stylesheets/application.css
	test/functional/browse_controller_test.rb
	test/functional/search_controller_test.rb
	vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake

2012-02-19 20:02:34 -0200

2a082d0b Merge remote branch 'noosfero-bsc/solr-merge' ... Browse File »

Conflicts:
	INSTALL
	app/models/environment_finder.rb
	config/environments/cucumber.rb
	debian/control
	features/step_definitions/noosfero_steps.rb
	test/unit/forum_helper_test.rb

2012-02-19 16:37:27 -0200