64 Commits

Author SHA1 Message Date
Dieter Adriaenssens
fecfe761f9 drop Devel: prefix in links to wiki 2011-03-29 10:02:02 +02:00
Michal Čihař
186426cbaf Ignore NULL charset 2011-03-18 15:29:18 +01:00
Marc Delisle
f503d5667e Merge branch 'QA_3_3' 2010-09-29 08:04:47 -04:00
Marc Delisle
22fa5adee3 bug #3056023 [import] USE query not working 2010-09-29 08:04:32 -04:00
Dieter Adriaenssens
e539a03ef9 Merge branch 'QA_3_3' 2010-09-11 11:03:15 +02:00
Dieter Adriaenssens
f5879655d5 value can be negative 2010-09-11 11:02:14 +02:00
Dieter Adriaenssens
77b6fb172d Merge branch 'QA_3_3'
Conflicts:

	ChangeLog
2010-09-10 17:34:52 +02:00
Dieter Adriaenssens
194e357a99 BIGINT field type added to table analysis on import 2010-09-10 17:28:12 +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
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
e7b130baf7 Merge remote branch 'origin/master' 2010-07-19 21:54:37 +05:30
Dieter Adriaenssens
e31dcc11ef Merge branch 'QA_3_3'
Conflicts:

	libraries/import.lib.php
2010-07-14 22:32:10 +02:00
Dieter Adriaenssens
dbe5daaad3 Converting number of Excel column names no longer limited 2010-07-14 22:29:26 +02:00
ninadsp
9dd93987ca Reverted po files changes. 2010-07-15 00:17:49 +05:30
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
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
ninadsp
a8d6f9ff4c Merge remote branch 'origin/master' 2010-06-15 15:39:51 +05:30
Marc Delisle
f1d8953670 fix conflicts 2010-06-13 08:59:05 -04:00
Marc Delisle
ae8ddbf15b bug #2986422 [import] Results for query are not displayed 2010-06-13 08:42:24 -04:00
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
Marc Delisle
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00
Marc Delisle
2b4a5e68ee gettext conversion 2010-05-09 08:03:11 -04:00
Dieter Adriaenssens
b8db7a63eb merge QA_3_3 2010-05-03 23:25:49 +02:00
Dieter Adriaenssens
a3a47a429d properly escape import value 2010-05-03 23:13:11 +02:00
Michal Čihař
07eca26675 Merge branch 'QA_3_3' 2010-03-31 14:26:08 +02:00
Nate
428ed49d17 patch #2979234 [import] Create tables with current charset and collation. 2010-03-31 14:25:41 +02:00
Michal Čihař
dea1cd19f0 Avoid duplicating the text. 2010-03-30 14:47:36 +02:00
Michal Čihař
fb21fc3ce0 Another conversion to ngettext. 2010-03-30 14:33:31 +02:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00: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
2519dd3855 code cleanup 2009-12-29 15:21:05 +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
e67f4cbc54 clarify function name 2009-06-24 11:34:56 +00:00
Marc Delisle
e2b0978a90 patch #2493494 Obsolete variable, thanks to Herman van Rink 2009-01-08 17:50:54 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
91ae7b67bd various code improvements, thanks to Piotr Przybylski 2008-08-16 12:17:52 +00:00
Marc Delisle
506d290408 bug #2004915 [bookmarks] Saved queries greater than 1000 chars not displayed 2008-08-01 20:02:21 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
e9da128bc0 strRowsDeleted, strRowsAffected 2007-10-18 17:15:39 +00:00
Sebastian Mendel
585f991656 make use of PMA_Message 2007-10-16 09:30:13 +00:00
Sebastian Mendel
b2f3ae5fcf make $sql_query persistent (init it, never unset it, always assume it is set) 2007-04-01 09:26:14 +00:00
Marc Delisle
b800466c91 avoid vim error on loading 2007-03-19 16:55:30 +00:00
Sebastian Mendel
e153586543 some doc and globals 2007-03-19 13:09:33 +00:00
Marc Delisle
42ac66ad74 get rid of propicon 2007-02-10 15:58:46 +00:00
Marc Delisle
0547dafd9b bug #1603660, incorrect escaping 2006-12-06 17:39:42 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00