Permalink
Browse files

Merge branch 'master' of github.com:planio-gmbh/redmine_lightbox

  • Loading branch information...
2 parents 8fb2ea9 + 0479144 commit 3f7a7f2c1eae0f9240e635c35d3424c565b25398 @jkraemer jkraemer committed Aug 20, 2012
Showing with 17 additions and 1 deletion.
  1. +16 −0 assets/javascripts/jquery-1.5.1.min.js
  2. +1 −1 lib/hooks/view_layouts_base_html_head_hook.rb

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -9,7 +9,7 @@ def view_layouts_base_html_head(context={})
context[:controller].is_a?(BoardsController))
return stylesheet_link_tag("jquery.fancybox-1.3.4.css", :plugin => "redmine_lightbox", :media => "screen") +
stylesheet_link_tag("lightbox.css", :plugin => "redmine_lightbox", :media => "screen") +
- javascript_include_tag('//ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js') +
+ javascript_include_tag('jquery-1.5.1.min.js', :plugin => 'redmine_lightbox') +
javascript_tag('jQuery.noConflict();') +
javascript_include_tag('jquery.fancybox-1.3.4.pack.js', :plugin => 'redmine_lightbox') +
javascript_include_tag('jquery.easing-1.3.pack.js', :plugin => 'redmine_lightbox') +

0 comments on commit 3f7a7f2

Please sign in to comment.