Commit Graph

36 Commits

Author SHA1 Message Date
Michal Čihař
d17fba309c Fix permissions.
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
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
1ed8542945 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-09 20:27:58 -04:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -04:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
d63ed916fc code cleanup 2009-12-30 13:46:17 +00:00
Herman van Rink
5f4f2e8f3f bug #2687046 [export] Structure export: Null always YES 2009-04-14 13:34:20 +00:00
Marc Delisle
398feb40fd patch #2407785 [cleanup] ereg*() deprecated in PHP 5.3 2008-12-14 13:58:06 +00:00
Michal Čihař
5d010348da Add phpdoc package header to some files. 2008-11-24 09:14:31 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Sebastian Mendel
8a3d582aaa removed MySQL < 5 code 2007-10-02 08:47:20 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Marc Delisle
d51f1126f6 use generic $strOptions 2007-02-19 18:15:55 +00:00
Marc Delisle
b0588d3570 bug #1621280, support VIEW dependencies during export 2006-12-26 16:10:47 +00:00
Michal Čihař
5ec84ee7f8 Fix including column names. 2006-04-27 22:28:55 +00:00
Michal Čihař
0afc370aa7 Allow forcing of export to file, it makes no sense to display PDF in textarea ;-). 2006-04-26 19:16:52 +00:00
Michal Čihař
9199199219 Use plugins for extension and MIME type. 2006-04-26 17:49:47 +00:00
Michal Čihař
6e17c995fb Convert export to plugin architecture, so that plugins are independant piece of code (RFE #1325937). 2006-04-26 16:33:59 +00:00
Sebastian Mendel
6b4f751e41 fixed bug #1409972 PHP 5.1.2 compatibility 2006-01-19 15:39:29 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Michal Čihař
42d5ca744b Use native MySQL comments when applicable (RFE #1362923). 2005-11-23 22:13:18 +00:00
Marc Delisle
7cf7ada8ac patch #1253465, avoid error messages for unset variables in PHP functions that require a parameter passed by reference 2005-08-14 21:34:01 +00:00
Michal Čihař
57fc27c0bd Fix undefined variable when exporting relations (bug #1253457). 2005-08-08 20:13:03 +00:00
Michal Čihař
a3d769e73d Word export now can contain table structure and better handles more tables/databases export. 2005-03-06 14:54:15 +00:00
Michal Čihař
d5f9ad07b7 Added Microsoft Word and Excel 2000 export (RFE #1155122). 2005-03-06 12:52:20 +00:00