Commit Graph

11 Commits

Author SHA1 Message Date
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
3ba5c8e0f4 Fixed XHTML syntax problems 2010-06-18 16:11:52 -04:00
lorilee
25fe9dcc43 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-09 20:32:21 -04:00
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -04:00
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Michal Čihař
62c149e38d Revert part of eb5e03880e.
XLSX writer does not have setTempDir method.
2010-04-09 15:26:37 +02:00
Björn Wiberg
eb5e03880e bug #2973280 [export] Proper handling of temporary directory in XLS export. 2010-03-31 14:32:16 +02:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00