The branch, master has been updated
via af6ef146733f257210fd5088054f381f075c18d5 (commit)
from e66884f57635b6193f828b18289edbf80cd3f2ad (commit)
- Log -----------------------------------------------------------------
commit af6ef146733f257210fd5088054f381f075c18d5
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sat Dec 11 06:36:08 2010 -0500
Improve message
-----------------------------------------------------------------------
Summary of changes:
scripts/create-release.sh | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index c6a6cf6..f0056d7 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -54,8 +54,7 @@ shift
cat <<END
-Please ensure you have:
- 1. incremented rc count or version in the repository :
+Please ensure you have incremented rc count or version in the repository :
- in libraries/Config.class.php PMA_Config::__constructor() the line
" \$this->set( 'PMA_VERSION', '$version' ); "
- in Documentation.html the 2 lines
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 4645bd5475412146a9e47991718d13d90c558e80 (commit)
from b71529bb72c96e755ab777b7015b985e4fb480d9 (commit)
- Log -----------------------------------------------------------------
commit 4645bd5475412146a9e47991718d13d90c558e80
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sat Dec 11 06:28:16 2010 -0500
Remove reference to an older script
-----------------------------------------------------------------------
Summary of changes:
scripts/create-release.sh | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 3fb94c0..c6a6cf6 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -63,8 +63,6 @@ Please ensure you have:
" <h1>phpMyAdmin $version Documentation</h1> "
- in translators.html
- in README
- 2. checked that all language files are valid (use
- the "./scripts/check_lang.php" script to do it).
Continue (y/n)?
END
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via b71529bb72c96e755ab777b7015b985e4fb480d9 (commit)
from 07ff69495bbb23dae1213b3b301da25ea7e9b851 (commit)
- Log -----------------------------------------------------------------
commit b71529bb72c96e755ab777b7015b985e4fb480d9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Dec 10 13:22:48 2010 -0500
bug #3125624 - fix for RTL languages
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 97cc42f..e37a258 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -35,16 +35,13 @@ function getFieldName($this_field, disp_mode) {
}
else {
var this_field_index = $this_field.index();
- if(window.parent.text_dir == 'ltr') {
- // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors but index is zero-based so substract 3
- var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text();
- // happens when just one row (headings contain no a)
- if ("" == field_name) {
- field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+')').text();
- }
- }
- else {
- var field_name = $('#table_results').find('thead').find('th:nth('+ this_field_index+') a').text();
+ // ltr or rtl direction does not impact how the DOM was generated
+ //
+ // 4 columns to account for the checkbox, edit, delete and appended inline edit anchors but index is zero-based so substract 3
+ var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text();
+ // happens when just one row (headings contain no a)
+ if ("" == field_name) {
+ field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+')').text();
}
}
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 07ff69495bbb23dae1213b3b301da25ea7e9b851 (commit)
from b924bc7c112f5ed6f80da7f195687ce632feacf9 (commit)
- Log -----------------------------------------------------------------
commit 07ff69495bbb23dae1213b3b301da25ea7e9b851
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Dec 9 13:26:05 2010 -0500
bug #3125624 Inline editing fails when just one row (fixed for LTR languages in horizontal and vertical modes)
-----------------------------------------------------------------------
Summary of changes:
js/sql.js | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/js/sql.js b/js/sql.js
index 57cb761..97cc42f 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -28,15 +28,23 @@ function getFieldName($this_field, disp_mode) {
if(disp_mode == 'vertical') {
var field_name = $this_field.siblings('th').find('a').text();
+ // happens when just one row (headings contain no a)
+ if ("" == field_name) {
+ field_name = $this_field.siblings('th').text();
+ }
}
else {
var this_field_index = $this_field.index();
if(window.parent.text_dir == 'ltr') {
// 4 columns to account for the checkbox, edit, delete and appended inline edit anchors but index is zero-based so substract 3
- var field_name = $this_field.parents('table').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text();
+ var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+') a').text();
+ // happens when just one row (headings contain no a)
+ if ("" == field_name) {
+ field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-3 )+')').text();
+ }
}
else {
- var field_name = $this_field.parents('table').find('thead').find('th:nth('+ this_field_index+') a').text();
+ var field_name = $('#table_results').find('thead').find('th:nth('+ this_field_index+') a').text();
}
}
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via b924bc7c112f5ed6f80da7f195687ce632feacf9 (commit)
via 2ba852dc5ca3dc9d2697ee29bd11ad61ab987553 (commit)
via bc0b9fa744bd1b1a7ff460f728248e581ee106f0 (commit)
via b1103e2db99405d032a230ed50f0b88b799605a3 (commit)
via f805097b86fabd3d4c8dff1f2324efdae1ca0d70 (commit)
from c8711412367d492e94d6c2de1ff3b6b716198005 (commit)
- Log -----------------------------------------------------------------
commit b924bc7c112f5ed6f80da7f195687ce632feacf9
Merge: c8711412367d492e94d6c2de1ff3b6b716198005 2ba852dc5ca3dc9d2697ee29bd11ad61ab987553
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Dec 9 14:19:35 2010 +0100
Merge branch 'QA_3_3'
Conflicts:
pdf_pages.php
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via c8711412367d492e94d6c2de1ff3b6b716198005 (commit)
from ec9af602896171c65bc48ebe7fffef8592ccdaf5 (commit)
- Log -----------------------------------------------------------------
commit c8711412367d492e94d6c2de1ff3b6b716198005
Author: Adnan <hiddenpearls(a)gmail.com>
Date: Thu Dec 9 08:03:59 2010 -0500
bug #3112614 [pdf schema] Scratchboard for PDF pages not working
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9d4692b..c21fe3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -136,6 +136,7 @@
- bug #1762306 [core] Copy database with view of a view
- patch #3117535 [replication] Add quotes to database in initial statement,
thanks to Craig Duncan - duncan3dc
+- bug #3112614 [pdf schema] Scratchboard for PDF pages not working
3.3.8.1 (2010-11-29)
- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
hooks/post-receive
--
phpMyAdmin