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
|
a2f78a6d38
|
Resolve merge conflicts for upstream merge
|
2010-07-29 19:17:25 +05:30 |
|
lorilee
|
2a59451ac5
|
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
server_export.php
|
2010-07-26 13:42:42 -07:00 |
|
Michal Čihař
|
d291827444
|
No need to require_once footer
It is the last thing executed anyway (ends with exit).
|
2010-07-26 16:20:24 +02:00 |
|
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
|
101b14fef1
|
Modified formatting for new export page
|
2010-06-11 01:26:32 -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
|
f55823f47f
|
strings to gettext, first batch
|
2010-05-03 12:57:46 -04:00 |
|
Marc Delisle
|
87b994743b
|
primary_key is really a WHERE clause (that works also on tables where no PK is defined)
|
2009-12-30 15:27:27 +00:00 |
|
Michal Čihař
|
84ae0420fe
|
Adding @package, third part.
|
2008-11-24 11:22:44 +00:00 |
|
Marc Delisle
|
2c87a4715e
|
bug #1873110 [export] Problem exporting with a LIMIT clause
|
2008-01-18 18:29:17 +00:00 |
|
Sebastian Mendel
|
107fc46ad9
|
make use of PMA_Message
|
2007-10-16 12:14:19 +00:00 |
|
Sebastian Mendel
|
cfeb306526
|
coding standard: no spaces inside braces
|
2007-04-01 11:02:46 +00:00 |
|
Sebastian Mendel
|
adb39168cc
|
coding standard: no braces around include
|
2007-04-01 09:51:41 +00:00 |
|
Sebastian Mendel
|
b2f3ae5fcf
|
make $sql_query persistent (init it, never unset it, always assume it is set)
|
2007-04-01 09:26:14 +00:00 |
|
Sebastian Mendel
|
d0facc3d4f
|
splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php
|
2007-03-20 14:16:18 +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 |
|
Sebastian Mendel
|
d4164091ff
|
bug #1674972 no export with %afm%
|
2007-03-15 17:15:59 +00:00 |
|
Michal Čihař
|
ad06b4a991
|
Rename tbl_* files to drop useless _properties part.
|
2006-10-25 10:55:20 +00:00 |
|