gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,947 Commits 12 Branches 481 Tags 2.4 GiB
bb1df87584
Commit Graph

79 Commits

Author SHA1 Message Date
Michal Čihař
9310e76a0e Fix indentation 2013-07-30 13:23:51 +02:00
Michal Čihař
c0ce163e05 Drop some unused local variables 
Found by PMD on our CI server
 2013-07-10 14:53:05 +02:00
Michal Čihař
e51f32d001 Properly set global message 2013-07-10 14:53:05 +02:00
Michal Čihař
dc809d6a8d Properly use global offset variable 2013-07-10 14:53:04 +02:00
Dieter Adriaenssens
4f63bb6bf1 Merge branch 'QA_4_0' 2013-06-24 13:30:11 +02:00
Dieter Adriaenssens
d0c0d0d207 fix typo 2013-06-24 13:29:36 +02:00
Michal Čihař
34dce1d3b4 Various coding style improvements 2013-06-11 16:27:31 +02:00
Michal Čihař
999a898aa3 Merge commit '85e5a3b5cebf5a7479779297bfcb50294f3f8725' 2013-06-11 14:58:48 +02:00
Michal Čihař
85e5a3b5ce bug #3645 Better handling of invalid ODS documents 2013-06-11 14:58:02 +02:00
Madhura Jayaratne
9c681b30af Rename PMA_import_sessionCheck() -> PMA_Import_sessionCheck() 2013-06-11 17:02:20 +05:30
Madhura Jayaratne
0ecadbba0d Rename PMA_import_progressCheck() -> PMA_Import_progressCheck() 2013-06-11 17:01:42 +05:30
Madhura Jayaratne
37eaa0a680 rename PMA_import_apcCheck() -> PMA_Import_apcCheck() 2013-06-11 17:00:11 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
140eb64350 Merge commit '078da8d' 2013-05-23 02:57:02 -04:00
Marc Delisle
078da8d57f bug #3933 Do not translate "Open Document" in export settings 2013-05-23 02:54:47 -04:00
Madhura Jayaratne
d7db600379 Merge branch 'QA_4_0' 2013-05-20 17:53:15 +05:30
Madhura Jayaratne
b3e6f8cee7 bug #3924 Show warning when CSV file does not contain data for all columns 2013-05-20 17:50:19 +05:30
Marc Delisle
4bdd15fd33 Fix merge conflicts 2013-05-19 08:55:36 -04:00
Marc Delisle
9b61212b48 bug #3946 Missing CSV import option "Do not abort on INSERT error" 2013-05-19 08:44:45 -04:00
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems 
Thanks Rasmus Lerdorf for analyzing!
 2013-05-13 11:27:56 +02:00
Marc Delisle
13c6e82551 Fix merge conflicts 2013-05-12 08:18:08 -04:00
Marc Delisle
4113d9e98b bug #3915 Import of CSV file (Replace table data with file) with duplicate values 2013-05-12 08:09:02 -04:00
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30
Kasun Chathuranga
a242ed1ae5 PMA_DBI_fetch_row --> PMA_DBI_fetchRow 2013-05-04 08:31:22 +05:30
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp 
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
 2013-05-01 00:51:15 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Michal Čihař
69118c1134 Various PHP coding style fixes 2013-04-26 09:54:13 +02:00
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0' 
Conflicts:
	ChangeLog
 2013-04-25 20:54:51 +05:30
Michal Čihař
49a58c54d3 Consitent parameters naming 
Use same names in preferences and error messages as in export page.
 2013-04-25 14:38:41 +02:00
Kasun Chathuranga
edbe925d8a Minimize code duplication by pushing most of the common code to abstract parent class's setProperties() method 2013-04-19 23:00:22 +05:30
Kasun Chathuranga
175cb7b0ae Fix format specific options that were missing from ImportLdi plugin. Common code pulled out to AbstractImportCsv.class.php. 2013-04-18 22:44:49 +05:30
Kasun Chathuranga
4477494216 Importing CSV was also broken 2013-04-17 23:25:53 +05:30
Kasun Chathuranga
06655bf45d Fix bug #3879 Import broken for CSV using LOAD DATA 2013-04-17 23:25:16 +05:30
Dieter Adriaenssens
f14aef2866 remove unused variables 2013-01-24 17:31:06 +01:00
Madhura Jayaratne
c9f37be407 Add @subpackage tags 2012-10-28 18:27:38 +05:30
Michal Čihař
869d7c0e99 Use single quotes when we do not want to evaluate the string 2012-10-16 11:18:16 +02:00
Marc Delisle
4f2d952cb9 Remove support for the unactive docSQL import format 2012-10-15 12:42:02 -04:00
Chanaka Indrajith
abf9e1d8db Merge remote branch 'upstream/master' 2012-09-16 17:13:58 +05:30
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Madhura Jayaratne
432040c52d Forgot to change imports 2012-09-16 00:07:02 +05:30
Madhura Jayaratne
2d34f51bfd We use PMA_ prefix for class names, but not for their file names 2012-09-15 23:00:36 +05:30
Madhura Jayaratne
2be4178527 Merge branch 'QA_3_5' 
Conflicts:
	libraries/import/xml.php
	po/ar.po
	po/de.po
 2012-09-08 10:31:00 +05:30
Madhura Jayaratne
3711b57df6 Fix coding style 2012-09-01 07:29:48 +05:30
Alex Marin
34a0dace8a oop: some coding style for plugins 2012-08-16 23:10:33 +03:00