Commit Graph

55330 Commits

Author SHA1 Message Date
Madhura Jayaratne
eeeba849c3 Fix for bug #3403165 for 3.5 branch 2011-09-10 11:28:02 +05:30
Madhura Jayaratne
a67e233fa7 Merge branch 'QA_3_4'
Conflicts:
	tbl_structure.php
2011-09-10 11:13:49 +05:30
Madhura Jayaratne
5a82da9ad3 Coding style 2011-09-10 10:49:44 +05:30
Madhura Jayaratne
4232fcd458 bug #3403165 [interface] Collation not displayed for long enum fields 2011-09-10 10:47:37 +05:30
Madhura Jayaratne
9d4e9efe4b Merge branch 'QA_3_4' 2011-09-10 08:47:35 +05:30
Madhura Jayaratne
7e7e55b953 bug #3404886 [navi] Edit SQL statement after error 2011-09-10 08:43:13 +05:30
Marc Delisle
68cb87a818 Escape HTML in column names and values before json_encode() 2011-09-09 13:12:24 -04:00
Marc Delisle
85fc658f31 Missing function after merging 2011-09-08 15:54:36 -04:00
Marc Delisle
b0ef11932a Merge branch 'QA_3_4' 2011-09-08 15:44:07 -04:00
Marc Delisle
c5a6419618 Merge branch 'MAINT_3_4_5' into QA_3_4 2011-09-08 15:41:40 -04:00
Marc Delisle
bda213c58a Escape HTML in js-generated confirmation messages 2011-09-08 15:38:40 -04:00
Marc Delisle
d630321511 Missing HTML escape 2011-09-07 12:39:23 -04:00
Marc Delisle
f1fbb2bb8c Merge branch 'QA_3_4' 2011-09-07 07:37:23 -04:00
Marc Delisle
c02bd600ee ChangeLog for patch #3404173 2011-09-07 07:37:05 -04:00
Isaac Bennetch
0bdbde8c90 Patch #3404173 InnoDB comment display with tooltips/aliases 2011-09-07 07:36:00 -04:00
Michal Čihař
f4a5bf4f58 Translation update done using Pootle. 2011-09-07 09:31:23 +02:00
Michal Čihař
64ba48c22c Translation update done using Pootle. 2011-09-07 09:30:15 +02:00
Michal Čihař
0c8e49fdf1 Translation update done using Pootle. 2011-09-07 09:29:02 +02:00
Michal Čihař
f3f95687b9 Translation update done using Pootle. 2011-09-07 09:28:32 +02:00
Michal Čihař
26c5725e25 Translation update done using Pootle. 2011-09-07 09:27:56 +02:00
Michal Čihař
3509165c7d Translation update done using Pootle. 2011-09-07 09:27:23 +02:00
Michal Čihař
e25c74fc2b Translation update done using Pootle. 2011-09-07 09:26:02 +02:00
Michal Čihař
1074afb79c Translation update done using Pootle. 2011-09-07 09:24:59 +02:00
Pootle server
be0d867663 Merge remote-tracking branch 'origin/master' 2011-09-06 22:40:14 +02:00
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Dieter Adriaenssens
a30554b1e4 use require() instead of include() when including file unconditionally 2011-09-06 21:48:05 +02:00
Pootle server
02d7a2c3ba Merge remote-tracking branch 'origin/master' 2011-09-06 18:40:06 +02:00
Dieter Adriaenssens
a1c9a65994 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-09-06 17:58:28 +02:00
Dieter Adriaenssens
0ade69e84d use include() instead of require() when including file conditionally 2011-09-06 17:57:48 +02:00
Stanisław Krukowski
87cb2b3f3c Translation update done using Pootle. 2011-09-06 17:42:23 +02:00
Stanisław Krukowski
f2b8cd9135 Translation update done using Pootle. 2011-09-06 17:40:45 +02:00
Stanisław Krukowski
9e818eee1d Translation update done using Pootle. 2011-09-06 17:40:25 +02:00
Stanisław Krukowski
df93d23478 Translation update done using Pootle. 2011-09-06 17:39:26 +02:00
Stanisław Krukowski
0a4a47e8f4 Translation update done using Pootle. 2011-09-06 17:39:09 +02:00
Stanisław Krukowski
6f910ca4a4 Translation update done using Pootle. 2011-09-06 17:38:29 +02:00
Stanisław Krukowski
32e3c8b4ef Translation update done using Pootle. 2011-09-06 17:37:10 +02:00
Stanisław Krukowski
0e8950efe7 Translation update done using Pootle. 2011-09-06 17:36:01 +02:00
Stanisław Krukowski
7f585db671 Translation update done using Pootle. 2011-09-06 17:35:47 +02:00
Stanisław Krukowski
df9f58ff70 Translation update done using Pootle. 2011-09-06 17:35:02 +02:00
Stanisław Krukowski
bfaeee5ed9 Translation update done using Pootle. 2011-09-06 17:34:48 +02:00
Stanisław Krukowski
bf0ce3ab9b Translation update done using Pootle. 2011-09-06 17:34:21 +02:00
Stanisław Krukowski
641f44d2d3 Translation update done using Pootle. 2011-09-06 17:34:00 +02:00
Stanisław Krukowski
af86ca74c6 Translation update done using Pootle. 2011-09-06 17:33:25 +02:00
Stanisław Krukowski
ade52113a9 Translation update done using Pootle. 2011-09-06 17:31:09 +02:00
Stanisław Krukowski
d14edb8900 Translation update done using Pootle. 2011-09-06 17:30:17 +02:00
Stanisław Krukowski
408d7c2f4c Translation update done using Pootle. 2011-09-06 17:29:40 +02:00
Stanisław Krukowski
464e7637f8 Translation update done using Pootle. 2011-09-06 17:28:14 +02:00
Stanisław Krukowski
00656bdbce Translation update done using Pootle. 2011-09-06 17:27:13 +02:00
Stanisław Krukowski
fba9afac46 Translation update done using Pootle. 2011-09-06 17:26:44 +02:00
Stanisław Krukowski
09b1e76fb5 Translation update done using Pootle. 2011-09-06 17:22:02 +02:00