Download as
Browse Code »

Commit af89dbcefa8786ae0fcb48aaa139f52b518f364c

Authored by Joenio Costa
2 parents 2de5d0d8 ca2f2b4c
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 1 changed file with 2 additions and 1 deletions   Show diff stats
app/views/layouts/chat.rhtml
  Diff comments   View file @af89dbc
... ... @@ -5,7 +5,8 @@
5 5 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
6 6 <meta name="description" content="<%= @environment.name %>" />
7 7 <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
8   - <%= javascript_include_tag 'prototype', 'jquery-latest', 'jquery.noconflict', 'jquery-ui-1.8.2.custom.min', 'jquery.scrollTo', 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '/designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'application', 'chat', :cache => 'cache-chat' %>
  8 + <%= noosfero_javascript %>
  9 + <%= javascript_include_tag 'prototype', 'jquery.scrollabletab', 'strophejs-1.0.1/strophe', 'jquery.emoticon', '/designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', :cache => 'cache-chat' %>
9 10 <%= stylesheet_link_tag noosfero_stylesheets, :cache => 'cache' %>
10 11 <%= stylesheet_link_tag icon_theme_stylesheet_path %>
11 12 <%= stylesheet_link_tag theme_stylesheet_path %>
... ...