Download as
Browse Code »

Commit 5d1124c46f801bbad923121849721d5a7feea298

Authored by Antonio Terceiro
2 parents 3ad66691 6e951355
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 'master' into antispam

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
po/pt/noosfero.po
  Diff comments   View file @5d1124c
@@ -5110,7 +5110,7 @@ msgstr "Últimos itens" @@ -5110,7 +5110,7 @@ msgstr "Últimos itens"
5110 5110
5111 #: app/views/search/_article_last_change.rhtml:5 5111 #: app/views/search/_article_last_change.rhtml:5
5112 msgid "by %{name} at %{date}" 5112 msgid "by %{name} at %{date}"
5113 -msgstr "por %{name} em %{date2}" 5113 +msgstr "por %{name} em %{date}"
5114 5114
5115 #: app/views/search/_article_last_change.rhtml:8 5115 #: app/views/search/_article_last_change.rhtml:8
5116 msgid "Last update: %s." 5116 msgid "Last update: %s."
public/stylesheets/application.css
  Diff comments   View file @5d1124c
@@ -1390,6 +1390,7 @@ a.comment-picture { @@ -1390,6 +1390,7 @@ a.comment-picture {
1390 } 1390 }
1391 #content #article .article-body img { 1391 #content #article .article-body img {
1392 max-width: 100%; 1392 max-width: 100%;
  1393 + height: auto;
1393 } 1394 }
1394 #content .blog-post .read-more { 1395 #content .blog-post .read-more {
1395 text-align: right; 1396 text-align: right;