nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,140 Commits 1 Branch 0 Tags
1c87cda29afbcadf95e1488f9ea06a7946a1ec27
Commit Graph

106 Commits

Author SHA1 Message Date
Madhura Jayaratne
0d1407f178 bug #3486970 [import] Exception on XML import 2012-02-18 14:43:05 +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
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ř
a5e206fbd2 Disable loading of external XML entities when loading XML 
Fixes CVE-2011-4107
 2011-11-07 14:47:54 +01:00
Marc Delisle
a691fce64c bug #3428627 [import] ODS import ignores memory limits 2011-10-31 12:35:02 -04: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
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
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
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
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
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
Michal Čihař
7e954f0736 Fix message. 2010-05-22 14:11:17 +02:00
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ř
e4a399fc6a Add docs. 2010-04-29 14:10:11 +02:00
Michal Čihař
20925728e7 Replace other usages of deprecated split(). 2010-04-22 20:21:07 +02:00
Nate
1e984375b6 patch #2979234, bug #2960105 [import] Properly import unicode text from ODS. 2010-03-31 14:25:50 +02: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
078eedae6e code cleanup 2009-12-30 13:28:30 +00:00
Marc Delisle
f1f04a1b3b code cleanup; add a TODO about importing an XML export into a database different than the original one 2009-12-29 15:11:06 +00:00
Marc Delisle
7b3c21b599 code cleanup 2009-12-29 14:04:05 +00:00
Marc Delisle
2572a03033 code cleanup 2009-12-27 13:15:18 +00:00
Marc Delisle
936472a758 patch #2915168 [import] Incorrect parsing of DELIMITER keyword 2009-12-17 17:54:53 +00:00
Marc Delisle
780e876f8d bug #2537766 [import] Comments are stripped when editing store procedures 2009-09-26 11:22:19 +00:00
Derek Schaefer
c261b73045 Improved the way the import destination is decided upon. 2009-09-02 17:28:35 +00: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
9a35b4c823 bug #2634827 [import] Using DELIMITER produces infinite cycle 2009-07-04 19:00:39 +00:00