natalie
/
indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature.upgrade-jquery' of https://github.com/treffynnon/Indefero into develop

develop
Thomas Keller 2012-03-25 22:58:19 +02:00
parent f542a7fef8 c158131f88
commit d924c4e277
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IDF/templates/idf/base-full.html
View File

@ -31,7 +31,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion}
</head>
<body>

2
src/IDF/templates/idf/base-simple.html
View File

@ -31,7 +31,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion}
</head>
<body>

2
src/IDF/templates/idf/base.html
View File

@ -31,7 +31,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion}
</head>
<body>

2
src/IDF/templates/idf/gadmin/base.html
View File

@ -30,7 +30,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
{appversion}
</head>
<body>

4
www/media/idf/js/jquery-1.7.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
www/media/idf/js/jquery-1.7.2.min.js vendored 100644
View File

File diff suppressed because one or more lines are too long