Commit Graph

65091 Commits

Author SHA1 Message Date
Madhura Jayaratne
6c9c571e1b Merge branch 'QA_3_5' 2012-02-18 17:28:22 +05:30
Madhura Jayaratne
ff11bfbe64 Merge branch 'QA_3_4' into QA_3_5
Conflicts:
	libraries/common.lib.php
2012-02-18 17:25:38 +05:30
Madhura Jayaratne
f9b2f08f21 bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation 2012-02-18 17:17:01 +05:30
Madhura Jayaratne
b3a70fe352 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-02-18 15:27:05 +05:30
Madhura Jayaratne
374062112e Merge branch 'QA_3_5' 2012-02-18 15:18:11 +05:30
Madhura Jayaratne
48cbfe14ef Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-02-18 14:52:37 +05:30
Madhura Jayaratne
e14b73d23e Merge branch 'QA_3_4' into QA_3_5
Conflicts:
	libraries/common.lib.php
2012-02-18 14:51:23 +05:30
Madhura Jayaratne
0d1407f178 bug #3486970 [import] Exception on XML import 2012-02-18 14:43:05 +05:30
Madhura Jayaratne
a4183c6da2 bug #3482113 [edit] Column '0' not changeable 2012-02-18 12:32:31 +05:30
Michal Čihař
b18a8663c7 Merge remote-tracking branch 'origin/QA_3_5' 2012-02-17 20:40:30 +01:00
Michal Čihař
277045b62d Merge remote-tracking branch 'pootle/master' into QA_3_5 2012-02-17 20:39:34 +01:00
Piotr Przybylski
d9ffb35663 Merge branch 'QA_3_5' 2012-02-17 19:27:43 +01:00
Piotr Przybylski
d3b1b9f9a2 Support for Drizzle IPV6 column type in Fremont
Added SCHEMA function (synonym for DATABASE)
2012-02-17 19:26:27 +01:00
Piotr Przybylski
ea4ebbeb8d Treat performance_schema as system schema only for MySQL, not for Drizzle 2012-02-17 19:26:26 +01:00
Dieter Adriaenssens
eddb8abc18 Translation update done using Pootle. 2012-02-17 18:26:57 +02:00
Dieter Adriaenssens
299454fe88 Translation update done using Pootle. 2012-02-17 18:26:43 +02:00
Dieter Adriaenssens
18a9b19a6f Translation update done using Pootle. 2012-02-17 18:26:04 +02:00
Dieter Adriaenssens
2616f4d07e Translation update done using Pootle. 2012-02-17 18:25:51 +02:00
Dieter Adriaenssens
de98ef5e16 Translation update done using Pootle. 2012-02-17 18:25:26 +02:00
Dieter Adriaenssens
4a1226fc22 Translation update done using Pootle. 2012-02-17 18:25:19 +02:00
Dieter Adriaenssens
d6f1755528 Translation update done using Pootle. 2012-02-17 18:24:49 +02:00
Dieter Adriaenssens
b60f7fd35f Translation update done using Pootle. 2012-02-17 18:24:36 +02:00
Dieter Adriaenssens
465db2a0f0 Translation update done using Pootle. 2012-02-17 18:24:16 +02:00
Dieter Adriaenssens
ac6e157c40 Translation update done using Pootle. 2012-02-17 18:24:00 +02:00
Dieter Adriaenssens
fbfd64f168 Translation update done using Pootle. 2012-02-17 18:23:03 +02:00
Dieter Adriaenssens
772cbc4d41 Translation update done using Pootle. 2012-02-17 18:22:01 +02:00
Dieter Adriaenssens
ab7c015ce7 Translation update done using Pootle. 2012-02-17 18:21:49 +02:00
Dieter Adriaenssens
a1fbb6d6be Translation update done using Pootle. 2012-02-17 18:21:17 +02:00
Dieter Adriaenssens
ef42273af2 Translation update done using Pootle. 2012-02-17 18:20:40 +02:00
Dieter Adriaenssens
0dd98127cb Translation update done using Pootle. 2012-02-17 18:20:10 +02:00
Dieter Adriaenssens
3675597f4f Translation update done using Pootle. 2012-02-17 18:19:11 +02:00
Dieter Adriaenssens
6be5e31594 Translation update done using Pootle. 2012-02-17 18:16:43 +02:00
Dieter Adriaenssens
91e92d67f4 Translation update done using Pootle. 2012-02-17 18:14:51 +02:00
Dieter Adriaenssens
fbbffeebc4 Translation update done using Pootle. 2012-02-17 18:14:33 +02:00
Dieter Adriaenssens
b45f3d5d5b Translation update done using Pootle. 2012-02-17 18:13:48 +02:00
Dieter Adriaenssens
3735725fb8 Translation update done using Pootle. 2012-02-17 18:13:26 +02:00
Dieter Adriaenssens
0f00b3d6d3 Translation update done using Pootle. 2012-02-17 18:13:03 +02:00
Dieter Adriaenssens
2badd9fd07 Translation update done using Pootle. 2012-02-17 18:12:47 +02:00
Dieter Adriaenssens
74a447f4ab Translation update done using Pootle. 2012-02-17 18:12:22 +02:00
Dieter Adriaenssens
11f76902e8 Translation update done using Pootle. 2012-02-17 18:12:08 +02:00
Dieter Adriaenssens
3ddd82e270 Translation update done using Pootle. 2012-02-17 18:11:42 +02:00
Dieter Adriaenssens
8b7a725e3c Translation update done using Pootle. 2012-02-17 18:11:13 +02:00
Dieter Adriaenssens
91c7dc0244 Translation update done using Pootle. 2012-02-17 18:10:55 +02:00
Dieter Adriaenssens
8e0b667f06 Translation update done using Pootle. 2012-02-17 18:10:33 +02:00
Dieter Adriaenssens
50615165fe Translation update done using Pootle. 2012-02-17 18:10:11 +02:00
Dieter Adriaenssens
4a5d6a590d Translation update done using Pootle. 2012-02-17 18:10:02 +02:00
Dieter Adriaenssens
9a3717ff2e Translation update done using Pootle. 2012-02-17 18:09:27 +02:00
Dieter Adriaenssens
4ad67df700 Translation update done using Pootle. 2012-02-17 18:09:20 +02:00
Dieter Adriaenssens
c719119246 Translation update done using Pootle. 2012-02-17 18:09:15 +02:00
Dieter Adriaenssens
0082c3bf2c Translation update done using Pootle. 2012-02-17 18:09:08 +02:00