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
|
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 |
|
Derek Schaefer
|
6e26b05999
|
Improved ODS date/time/datetime export format. Patch #2856664
|
2009-09-14 06:21:04 +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
|
adb39168cc
|
coding standard: no braces around include
|
2007-04-01 09:51:41 +00:00 |
|
Marc Delisle
|
b84107152d
|
bug #1688053, improvement for latest fix
|
2007-03-29 13:20:58 +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 |
|
Michal Čihař
|
67be078872
|
Include styles.xml in Open Document, now it can be opened in KOffice, Gnumeric and OpenOffice.org.
|
2006-04-28 10:46:13 +00:00 |
|
Michal Čihař
|
63097eb48e
|
fix typo
|
2006-04-28 09:29:52 +00:00 |
|
Michal Čihař
|
2e0f8f1bfa
|
Use correct charset.
|
2006-04-28 08:52:25 +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ř
|
6f0015fb8b
|
Export to OASIS OpenDocument Spreadsheet (RFE #1068007).
|
2006-04-26 18:48:03 +00:00 |
|