Commit Graph

23 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
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
696617b4e4 Updated hidden structure/data field name, Modified label text 2010-06-09 20:27:14 -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
Herman van Rink
35609969af Renamed misleading label escapeCRLF to removeCRLF 2009-05-25 08:11:32 +00:00
Marc Delisle
a9c77afa54 patch #2715142 [export] (rfe 2416960, escape new line in CSV export) 2009-03-30 23:08:54 +00:00
Marc Delisle
5a8d192fea bug #2445213 [export] Commas for CSV Excel 2008 for Mac 2008-12-25 14:52:28 +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
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ř
861d70b5a2 Fix MIME type and extension to state before plugins were introduced (patch #1570742, thanks to ssevennm - ssevennm). 2006-10-10 14:20:58 +00:00
Michal Čihař
9199199219 Use plugins for extension and MIME type. 2006-04-26 17:49:47 +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