The branch, master has been updated
via 07f63b17ba0779f225d6418276bbef5529d8965c (commit)
from 11b52ec3eb2470840f14ac67ad621029320b5515 (commit)
- Log -----------------------------------------------------------------
commit 07f63b17ba0779f225d6418276bbef5529d8965c
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun May 16 07:12:03 2010 -0400
3.3.x no longer uses PEAR Excel module
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index fc2af1f..13bdc90 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4288,37 +4288,12 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
<a href="#faq6_23">6.23 Export: I heard phpMyAdmin can export Microsoft
Excel files, how can I enable that?</a></h4>
-<p> Current version does support direct export to Microsoft Excel and Word
- versions 2000 and newer. If you need export older versions, you can use
- <abbr title="comma separated values">CSV</abbr> suitable for Microsoft Excel,
- which works out of the box or you can
- try native <b>experimental</b> MS Excel exporter. <b>This export has
- several problems, most important are limitation of cell content to 255
- chars and no support for charsets, so think carefully whether you want to
- enable this.</b>. For enabling this you need to set
- <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a> to
- place where web server user can write (for example <tt>'./tmp'</tt>) and
- install <abbr title="PHP Extension and Application Repository">PEAR</abbr>
- module Spreadsheet_Excel_Writer into php include path. The
- installation can be done by following command:</p>
-
-<pre>
-pear -d preferred_state=beta install -a Spreadsheet_Excel_Writer
-</pre>
-
-<p> First part of switches set we want to install beta version of that module
- (no stable version available yet) and then we tell pear we want to satisfy
- dependencies.</p>
-
-<p> If you are running in PHP safe mode, you will have to set
- in <tt>php.ini</tt> the <tt>safe_mode_include_dir</tt> to the directory
- where your <abbr title="PHP Extension and Application Repository">PEAR</abbr>
- modules are located, for example:</p>
-
-<pre>
-safe_mode_include_dir = /usr/local/lib/php
-</pre>
-
+<p> You can use
+ <abbr title="comma separated values">CSV</abbr> for Microsoft Excel,
+ which works out of the box, but phpMyAdmin supports direct export
+ to Microsoft Excel version 97 and newer. For this to work, you need to set
+ <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a> to a
+ place where the web server user can write (for example <tt>'./tmp'</tt>).</p>
<p> To create the temporary directory on a UNIX-based system, you can do:</p>
<pre>
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via b52c1b578a83979d2161b612b96a912413348a4f (commit)
from 33fba5543640003e8eb681443f8bb36648a0611b (commit)
- Log -----------------------------------------------------------------
commit b52c1b578a83979d2161b612b96a912413348a4f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun May 16 07:07:54 2010 -0400
3.3.x no longer uses PEAR Excel module
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 93d7eed..15744ca 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4260,37 +4260,12 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
<a href="#faq6_23">6.23 Export: I heard phpMyAdmin can export Microsoft
Excel files, how can I enable that?</a></h4>
-<p> Current version does support direct export to Microsoft Excel and Word
- versions 2000 and newer. If you need export older versions, you can use
- <abbr title="comma separated values">CSV</abbr> suitable for Microsoft Excel,
- which works out of the box or you can
- try native <b>experimental</b> MS Excel exporter. <b>This export has
- several problems, most important are limitation of cell content to 255
- chars and no support for charsets, so think carefully whether you want to
- enable this.</b>. For enabling this you need to set
- <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a> to
- place where web server user can write (for example <tt>'./tmp'</tt>) and
- install <abbr title="PHP Extension and Application Repository">PEAR</abbr>
- module Spreadsheet_Excel_Writer into php include path. The
- installation can be done by following command:</p>
-
-<pre>
-pear -d preferred_state=beta install -a Spreadsheet_Excel_Writer
-</pre>
-
-<p> First part of switches set we want to install beta version of that module
- (no stable version available yet) and then we tell pear we want to satisfy
- dependencies.</p>
-
-<p> If you are running in PHP safe mode, you will have to set
- in <tt>php.ini</tt> the <tt>safe_mode_include_dir</tt> to the directory
- where your <abbr title="PHP Extension and Application Repository">PEAR</abbr>
- modules are located, for example:</p>
-
-<pre>
-safe_mode_include_dir = /usr/local/lib/php
-</pre>
-
+<p> You can use
+ <abbr title="comma separated values">CSV</abbr> for Microsoft Excel,
+ which works out of the box, but phpMyAdmin supports direct export
+ to Microsoft Excel version 97 and newer. For this to work, you need to set
+ <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a> to a
+ place where the web server user can write (for example <tt>'./tmp'</tt>).</p>
<p> To create the temporary directory on a UNIX-based system, you can do:</p>
<pre>
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 9735acdda4bf0055bfc534bc0ed603ef9880a0d9 (commit)
from ccd8da050198688febbc47bf918845d333cef1e1 (commit)
- Log -----------------------------------------------------------------
commit 9735acdda4bf0055bfc534bc0ed603ef9880a0d9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri May 14 13:38:48 2010 -0400
missing escape for quote
-----------------------------------------------------------------------
Summary of changes:
import.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/import.php b/import.php
index 0fb559b..9498752 100644
--- a/import.php
+++ b/import.php
@@ -423,7 +423,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
if ($timeout_passed) {
$message = PMA_Message::error(__('Script timeout passed, if you want to finish import, please resubmit same file and import will resume.'));
if ($offset == 0 || (isset($original_skip) && $original_skip == $offset)) {
- $message->addString(__('However on last run no data has been parsed, this usually means phpMyAdmin won't be able to finish this import unless you increase php time limits.'));
+ $message->addString(__('However on last run no data has been parsed, this usually means phpMyAdmin won\'t be able to finish this import unless you increase php time limits.'));
}
}
hooks/post-receive
--
phpMyAdmin