54 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
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
Conflicts:
	libraries/display_export.lib.php
2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
e5e340e525 Proper propagating of overrided values. 2010-07-21 10:16:30 +02:00
Michal Čihař
cb6716c481 Documentation in LaTeX format strings. 2010-07-21 10:11:35 +02:00
Michal Čihař
906d7bc632 By default use new format strings. 2010-07-21 10:06:16 +02:00
Michal Čihař
9b2aa3c40d Indentation. 2010-07-21 09:55:13 +02:00
Michal Čihař
715f2f04f6 Move messages to place where they are used. 2010-07-21 09:54:04 +02:00
Michal Čihař
7415caa4e4 LaTeX export uses PMA_expandUserString. 2010-07-21 09:51:24 +02:00
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
8238111537 Updated hidden structure/data field name, Modified label text, Modified formatting 2010-06-09 20:29:44 -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
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
Marc Delisle
93659bd8d1 typos 2006-12-26 14:27:14 +00:00
Michal Čihař
02ff4b83d3 Fix including column names. 2006-04-28 08:51:35 +00:00
Michal Čihař
9199199219 Use plugins for extension and MIME type. 2006-04-26 17:49:47 +00:00
Michal Čihař
b3d0d7622e oops forgot to remove FIXME comments 2006-04-26 16:34:44 +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ř
1aaa89fa54 Little code reorganistaion (RFE #957308), removed some remaining php3 compatibility code in SQL parser. 2004-05-20 16:14:13 +00:00
Marcel Tschopp
fa7c795bf7 Fixed mysqli-specific export bugs. 2004-04-19 17:57:40 +00:00
Michal Čihař
7dbba54afd Support for enclosing SQL export in transaction (RFE #930827). 2004-04-14 13:31:26 +00:00
Marcel Tschopp
74cc95fe29 phpMyAdmin should now be fully compatible with the new mysqli extension. 2004-04-08 12:30:40 +00:00
Michal Čihař
97008c97fa Patch 890075 - Unbuffered query while exporting 2004-03-10 11:02:30 +00:00
Michal Čihař
382283de19 minor export fixes 2004-03-09 15:27:34 +00:00
Marc Delisle
a5d3509065 PMA_DBI_num_fields 2004-01-25 22:56:26 +00:00
Alexander M. Turek
2915b5c3ce Added MySQLi library; Removed calls to old mysql_wrappers library. 2004-01-22 02:13:48 +00:00
Marc Delisle
55d1fe7b93 use PMA_DBI function 2004-01-20 20:31:40 +00:00