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
|
25fe9dcc43
|
Updated hidden structure/data field name, Modified label text, Modified formatting
|
2010-06-09 20:32: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
|
d63ed916fc
|
code cleanup
|
2009-12-30 13:46:17 +00:00 |
|
Marc Delisle
|
2500001427
|
bug #1963184 [export] YAML export improvement
|
2008-12-12 13:03:43 +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 |
|
Marc Delisle
|
73764ba49b
|
patch 1902591 (Valid YAML), thanks to Dan Barry
|
2008-03-02 20:06:09 +00:00 |
|
Sebastian Mendel
|
1e015a8214
|
bug #1826205 [export] Problems with yaml text export
|
2007-12-17 14:56:29 +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
|
26230ea6eb
|
YAML export
|
2007-02-18 13:39:27 +00:00 |
|