Commit Graph

16996 Commits

Author SHA1 Message Date
William Bachion
cd1a94473c Translation update done using Pootle. 2010-07-13 23:57:32 +02:00
William Bachion
522c719554 Translation update done using Pootle. 2010-07-13 23:56:57 +02:00
William Bachion
792858e6d7 Translation update done using Pootle. 2010-07-13 23:55:09 +02:00
William Bachion
158dc66d7f Translation update done using Pootle. 2010-07-13 23:53:20 +02:00
William Bachion
c6d52b4cb0 Translation update done using Pootle. 2010-07-13 23:52:52 +02:00
Dieter Adriaenssens
84b5a0af5b Merge branch 'QA_3_3' 2010-07-13 23:40:34 +02:00
Dieter Adriaenssens
22b0ac9079 remove todo, after upgrade PHPExcel 2010-07-13 23:39:42 +02:00
Dieter Adriaenssens
17fc1370f3 Merge branch 'QA_3_3'
Conflicts:

	ChangeLog
	libraries/import.lib.php
2010-07-13 23:27:15 +02:00
Dieter Adriaenssens
6648c620d9 Convert Excel column name correctly 2010-07-13 23:23:51 +02:00
Dieter Adriaenssens
8b8562b435 cleanup (re)moved files 2010-07-13 20:35:14 +02:00
Dieter Adriaenssens
d7b8248997 Update library PHPExcel 1.7.3c in QA_3_3 branch 2010-07-13 20:23:31 +02:00
Dieter Adriaenssens
64a2832ac8 Update library PHPExcel to version 1.7.3c 2010-07-13 20:07:41 +02:00
Dieter Adriaenssens
ee0b2895ce Update library PHPExcel to version 1.7.3 2010-07-13 20:02:18 +02:00
Dieter Adriaenssens
b90a1b496b upgrade to PHPExcel 1.7.2 2010-07-13 19:42:07 +02:00
Dieter Adriaenssens
798def6e45 upgrade to PHPExcel 1.7.0 2010-07-13 19:39:40 +02:00
lorilee
5b8c603124 If the user already appended the file extension, don't add it again 2010-07-12 19:10:11 -07:00
lorilee
22254ba748 Gets rid of the forward slash that appears in the enum/set editor when there are no values 2010-07-12 18:55:21 -07:00
lorilee
27bc09c939 Merge branch 'master' of http://repo.or.cz/r/phpmyadmin 2010-07-12 12:40:27 -07:00
Marc Delisle
6ea41018b2 Merge branch 'QA_3_3' 2010-07-12 09:01:05 -04:00
Marc Delisle
768de14815 typo 2010-07-12 09:00:39 -04:00
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
Marc Delisle
ce2cad2886 fix merge conflicts 2010-07-11 08:05:50 -04:00
Marc Delisle
b55ba34d43 bug #3023507 [core] No result set display from stored procedure SELECT 2010-07-11 08:00:42 -04:00
Marc Delisle
b2616ac46d bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) 2010-07-10 08:01:07 -04:00
lorilee
0900dc1b0b Fixed a formatting bug 2010-07-08 14:07:36 -07:00
lorilee
8b6e179bd9 Changed the Import form's 'Browse the server' label to 'Browse your computer' 2010-07-08 13:50:46 -07:00
lorilee
edc8846de8 Changed the default CSV column separator from a comma to a semi-colon 2010-07-08 13:41:15 -07:00
lorilee
a62cc4d464 Changed "columns terminated with" to "columns separated with" 2010-07-08 13:40:50 -07:00
lorilee
c05038e847 Added a title to the import page to show the current import mode (server/database/table) 2010-07-08 12:37:10 -07:00
lorilee
e90f8e4d89 Added a title to the export page to show the current export mode (server/database/table) 2010-07-08 12:30:50 -07:00
lorilee
af5486fccc Moved inline css from display_export.lib.php here 2010-07-08 12:01:16 -07:00
lorilee
2a046d7b08 Removed inline css, added labels to form elements, modified file template message to make it less confusing 2010-07-08 11:57:59 -07:00
lorilee
0692c8f0b7 Disabled "Dump some row(s)" sub-options when they are not selected, fixed comments, minor refactoring 2010-07-08 11:55:21 -07:00
Marc Delisle
90ce4c77b3 clarify code 2010-07-08 08:29:27 -04:00
Marc Delisle
c1be602a1e fix merge conflicts 2010-07-08 07:52:47 -04:00
Marc Delisle
20d4c3a894 bug #3026400 [PHP] ereg functions are deprecated 2010-07-08 07:49:11 -04:00
Marc Delisle
638fe75a8b fix merge conflict 2010-07-07 09:47:12 -04:00
Marc Delisle
104b0ee99a remove reference to some old stuff 2010-07-07 09:44:44 -04:00
Marc Delisle
f95dc8d8a1 Merge branch 'QA_3_3' 2010-07-07 07:04:04 -04:00
Marc Delisle
3d23bcf1da improve English 2010-07-07 07:03:31 -04:00
Marc Delisle
d4f6b5c4ba Merge branch 'QA_3_3' 2010-07-07 06:13:38 -04:00
Marc Delisle
8a153086a1 revert to previous value and add a comment in default configuration file 2010-07-07 06:13:06 -04:00
Marc Delisle
bd09ef50ff Merge branch 'QA_3_3' 2010-07-06 16:58:50 -04:00
Marc Delisle
9903c5f3d0 bug #3025975 [auth] Odd LoginCookieValidity default value 2010-07-06 16:58:13 -04:00
lorilee
3c1e06a3e6 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-06 11:04:06 -07:00
lorilee
f06363811c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-06 10:58:17 -07:00
Piotr Przybylski
573edc0329 patch #3025161 [core] Prevent sending of unnecessary cookies 2010-07-06 11:43:02 -04:00
Marc Delisle
11609bdf80 must specify dateFormat for jQuery UI datepicker, otherwise a wrong MM/DD/YYYY is passed to MySQL 2010-07-06 11:15:46 -04:00
lorilee
fb36521902 Corrected div name 2010-07-05 16:40:11 -07:00