Download as
Browse Code »

Commit 8c7fd1cd963ff8746d8d10763b4980baafb405f5

Authored by Rodrigo Souto
2 parents 96ad392a a4558a07
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable'

Showing 3 changed files with 8 additions and 2 deletions   Show diff stats
app/views/catalog/index.rhtml
  Diff comments   View file @8c7fd1c
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <% end %> 92 <% end %>
93 <% product.price_details.each do |i| %> 93 <% product.price_details.each do |i| %>
94 <div class="search-product-input-dots-to-price"> 94 <div class="search-product-input-dots-to-price">
95 - <div class="search-product-input-name"><%= i.production_cost.name %></div> 95 + <div class="search-product-input-name"><%= i.name %></div>
96 <%= price_span i.price, :class => 'search-product-input-price' %> 96 <%= price_span i.price, :class => 'search-product-input-price' %>
97 </div> 97 </div>
98 <% end %> 98 <% end %>
debian/changelog
  Diff comments   View file @8c7fd1c
  1 +noosfero (0.44.6) unstable; urgency=low
  2 +
  3 + * 0.44.5 Addendum
  4 +
  5 + -- Rodrigo Souto <rodrigo@colivre.coop.br> Wed, 27 Nov 2013 16:45:02 -0300
  6 +
1 noosfero (0.44.5) unstable; urgency=low 7 noosfero (0.44.5) unstable; urgency=low
2 8
3 * Bugfix release 9 * Bugfix release
lib/noosfero.rb
  Diff comments   View file @8c7fd1c
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39; @@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
3 3
4 module Noosfero 4 module Noosfero
5 PROJECT = 'noosfero' 5 PROJECT = 'noosfero'
6 - VERSION = '0.44.5' 6 + VERSION = '0.44.6'
7 7
8 def self.pattern_for_controllers_in_directory(dir) 8 def self.pattern_for_controllers_in_directory(dir)
9 disjunction = controllers_in_directory(dir).join('|') 9 disjunction = controllers_in_directory(dir).join('|')