The branch, master has been updated
via b48b13d20fb89b511348bef723bac05755d12fee (commit)
via 435c147aebd07c3b3556fd646af121e1e63cd88b (commit)
via f7d3a72af0634f9ff20e25fc682a22b6402cfc1c (commit)
from d585bba92e7daf234b71f022a2382b4f72a3ae7b (commit)
- Log -----------------------------------------------------------------
commit b48b13d20fb89b511348bef723bac05755d12fee
Author: Dieter Adriaenssens <[email protected]>
Date: Thu Aug 11 20:57:34 2011 +0200
remove library/PHPExcel from build.xml
commit 435c147aebd07c3b3556fd646af121e1e63cd88b
Merge: d585bba f7d3a72
Author: Dieter Adriaenssens <[email protected]>
Date: Thu Aug 11 20:53:21 2011 +0200
Merge branch 'QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 8 +++-----
build.xml | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index a49ddc2..5195df9 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2079,11 +2079,9 @@ $cfg['TrustedProxies'] =
The name of the directory where temporary files can be stored.
<br /><br />
- This is needed for native MS Excel export, see
- <a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr>
- 6.23</a> and to work around limitations of
- <tt>open_basedir</tt> for uploaded
- files, see <a href="#faq1_11"><abbr title="Frequently Asked
Questions">FAQ</abbr>
+ This is needed to work around limitations of <tt>open_basedir</tt>
+ for uploaded files, see
+ <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
1.11</a>.
<br /><br />
diff --git a/build.xml b/build.xml
index 9beb3aa..5365747 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
<arg line="${source_comma_sep}
xml
codesize,design,naming,unusedcode
- --exclude test,build,PHPExcel,tcpdf,php-gettext
+ --exclude test,build,tcpdf,php-gettext
--reportfile ${basedir}/build/logs/pmd.xml" />
</exec>
</target>
@@ -48,7 +48,6 @@
<arg line="--log-pmd ${basedir}/build/logs/pmd-cpd.xml
--exclude test
--exclude build
- --exclude libraries/PHPExcel
--exclude libraries/tcpdf
--exclude libraries/php-gettext
${source}" />
@@ -60,17 +59,16 @@
<arg line="--log-csv ${basedir}/build/logs/phploc.csv
--exclude test
--exclude build
- --exclude libraries/PHPExcel
--exclude libraries/tcpdf
--exclude libraries/php-gettext
${source}" />
</exec>
</target>
- <target name="phpcs" description="Generate checkstyle.xml using
PHP_CodeSniffer excluding test, PHPExcel, tcpdf directories">
+ <target name="phpcs" description="Generate checkstyle.xml using
PHP_CodeSniffer excluding test, tcpdf directories">
<exec executable="phpcs">
<arg line="
-
--ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*
+
--ignore=*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/*,*/jquery/*,*/build/*
--report=checkstyle
--report-file=${basedir}/build/logs/checkstyle.xml
--standard=PEAR
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
