Commit Graph

48863 Commits

Author SHA1 Message Date
Piotr Przybylski
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
2011-07-27 20:10:38 +02:00
Piotr Przybylski
e82682d0e4 Simplify PMA_DBI_free_result
It was never used with multiple arguments
2011-07-27 19:59:49 +02:00
Piotr Przybylski
b9ff7b7ce2 Support persistent connections with mysqli extension (only PHP 5.3.0 and newer) 2011-07-27 19:59:49 +02:00
Piotr Przybylski
f43517efb5 mysql extension - remove 'persistent' parameter
Was named 'persistant' and never used/documented
2011-07-27 19:59:49 +02:00
Piotr Przybylski
46cd0f9a09 Comments 2011-07-27 19:59:49 +02:00
Piotr Przybylski
b0ce7c20c4 Improve readability 2011-07-27 19:59:48 +02:00
Piotr Przybylski
69ac509584 This should be checked in common, not in dbi library 2011-07-27 19:59:48 +02:00
Piotr Przybylski
2141b5fe81 Fix incorrect variable name
persistant > persistent
2011-07-27 19:59:48 +02:00
Thilanka Kaushalya
f89a16ed81 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-27 19:57:08 +05:30
Thilanka Kaushalya
f45c4292c1 included tbl change.js file to the tbl select.php file 2011-07-27 19:56:23 +05:30
Rouslan Placella
ad4975b82d Merge branch 'QA_3_4'
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
2011-07-26 14:39:20 +01:00
Rouslan Placella
402a832e93 Fixed bug #3375325 - Page list in navigation frame looks odd 2011-07-26 14:35:47 +01:00
Michal Čihař
9525cac85c Update CodeMirror to 2.12 2011-07-26 07:21:27 +02:00
Abdullah Al-Saedi
c50d21541b Translation update done using Pootle. 2011-07-25 22:07:25 +02:00
Abdullah Al-Saedi
1ef4561769 Translation update done using Pootle. 2011-07-25 22:06:23 +02:00
Abdullah Al-Saedi
d3eece0801 Translation update done using Pootle. 2011-07-25 22:05:58 +02:00
Abdullah Al-Saedi
e6aec890e1 Translation update done using Pootle. 2011-07-25 22:05:39 +02:00
Abdullah Al-Saedi
fddf190ebf Translation update done using Pootle. 2011-07-25 22:05:29 +02:00
Abdullah Al-Saedi
358fe9e2db Translation update done using Pootle. 2011-07-25 22:05:21 +02:00
Abdullah Al-Saedi
73582711a8 Translation update done using Pootle. 2011-07-25 22:05:03 +02:00
Abdullah Al-Saedi
e78d4c6545 Translation update done using Pootle. 2011-07-25 22:04:49 +02:00
Abdullah Al-Saedi
3e580b3bec Translation update done using Pootle. 2011-07-25 22:04:05 +02:00
Abdullah Al-Saedi
c8491c893d Translation update done using Pootle. 2011-07-25 22:03:16 +02:00
Piotr Przybylski
487da6e7af Use $logAnalyseDialog instead of multiple lookups for $('#logAnalyseDialog') 2011-07-25 22:00:44 +02:00
Abdullah Al-Saedi
5299f56eb0 Translation update done using Pootle. 2011-07-25 22:00:37 +02:00
Abdullah Al-Saedi
a4a1ce2f5e Translation update done using Pootle. 2011-07-25 22:00:14 +02:00
Abdullah Al-Saedi
48f422999e Translation update done using Pootle. 2011-07-25 21:59:42 +02:00
Abdullah Al-Saedi
f275902987 Translation update done using Pootle. 2011-07-25 21:59:10 +02:00
Abdullah Al-Saedi
a0965208b1 Translation update done using Pootle. 2011-07-25 21:56:35 +02:00
Abdullah Al-Saedi
214b0ea88b Translation update done using Pootle. 2011-07-25 21:56:01 +02:00
Abdullah Al-Saedi
00045629a6 Translation update done using Pootle. 2011-07-25 21:55:26 +02:00
Piotr Przybylski
f2935d56d9 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	server_status.php
2011-07-25 21:55:16 +02:00
Abdullah Al-Saedi
a169ff7fd3 Translation update done using Pootle. 2011-07-25 21:55:11 +02:00
Abdullah Al-Saedi
d9e28cf014 Translation update done using Pootle. 2011-07-25 21:55:00 +02:00
Abdullah Al-Saedi
668a6dc1e5 Translation update done using Pootle. 2011-07-25 21:54:40 +02:00
Abdullah Al-Saedi
48bde78cb7 Translation update done using Pootle. 2011-07-25 21:54:26 +02:00
Abdullah Al-Saedi
234ca37475 Translation update done using Pootle. 2011-07-25 21:54:19 +02:00
Abdullah Al-Saedi
9f2d6bab51 Translation update done using Pootle. 2011-07-25 21:54:09 +02:00
Abdullah Al-Saedi
12959427cb Translation update done using Pootle. 2011-07-25 21:54:02 +02:00
Abdullah Al-Saedi
8a39a3aa98 Translation update done using Pootle. 2011-07-25 21:53:33 +02:00
Abdullah Al-Saedi
b775a76e0b Translation update done using Pootle. 2011-07-25 21:53:01 +02:00
Abdullah Al-Saedi
95f37ff174 Translation update done using Pootle. 2011-07-25 21:52:40 +02:00
Abdullah Al-Saedi
971df4e38f Translation update done using Pootle. 2011-07-25 21:52:16 +02:00
Abdullah Al-Saedi
aa2b9e54a5 Translation update done using Pootle. 2011-07-25 21:51:32 +02:00
Abdullah Al-Saedi
52b4191708 Translation update done using Pootle. 2011-07-25 21:50:26 +02:00
Abdullah Al-Saedi
ac270ab375 Translation update done using Pootle. 2011-07-25 21:49:38 +02:00
Abdullah Al-Saedi
eab22c4d96 Translation update done using Pootle. 2011-07-25 21:48:35 +02:00
Abdullah Al-Saedi
a97f57764c Translation update done using Pootle. 2011-07-25 21:48:19 +02:00
Abdullah Al-Saedi
b91d977154 Translation update done using Pootle. 2011-07-25 21:48:08 +02:00
Abdullah Al-Saedi
6bd934e468 Translation update done using Pootle. 2011-07-25 21:45:48 +02:00