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

136 Commits

Author SHA1 Message Date
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
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +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
Michal Čihař
efd8db8298 bug #3208723 [import] Fix import of utf-8 XML files. 
The string should be already in utf-8.
 2011-03-18 15:36:04 +01:00
Michal Čihař
65e53a8bb8 bug#3212720 Show error message on error. 2011-03-17 16:11:02 +01: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ř
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Michal Čihař
4f487780a0 bug #3042665 [parser] Add workaround for MySQL way of handling backtick. 2010-08-30 17:19:11 +02:00
Michal Čihař
0d1b515769 Fixed detection of ods_col_names (bug #3056017). 2010-08-30 14:47:14 +02: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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00