Thiago Ribeiro / Noosfero

24 Feb, 2014

1 commit

16d42087 rails3: fix cucumber tests related to profile link Browse File »

Victor Costa
2014-02-24 15:52:08 -0300

11 Feb, 2014

2 commits

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

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

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

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

05 Feb, 2014

1 commit

5e19d44c rails3: add attributes to attr_accessible Browse File »

Victor Costa
2014-02-05 16:46:42 -0300

23 Jan, 2014

2 commits

297b3b72 Fixing AI2897 problems: ... Browse File »

-Changed update_attribute to setting the attribute then 'save!'
-Removed some whitespaces
-The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.

(ActionItem2897)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>

2014-01-23 16:28:03 -0200

b0874b74 Allow the admin users to change the environment theme on the admin panel. Browse File »

Eduardo Tourinho Edington
2014-01-23 16:23:02 -0200

22 Jan, 2014

2 commits

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
6abd4658 rails3: fix mass-assignment errors on functional tests Browse File »

Victor Costa
2014-01-22 16:40:47 -0300

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

17 Jan, 2014

1 commit

48bf7610 rails3: adapt tag_counts method to the new tag plugin Browse File »

Victor Costa
2014-01-17 16:21:38 -0300

10 Jan, 2014

1 commit

3465dd97 rails3: remove deprecated terminology method Browse File »

Rodrigo Souto
2014-01-10 10:51:11 -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

02 Dec, 2013

1 commit

bd4954d3 Merge branch 'master' into next-origin ... Browse File »

Conflicts:
	app/models/category.rb
	app/models/uploaded_file.rb
	test/functional/memberships_controller_test.rb
	test/functional/profile_controller_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2013-12-02 20:33:51 -0300

27 Nov, 2013

1 commit

96ad392a Merge branch 'stable' ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/manage_products.feature
```
Rodrigo Souto
2013-11-27 14:13:20 -0300

21 Nov, 2013

1 commit

acd66894 environment: destroy child profiles when destroyed ... Browse File »
```
Also includes migration to remove already orphaned profiles.

(ActionItem2906)
```
Rodrigo Souto
2013-11-21 13:57:40 -0300

16 Nov, 2013

2 commits

04e25fca Add option to disable enterprises list on user menu ... Browse File »
```
(ActionItem2903)
```
Daniela Feitosa
2013-11-16 17:39:17 +0000
c3308c85 Changed a setting name to be less confusing ... Browse File »
```
(ActionItem2901)
```
Daniela Feitosa
2013-11-16 16:34:06 +0000

18 Oct, 2013

1 commit

da23338a Makes My Communities menu optional Browse File »

Larissa Reis
2013-10-18 11:22:37 -0300

07 Oct, 2013

1 commit

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

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

02 Aug, 2013

1 commit

bb5da52e Rails3: Fix ProfileCategorizationTest unit tests Browse File »

Leandro Santos
2013-08-02 12:11:13 -0300

22 Jul, 2013

1 commit

7798223b Adding default value for environment cross domain origin Browse File »

Rodrigo Souto
2013-07-22 12:30:55 -0300

19 Jul, 2013

1 commit

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

Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control

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

15 Jul, 2013

2 commits

07caf3d4 [macro-support-review] Refactoring macros infra-structure Browse File »

Rodrigo Souto
2013-07-15 19:14:08 -0300
196faf05 Add STI, serialized field and rename enterprise_id Browse File »

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

13 Jul, 2013

1 commit

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

Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2013-07-13 14:10:04 -0300

11 Jul, 2013

3 commits

2e6acc56 Fixing typo on trusted sites permission name Browse File »

Rodrigo Souto
2013-07-11 18:29:18 -0300
f3bfbfc0 Merge commit 'refs/merge-requests/331' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/331
```
Rodrigo Souto
2013-07-11 17:37:43 -0300
e61a0cba Merge commit 'refs/merge-requests/287' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/287

Conflicts:
	app/models/environment.rb
```
Rodrigo Souto
2013-07-11 13:00:57 -0300

08 Jul, 2013

1 commit

d0a55e25 merging with stable Browse File »

Leandro Nunes dos Santos
2013-07-08 16:50:24 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse File »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300

26 Jun, 2013

1 commit

f1bd3825 Confirm if env templates are set as template ... Browse File »
```
Adds "if <profile>.is_template" to <profile>_template methods.
```
Aurélio A. Heckert
2013-06-26 15:52:41 -0300

10 Jun, 2013

1 commit

36d9601b provide interface to manage trusted sites ... Browse File »
```
ActionItem2675
```
Lucas Melo
2013-06-10 16:03:56 -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

28 Mar, 2013

1 commit

c5b9f977 Merge branch 'master' into solr-commits Browse File »

Rodrigo Souto
2013-03-28 16:55:47 +0000

13 Mar, 2013

1 commit

f59d7baf Support Access-Control-Allow-Origin configuration and use Browse File »

Braulio Bhavamitra
2013-03-13 18:07:33 +0000

05 Mar, 2013

1 commit

45b092d6 Merge branch 'capybara' into webrat_to_capybara Browse File »

Daniela Feitosa
2013-03-05 14:41:04 -0300

27 Feb, 2013

1 commit

de5477c7 Merge branch 'stable' into pluginize-solr ... Browse File »
```
Conflicts:
	app/models/comment.rb
	app/views/layouts/application-ng.rhtml
	test/unit/category_test.rb
```
Rodrigo Souto
2013-02-27 16:57:56 -0300

20 Feb, 2013

1 commit

260f0d79 Adding macro support for TinyMCE articles and a plugin called CommentGroupMacro … ... Browse File »
```
…that uses the macro support
```
Leandro Nunes dos Santos
2013-02-20 11:15:09 -0300

26 Jan, 2013

1 commit

c55f2333 Adjusting signup anti-bot Browse File »

Rodrigo Souto
2013-01-26 01:45:38 +0000