webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
76,679 Commits 12 Branches 481 Tags
a3d7a055ee2efaa5c1713642affb8ee9113d142d
Commit Graph

53 Commits

Author SHA1 Message Date
Alex Marin
567399c808 coding style improvements for import csv 2012-04-25 10:48:30 +03:00
Madhura Jayaratne
4b8d52d937 Fix CheckStyle warnings, Type:CloseBracketNewLine (Closing parenthesis of a multi-line IF statement must be on a new line) 2012-04-22 21:28:41 +05:30
Yuichiro
786358531b patch #3475424 [import] Fixed CSV escape for the import 2012-01-22 04:24:03 -05:00
Madhura Jayaratne
173e5926a0 More coding style improvements 2011-12-08 00:01:02 +05:30
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Michal Čihař
c6ec73963f Use PMA_sqlAddSlashes for database queries instead of addslashes. 
Should fix bug#3323066
 2011-06-21 17:41:47 +02:00
Michal Čihař
ffc01b199a Define subpackages for import modules 2011-06-21 11:41:05 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Yuichiro
6923ccab3e Patch #3302313 Show a translated label 2011-05-15 13:23:51 -04:00
Madhura Jayaratne
489d6bfce8 Bug #3196093 CSV import - Abort immediately and show error message on invalid parameters. 2011-03-05 09:53:51 +05:30
Marc Delisle
e1f019b2dc Clarify the option about INSERT IGNORE 2010-11-10 05:50:59 -05:00
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
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
6ed0cb3726 Corrected syntax for checking if a checkbox is checked 2010-07-20 13:56:28 -07: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
0ede5e680b Changed label name, added a hint for the "column names" field 2010-06-24 16:56:52 -04:00
lorilee
71ee3e6421 Fixed XHTML syntax problems 2010-06-18 16:12:41 -04:00
lorilee
30b4bc9944 Modified label text 2010-06-11 01:16:01 -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
Marc Delisle
7925c03896 gettext conversion 2010-05-11 13:05:43 -04:00
Michal Čihař
20925728e7 Replace other usages of deprecated split(). 2010-04-22 20:21:07 +02:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
4f072ddfbf incorrect calling of an error message 2009-06-27 11:41:51 +00:00
Michal Čihař
28b8e9448a rfe #1927189 strip ` from column names on import 2008-11-30 14:20:25 +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
82f7a341f1 allow just one character for "Fields enclosed by", thanks to Michal 2008-01-30 13:13:37 +00:00
Marc Delisle
b1816db8fc bug [import] Do not verify a missing enclosing character for CSV 2008-01-29 18:05:59 +00:00
Sebastian Mendel
8cd87d9e46 make use of PMA_Message 2007-10-16 09:16:41 +00:00
Marc Delisle
97f89ac682 replace various import options messages by just strOptions 2007-06-27 13:39:25 +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
adc43110f6 free memory! 2007-03-29 10:34:20 +00:00
Sebastian Mendel
8878baf7b1 #1643758 Error #1264 importing NULL values in MySQL 5.0 2007-03-19 15:41:35 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Sebastian Mendel
1eadc0a41a use @todo tag for todo items, to show up in generated documentation 2006-09-21 14:28:46 +00:00
Michal Čihař
250575b854 Fix special case of Excel export with ; at the end (bug #1511046). 2006-06-27 08:56:46 +00:00
Michal Čihař
094805dcbe Fix importing files without trailing new line (bug #1473944). 2006-04-21 07:55:12 +00:00
Michal Čihař
e89d764725 Fix parsing of large CSV files (bug #1456331). 2006-04-10 14:17:25 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Michal Čihař
3e79c53e3f Generic plugin infrastructure and use it in import (needed for RFE#1325937), work in progress. 2005-12-08 22:52:03 +00:00
Michal Čihař
7870ee574d Fix import of some CSV files (bug #1373731), provide better error messages. 2005-12-05 22:53:24 +00:00