Software Público Brasileiro

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  

05 Apr, 2013

2 commits

• 0085fd49   Adding missing require to csv Browse Dir »
  Rodrigo Souto

  2013-04-05 16:01:33 -0300  
• 7c6b674e   Apply admin/users_controller::index() optimization to stable ... Browse Dir »

  ActionItem2217

  Visita

  2013-04-05 16:08:33 -0300  

18 Mar, 2013

1 commit

• 67e8ceed   Merge branch 'master' into pluginize-solr Browse Dir »
  Rodrigo Souto

  2013-03-18 21:16:54 -0300  

15 Mar, 2013

1 commit

• eee333db   Adding option to add TagsBlock on environment through interface Browse Dir »
  Rodrigo Souto

  2013-03-15 20:55:17 +0000  

13 Mar, 2013

1 commit

• 0c1d441e   Fixing some funcitonal tests and moving solr server start to plugin Browse Dir »
  Rodrigo Souto

  2013-03-13 21:14:16 +0000  

05 Mar, 2013

1 commit

• 0fb41209   Removing solr from region tests ... Browse Dir »

  Also removing region unit tests that are already being done in the
  functional test.

  Rodrigo Souto

  2013-03-05 16:32:16 -0300  

27 Feb, 2013

1 commit

• 5954b097   Concentrating find_by_contents on application controller Browse Dir »
  Rodrigo Souto

  2013-02-27 20:29:56 -0300  

15 Jan, 2013

1 commit

• af3c320b   adding hotspots to make possible add other blocks Browse Dir »
  Leandro Nunes dos Santos

  2013-01-15 14:06:26 -0300  

25 Dec, 2012

2 commits

• 8924daed   Look for .html.erb instead of .rhtml Browse Dir »
  Antonio Terceiro

  2012-12-25 23:26:29 -0300  
• 86ecb14f   Finish removal of the deprecated terminology thing Browse Dir »

  2
  Antonio Terceiro

  2012-12-25 21:33:53 -0300  

24 Oct, 2012

1 commit

• 95080411   Merge branch 'master' into language-selection ... Browse Dir »

  Conflicts:
  	app/helpers/forms_helper.rb
  	app/models/box.rb
  	app/views/box_organizer/edit.rhtml
  	db/schema.rb
  	test/unit/box_test.rb

  Rodrigo Souto

  2012-10-24 20:04:13 +0000  

01 Oct, 2012

1 commit

• 5fb09b51   Merge branch 'stable' ... Browse Dir »

  Conflicts:
  	po/pt/noosfero.po
  	public/javascripts/application.js

  Antonio Terceiro

  2012-10-01 01:33:21 -0300  

05 Sep, 2012

1 commit

• 67c6ec49   Forces users xml file to be downloaded ... Browse Dir »

    Forces the users xml file to be downloaded instead of parsed by the
    browser, which was a little annoying if the xml was too big since
    the browser would want to load it all.
  
  (ActionItem2284)

  Larissa Reis

  2012-09-05 10:37:06 -0300  

24 Aug, 2012

1 commit

• e7b563e6   [language-selection] Available languages interface and params treatment Browse Dir »
  Rodrigo Souto

  2012-08-24 19:52:44 +0000  

09 Aug, 2012

1 commit

• c87d05b5   Small changes on licenses ... Browse Dir »

     * Licenses only can be removed with method 'post'
     * Fixing truncate calls to stop displaying deprecation warnings
     * Added buttons to add a new license and to go back to admin panel
     * Added new db/schema
  
  (ActionItem2379)

  Daniela Feitosa

  2012-08-09 00:16:26 -0300  

08 Aug, 2012

1 commit

• 3e98d8f0   Merge commit 'refs/merge-requests/187' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/187
  
  Conflicts:
  	app/models/environment.rb
  	public/stylesheets/application.css
  	test/factories.rb
  	test/fixtures/roles.yml
  	test/unit/article_test.rb

  Daniela Feitosa

  2012-08-08 16:15:14 -0300  

07 Aug, 2012

2 commits

• bac11992   [multiples-templates] Fixing redirect action and template_id param Browse Dir »
  Rodrigo Souto

  2012-08-07 22:51:33 -0300  
• 00dacfc2   [multiple-templates] Manage templates views and controllers ... Browse Dir »

  (ActionItem2378)

  Rodrigo Souto

  2012-08-07 22:51:32 -0300  

18 Jul, 2012

1 commit

• 68a4fe77   [licenses] Adding controllers and views for licenses management ... Browse Dir »

  (ActionItem2379)

  Rodrigo Souto

  2012-07-18 11:23:25 -0300  

03 Apr, 2012

1 commit

• b814464f   ActionItem 2287: Create, edit and assign roles Browse Dir »
  Caio Almeida

  2012-04-03 01:21:54 -0300  

08 Feb, 2012

1 commit

• 197f3c6b   Makes faster db consult for users list download ... Browse Dir »

    * In app/controller/admin/users_controller.rb uses a User.find() method call that uses a :include argument to load the needed Persons with a single sql instead of one sql consult per user.
    * Only call User.find() if the format is csv or xml, to avoid making the
  huge sql consult every time the user loads the page.
  
    * With this change, the downloading time of a users list on csv format
  decreased 63%, while on xml format decreased 30%.
    * I've got no guarantee it's enough time to avoid timeout in production
  server, though.
    * Not tested on debian.
  
  (ActionItem2241)

  Larissa Reis

  2012-02-08 22:22:46 -0200  

