Thiago Ribeiro / Noosfero

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

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

29 May, 2013

1 commit

44220b5f Extending solr config to accept data_path Browse Dir »

Rodrigo Souto
2013-05-29 14:46:32 -0300

28 May, 2013

4 commits

01120b97 Changing path to solr config Browse Dir »

Rodrigo Souto
2013-05-28 18:10:14 -0300
22745db9 Merge branch 'stable' Browse Dir »

Rodrigo Souto
2013-05-28 17:40:45 -0300
6b1838f7 Cleaning acts_as_solr_reloaded source Browse Dir »

Rodrigo Souto
2013-05-28 17:31:11 -0300
ae788bac Fixing solr steps folder name Browse Dir »

Rodrigo Souto
2013-05-28 14:50:44 -0300

27 May, 2013

1 commit

56b00143 Fixing html escape on work_assignment Browse Dir »

Rodrigo Souto
2013-05-27 14:03:10 -0300

22 May, 2013

1 commit

d05c0c85 Fixing search features ... Browse Dir »
```
Moving solr specifics to the plugin
```
Rodrigo Souto
2013-05-22 17:17:57 -0300

21 May, 2013

12 commits

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

Rodrigo Souto
2013-05-21 19:45:04 -0300
82423ba6 Preparing tests for future accent insensitive search Browse Dir »

Rodrigo Souto
2013-05-21 19:44:01 -0300
7ca3f1a7 Fixed pg_search index Browse Dir »

Rodrigo Souto
2013-05-21 19:44:01 -0300
03b3e7b1 Refactoring pg_search_plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:44:01 -0300
1db24253 Moving acts_as_searchable to plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:44:00 -0300
bcad51dd Changing path to solr config Browse Dir »

Rodrigo Souto
2013-05-21 19:44:00 -0300
5e1b57aa Fixing typo Browse Dir »

Rodrigo Souto
2013-05-21 19:43:59 -0300
2bf04852 Put solr start/stop code before core's test_helper Browse Dir »

Braulio Bhavamitra
2013-05-21 19:43:28 -0300
6ff02712 Moving acts as searchable to the plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:43:27 -0300
c893df1c Moving acts_as_faceted test to solr plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:43:27 -0300
13d5c3d8 Moving solr information form INSTALL file to the plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:43:26 -0300
f24c277d Removing solr calls from mezuro plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:43:26 -0300

17 May, 2013

2 commits

b29ff55e Fixing send_email_plugin feature tests Browse Dir »

Rodrigo Souto
2013-05-17 12:40:08 -0300
cbbdba89 Merge commit 'refs/merge-requests/315' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/315
```
Rodrigo Souto
2013-05-17 12:08:43 -0300

10 May, 2013

1 commit

b9f2172d Fixing sending of email with SendEmail plugin ... Browse Dir »
```
Bug added after the change on plugin routes:
3844f93c462dc69a7432b4baae18fdeca797a490

(ActionItem2669)
```
Daniela Feitosa
2013-05-10 21:08:41 +0000

08 May, 2013

2 commits

4e4234b1 Move acts_as_solr_reloaded and acts_as_faceted into solr_plugin Browse Dir »

Braulio Bhavamitra
2013-05-08 15:41:07 -0300
662a869d Fix solr dependencies init Browse Dir »

Braulio Bhavamitra
2013-05-08 15:36:08 -0300

07 May, 2013

2 commits

a162ccff Fixing html_safe and only starting server on tests run Browse Dir »

Rodrigo Souto
2013-05-07 16:17:23 -0300
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

07f9167d Merge commit 'refs/merge-requests/260' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/260
```
Rodrigo Souto
2013-04-24 21:41:53 -0300

23 Apr, 2013

3 commits

5ddf76de Adding dependencies file to ldap plugin Browse Dir »

Rodrigo Souto
2013-04-23 12:09:43 -0300
a9a9fa1f Removing trailing whitespaces from ldap plugin ... Browse Dir »
```
Also fixing a typo
```
Rodrigo Souto
2013-04-23 12:03:48 -0300
df990a64 Fixing typo on ldap plugin readme Browse Dir »

Rodrigo Souto
2013-04-23 11:58:51 -0300

20 Apr, 2013

1 commit

7e9cb5bb Merge branches 'ActionItem2544' and 'ActionItem2543' into ActionItem2543 Browse Dir »

root
2013-04-20 21:55:05 -0300

19 Apr, 2013

1 commit

10cb824b Merge branches 'master' and 'ActionItem2526' into ActionItem2526 Browse Dir »

Leandro Nunes dos Santos
2013-04-19 09:29:08 -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

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

16 Apr, 2013

2 commits

c44e24b6 Merge commit 'refs/merge-requests/296' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/296
```
Rodrigo Souto
2013-04-16 12:02:29 -0300
5ed63477 Put text into a translation context Browse Dir »

Braulio Bhavamitra
2013-04-16 17:37:21 +0000

11 Apr, 2013

2 commits

c270452d [shopping-cart] Ajusting l10n and blocking simultaneous actions Browse Dir »

Rodrigo Souto
2013-04-11 18:43:56 -0300

6be61ee9 [shopping-cart] Fixing double colorbox open and improving requests ... Browse Dir »

We improved some extra requests on the shopping cart, like: visibility
and list actions. They are now being retrieved on the get action all
together.

Also forbidding the user to request more the one action on the cart
simultaneously because the cart in the cookie doesn't supports it.
(We need the session stored in the database!)

2013-04-11 18:42:56 -0300

09 Apr, 2013

1 commit

cd916007 Adding support to choose which attributes will be displayed Browse Dir »

Leandro Nunes dos Santos
2013-04-09 13:39:25 -0300

05 Apr, 2013

1 commit

c483ebeb Merge commit 'refs/merge-requests/290' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/290
```
Rodrigo Souto
2013-04-05 14:03:03 -0300