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ř
|
ee767e2d3d
|
No need to explicitely include relation.lib its anyway included in common.inc
|
2010-07-26 16:17:59 +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
|
71ee3e6421
|
Fixed XHTML syntax problems
|
2010-06-18 16:12:41 -04:00 |
|
Marc Delisle
|
b05a903dc3
|
gettext conversion
|
2010-05-14 07:47:50 -04:00 |
|
Michal Čihař
|
56941e509c
|
Adding @package, second part.
|
2008-11-24 11:05:40 +00:00 |
|
Michal Čihař
|
ebeb0c319f
|
Adding @package, first part.
|
2008-11-24 10:32:56 +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 |
|
Marc Delisle
|
97f89ac682
|
replace various import options messages by just strOptions
|
2007-06-27 13:39:25 +00:00 |
|
Sebastian Mendel
|
573a6161bd
|
fixed code indention
|
2007-05-09 12:18:57 +00:00 |
|
Sebastian Mendel
|
cfeb306526
|
coding standard: no spaces inside braces
|
2007-04-01 11:02:46 +00:00 |
|
Sebastian Mendel
|
02ecd621bb
|
return also works for includes ... so don't mess with intends
|
2007-03-29 11:45:12 +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 |
|
Michal Čihař
|
fb9a3a598e
|
Check before commit!
|
2006-11-17 08:49:30 +00:00 |
|