nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,628 Commits 1 Branch 0 Tags
ff375abc90be2acedfeca256e4555e5117030927
Commit Graph

50 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
Michal Čihař
c7815a8650 Fix typo. 2010-08-19 11:47:39 +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
8397112a67 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee 2010-07-16 16:54:59 -07:00
ninadsp
9dd93987ca Reverted po files changes. 2010-07-15 00:17:49 +05:30
lorilee
5fab0e993c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-14 11:33:45 -07:00
Marc Delisle
6ea41018b2 Merge branch 'QA_3_3' 2010-07-12 09:01:05 -04:00
Marc Delisle
768de14815 typo 2010-07-12 09:00:39 -04:00
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
lorilee
a62cc4d464 Changed "columns terminated with" to "columns separated with" 2010-07-08 13:40:50 -07:00
lorilee
3ba5c8e0f4 Fixed XHTML syntax problems 2010-06-18 16:11:52 -04:00
lorilee
7fdcd05dcb Updated hidden structure/data field name, Modified label text 2010-06-11 01:26:34 -04:00
lorilee
af861fba90 Updated hidden structure/data field name, Modified label text 2010-06-09 20:26:41 -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
Michal Čihař
73c75aacd2 There is no need to duplicate this message. 2010-05-03 14:00:06 +02:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
81b5cfbc51 undefined variable 2009-06-27 11:57:11 +00: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
Marc Delisle
398feb40fd patch #2407785 [cleanup] ereg*() deprecated in PHP 5.3 2008-12-14 13:58:06 +00:00
Michal Čihař
5d010348da Add phpdoc package header to some files. 2008-11-24 09:14:31 +00:00
Marc Delisle
96adecc19b bug #1989281 [export] CSV for MS Excel incorrect escaping of double quotes 2008-06-28 14:17:11 +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
dafe790a10 patch #1861717 [export] CSV Escape character not exported right 2008-01-02 16:46:42 +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ř
0d9c5892c6 Fix cvs/csv typo. 2006-10-13 08:14:31 +00:00
Michal Čihař
af54eb141e Handle correctly AUTO (bug #1497239). 2006-05-30 13:46:13 +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
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Michal Čihař
64bd56dfba Support for browsing selected columns (RFE #1275909). 2005-09-26 19:03:11 +00:00
Michal Čihař
c96042f9e1 Do not strip export too much (bug #913988). 2004-04-14 13:48:41 +00:00
Michal Čihař
7dbba54afd Support for enclosing SQL export in transaction (RFE #930827). 2004-04-14 13:31:26 +00:00
Marcel Tschopp
74cc95fe29 phpMyAdmin should now be fully compatible with the new mysqli extension. 2004-04-08 12:30:40 +00:00
Michal Čihař
97008c97fa Patch 890075 - Unbuffered query while exporting 2004-03-10 11:02:30 +00:00
Alexander M. Turek
2915b5c3ce Added MySQLi library; Removed calls to old mysql_wrappers library. 2004-01-22 02:13:48 +00:00
Marc Delisle
55d1fe7b93 use PMA_DBI function 2004-01-20 20:31:40 +00:00
Garvin Hicking
f0da471ec3 /libraries cleanup hopefully done. Double-Checked every change, my installation still works. ;) 
Will continue working on remaining files tomorrow and hope to make it to the end of the next day.
 2003-11-20 16:31:51 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00