gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put back jQuery 1.6.2 due to conflicts with Highcharts 2.1.5 (tried to upgrade Highcharts but faced other problems)

Browse Source
This commit is contained in:
Marc Delisle 2012-04-10 18:08:58 -04:00
parent 6ae5cafb46
commit 7fb054554c
7 changed files with 2035 additions and 2459 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -20,7 +20,6 @@ phpMyAdmin - ChangeLog
+ Patch #3507001 Contest-4: Textarea for large character columns
+ Removed the PHP version of the ENUM editor
+ Patch #3507111 Display distinct results, linked to corresponding data rows
+ Update to jQuery 1.7.2
- bug #3507917 [export] JSON has unescaped values for allegedly numeric columns
+ rfe #3516187 show tables creation, last update, last check timestamps in db_structure

2
index.php
View File

@ -132,7 +132,7 @@ require 'libraries/header_http.inc.php';
// ]]>
</script>
<?php
echo PMA_includeJS('jquery/jquery-1.7.2.js');
echo PMA_includeJS('jquery/jquery-1.6.2.js');
echo PMA_includeJS('update-location.js');
echo PMA_includeJS('common.js');
?>

4483
js/jquery/jquery-1.7.2.js → js/jquery/jquery-1.6.2.js vendored
View File

File diff suppressed because it is too large Load Diff

2
libraries/common.inc.php
View File

@ -562,7 +562,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
* @global array $js_include
*/
$GLOBALS['js_include'] = array();
$GLOBALS['js_include'][] = 'jquery/jquery-1.7.2.js';
$GLOBALS['js_include'][] = 'jquery/jquery-1.6.2.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
$GLOBALS['js_include'][] = 'update-location.js';

2
navigation.php
View File

@ -100,7 +100,7 @@ require_once 'libraries/header_http.inc.php';
<link rel="stylesheet" type="text/css"
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php
echo PMA_includeJS('jquery/jquery-1.7.2.js');
echo PMA_includeJS('jquery/jquery-1.6.2.js');
echo PMA_includeJS('jquery/jquery-ui-1.8.16.custom.js');
echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js');
echo PMA_includeJS('navigation.js');

2
setup/index.php
View File

@ -36,7 +36,7 @@ require './libraries/header_http.inc.php';
<link href="../favicon.ico" rel="icon" type="image/x-icon" />
<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="styles.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../js/jquery/jquery-1.7.2.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-1.6.2.js"></script>
<script type="text/javascript" src="../js/jquery/jquery-ui-1.8.16.custom.js"></script>
<script type="text/javascript" src="../js/jquery/jquery.json-2.2.js"></script>
<script type="text/javascript" src="../js/config.js"></script>

2
test/theme.php
View File

@ -31,7 +31,7 @@ header('Content-Type: text/html; charset=utf-8');
href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<link rel="stylesheet" type="text/css" media="print"
href="../print.css" />
<script src="../js/jquery/jquery-1.7.2.js" type="text/javascript"></script>
<script src="../js/jquery/jquery-1.6.2.js" type="text/javascript"></script>
<script src="../js/messages.php" type="text/javascript"></script>
<script type="text/javascript">
var PMA_TEST_THEME = true;