11 Oct, 2011

1 commit

• 3c89860d   Report abuse ... Browse Dir »

  Libs added
  * jquery-validation
  * colorbox
  * recaptcha
  
  (ActionItem2074)

  Rodrigo Souto

  2011-10-11 06:59:51 -0300  

27 Sep, 2011

1 commit

• 65ee2d89   Making manage categories load only what is necessary ... Browse Dir »

    * Still on the way
  
  TODO
    * Selenium tests

  Rodrigo Souto

  2011-09-27 10:24:46 -0300  

08 Aug, 2011

1 commit

• 498e40b7   HTML forms with id #ajax-form will be submited by ajax automatically ... Browse Dir »

  - fixing some bugfixes
   - all controllers under admin/ should require login
   - plugins admin interface should require at least one permission
  
  (ActionItem2056)

  Joenio Costa

  2011-08-08 15:06:16 -0300  

20 May, 2011

1 commit

• 18bbbd04   New subcategory uses parent class ... Browse Dir »

    * Also including a migration to remove subcategories of
      ProductCategory that aren't a subclass of ProductCategory.
  
  (ActionItem2007)

  Rodrigo Souto

  2011-05-20 21:02:59 -0300  

11 Apr, 2011

1 commit

• 230ff308   Removed feature to create and destroy roles ... Browse Dir »

  - It is allowed only editing roles
  
  (ActionItem1966)

  Joenio Costa

  2011-04-11 00:16:56 -0300  

04 Jan, 2011

2 commits

• 1098be61   Replacing scary eval's with String#constantize Browse Dir »
  Antonio Terceiro

  2011-01-04 17:34:25 -0300  
• f8137b7a   Plugins ... Browse Dir »

  Done:
    * Plugin loading process
    * Infra-structure for plugins registering and event activations.
    * Three fixed routes for plugins.
    * Methods to define plugins meta-information.
    * Interface for activation and deactivation of plugins in the
      environment panel.
    * Hotspots:
      - Buttons in the control panel.
      - Tabs in the profile (including expanded_template method).
      - New attributes for profile.
    * Possibility for the plugin to add new tables.
    * Mezuro prototype.
  
  Missing:
    * Test integration.
    * Dependencies integration.
    * Possibility to add behaviours in noosfero base models.

  Rodrigo Souto

  2011-01-04 16:27:41 -0300  

10 Sep, 2010

1 commit

• 37e4ba3e   Send e-mails through environment ... Browse Dir »

  * Environment admin can send e-mail to all environment users
    * Community admin can send e-mail to all community members
    * Added migrate to create mailing
    * Added job to send mailing
  
  (ActionItem1659)

  Daniela Feitosa

  2010-09-10 14:21:01 -0300  

26 Aug, 2010

1 commit

• 417935cc   Add a Raw HTML block ... Browse Dir »

  (ActionItem1652)

  Antonio Terceiro

  2010-08-26 19:22:22 -0300  

14 Aug, 2010

1 commit

• 1df72533   First stab at HTTP caching ... Browse Dir »

  Implemented cache policy:
  
    * the homepage is cached for 5 minutes by default. This time can be
      configured with the =home_cache_in_minutes= attribute in the environment.
    * non-profile pages are cached for 15 minutes by default. This time can be
      configured with the =general_cache_in_minutes= attribute in the
      environment.
    * profile pages are cached for 15 minutes by default. This time can be
      configured in the =profile_cache_in_minutes= attribute in the environment.
    * The account controller (/account/*) is not cached at all.
    * The environment administration area (/admin/*) is not cached at all.
    * The profile administration area (/myprofile/*) is not cached at all.
    * Since Varnish will not cache any request that involves cookies:
      * Authenticated users will not benefit from the cache.
      * Cookies are not allowed for unauthenticated users. So, when a response is
        being prepared for an unauthenticated user, all cookies are wiped out.
  
  The contents of the login block and the login/logout part of the header is now
  loaded via an AJAX call to /account/user_data. This way we can cache almost all
  pages without caching user-specific data.
  
  We are also changing substantially how the flash[:notice] messages work. From
  now on, instead of setting flash[:notice], we must set session[:flash]. It will
  work more or less like before, except that session[:notice] will be consumed by
  the AJAX call to /account/user_data that is done during all page loads instead
  of being consumed automatically by Rails. The only exception to this is the
  media_panel, because it uses a different layout.
  
  (ActionItem1608)

  Antonio Terceiro

  2010-08-14 18:01:09 -0300  

06 Aug, 2010

1 commit

• 2a4c443a   Exporting users from environment as XML and CSV ... Browse Dir »

  (ActionItem1605)

  Joenio Costa

  2010-08-06 16:30:51 -0300  

05 Aug, 2010

1 commit

• ecb8c987   Marking all "enterprise" mentions for terminology Browse Dir »
  Rodrigo Souto

  2010-08-05 15:42:45 -0300