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

154 Commits

Author SHA1 Message Date
Madhura Jayaratne
e14b73d23e Merge branch 'QA_3_4' into QA_3_5 
Conflicts:
	libraries/common.lib.php
 2012-02-18 14:51:23 +05:30
Madhura Jayaratne
0d1407f178 bug #3486970 [import] Exception on XML import 2012-02-18 14:43:05 +05:30
Yuichiro
786358531b patch #3475424 [import] Fixed CSV escape for the import 2012-01-22 04:24:03 -05:00
Madhura Jayaratne
25b78bef1b Merge branch 'QA_3_4' 2011-12-24 21:33:35 +05:30
Madhura Jayaratne
cd294e5b97 bug #3049209 [import] Import from ODS ignores cell that is the same as cell before 2011-12-24 21:31:08 +05:30
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
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00
Marc Delisle
839c0d493a Merge branch 'QA_3_4' 2011-11-10 09:00:13 -05:00
Marc Delisle
edea25b07b Merge branch 'MAINT_3_4_7' into QA_3_4 2011-11-10 08:56:39 -05:00
Michal Čihař
34d99de000 Disable XML loading plugins on old PHP 
When libxml_disable_entity_loader is not available, we can not guarantee
safe handling of XML data.
 2011-11-07 15:18:10 +01:00
Michal Čihař
f496bc9f1f Better error message 2011-11-07 15:16:47 +01:00
Michal Čihař
a5e206fbd2 Disable loading of external XML entities when loading XML 
Fixes CVE-2011-4107
 2011-11-07 14:47:54 +01:00
Marc Delisle
00576dc1bb Fix merge conflicts 2011-10-31 12:36:45 -04:00
Marc Delisle
a691fce64c bug #3428627 [import] ODS import ignores memory limits 2011-10-31 12:35:02 -04:00
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
Madhura Jayaratne
21c5148d17 Style errors with class declarations 2011-09-23 11:24:06 +05:30
Madhura Jayaratne
f1745c155d Drizzle does not support GIS data types. So no need to import ESRI shape files 2011-09-21 09:56:05 +05:30
Piotr Przybylski
746f3566bb set_time_limit may fail, make it do so silently 2011-08-17 22:22:39 +02:00
Madhura Jayaratne
683a512c41 Wrap long lines. 2011-08-18 00:04:40 +05:30
Madhura Jayaratne
5f2a52153b Use include_once when included conditionally 2011-08-17 23:54:14 +05:30
Madhura Jayaratne
18f567a3f1 Correcting indentation for switch statements 2011-08-17 23:52:36 +05:30
Madhura Jayaratne
1a1833662f Wrap long lines 2011-08-17 23:48:19 +05:30
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Piotr Przybylski
6dca42107e Fix comments in upload progress libs and add make returns consistent 2011-08-16 14:18:15 +02:00
Piotr Przybylski
cc4743d396 'comment' is not a reserved keyword, remove PMA_backquote 2011-08-16 00:05:26 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Dieter Adriaenssens
45aac8dbf4 coding style 2011-08-11 21:37:36 +02:00
Dieter Adriaenssens
fd383934af Merge branch 'QA_3_4' 2011-08-10 20:58:45 +02:00
Dieter Adriaenssens
556636457a Remove library PHPExcel, due to license issues 
Remove native Excel exportand import modules (xls and xlsx formats)
 2011-08-10 20:53:51 +02:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
 2011-07-24 23:05:35 +05:30
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Madhura Jayaratne
47fdfad336 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/gis/pma_gis_geometrycollection.php
 2011-07-22 04:07:09 +05:30
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Madhura Jayaratne
6f35aaa8e4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
 2011-07-20 23:15:01 +05:30
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
7e27edbb6d Hide warnings that may arise from ini_set('memory_limit', ...) and set_time_limit when used in safe_mode 2011-07-20 16:57:07 +02:00
Madhura Jayaratne
c18ef53b57 Do not use PMA_mysqlDie() to handle these errors. 2011-07-15 18:30:28 +05:30
Madhura Jayaratne
66f73b4114 Better error handling. 2011-07-14 09:59:35 +05:30
Madhura Jayaratne
e0e0dea09b 1) Better error handling. 2)Typo 2011-07-14 00:09:25 +05:30
Madhura Jayaratne
a1e6b187c6 Correctly display error message for zero data. 2011-07-13 23:51:25 +05:30
Madhura Jayaratne
2bf70868bb Avoid undefined variables 2011-07-13 00:19:11 +05:30
Madhura Jayaratne
a58bb10e18 Correctly import multipolygons from ESRI shape files 2011-07-08 18:32:35 +05:30
Madhura Jayaratne
28519cf25b ESRI shape files imported from a zip archive 2011-07-08 18:31:19 +05:30
Madhura Jayaratne
c6a8098239 Typo 2011-07-04 00:31:24 +05:30
Madhura Jayaratne
5a1018fc43 Increase memory limit and time limit 2011-07-03 23:56:47 +05:30
Madhura Jayaratne
c4faafdc79 Import GIS data from ESRI shape files 2011-07-03 22:12:02 +05:30