Commit Graph

77074 Commits

Author SHA1 Message Date
Michal Čihař
0953df2fe4 Merge remote-tracking branch 'origin/master' 2012-06-30 21:00:26 +02:00
Marc Delisle
2c6f80aa47 Bug #3539142 Normal INSERT does not show the statement 2012-06-30 15:00:15 -04:00
Michal Čihař
67cd26fd98 Merge remote-tracking branch 'origin/master' 2012-06-30 18:09:28 +02:00
J.M
c7e8afd0dc + rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table 2012-06-30 18:09:12 +02:00
Michal Čihař
d8356f89dc Merge remote-tracking branch 'origin/master' 2012-06-30 17:55:19 +02:00
J.M
7d266456af Fix undefined variable data in libraries/insert_edit.lib.php#1013 by adding parameter to function PMA_getPmaTypeSet 2012-06-30 17:54:49 +02:00
Michal Čihař
ef974b9f73 Merge remote-tracking branch 'origin/master' 2012-06-30 17:31:43 +02:00
Alex Marin
2bde051694 Translated using Weblate. 2012-06-30 17:31:40 +02:00
J.M
ca754fca6a -bug #3538524 [interface] "edit next" choice is no longer present in actions panel 2012-06-30 17:31:20 +02:00
J.M
b35d605c74 -bug #3538914 [import] upload progress broken 2012-06-30 16:54:22 +02:00
J.M
5dc0f782f5 Fix PHP 5.4 upload progress working only with session.upload_progress.cleanup set to Off 2012-06-30 15:21:23 +02:00
Marc Delisle
a042003c32 Merge pull request #76 from alexukf/plugins-and-OOP
Fix strpos called on object
2012-06-30 05:17:06 -07:00
Marc Delisle
a83f42eaa6 The INSERT statement generated when we insert and choose "and then insert another new row" was not displayed 2012-06-30 07:39:23 -04:00
Thilina Buddika
6d93aad72b rplace use of PMA_showMessage with PMA_getMessage in insert_edit-lib and tbl_change 2012-06-30 07:32:16 -04:00
Alex Marin
ee8692e980 fix strpos called on object 2012-06-30 13:19:02 +03:00
Michal Čihař
6b30b5b28f Merge remote-tracking branch 'origin/master' 2012-06-29 22:11:35 +02:00
Michal Čihař
5576df47a4 Merge remote-tracking branch 'yasitha/master' 2012-06-29 22:10:51 +02:00
Yasitha Pandithawatta
0c8d2e65a2 Test cases for Error.class.php 2012-06-29 22:26:37 +05:30
Domen
ada8b0e80a Translated using Weblate. 2012-06-29 18:51:08 +02:00
Victor Volkov
1adcde76d0 Translated using Weblate. 2012-06-29 18:49:23 +02:00
Michal Čihař
ebf11cf8e8 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-29 16:24:38 +02:00
Michal Remiš
cf228c11cd Translated using Weblate. 2012-06-29 16:23:58 +02:00
Michal Čihař
9176ddafd0 Merge remote-tracking branch 'origin/master' 2012-06-29 16:22:30 +02:00
Michal Remiš
bfef44062b Translated using Weblate. 2012-06-29 16:22:27 +02:00
Alex Marin
c60fd7d418 Merge branch 'master' into plugins-and-OOP 2012-06-29 15:29:39 +03:00
Alex Marin
7a58294144 Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin 2012-06-29 15:29:13 +03:00
Alex Marin
e8ef29f92f oop: fix bug #3538914 upload progress 2012-06-29 15:28:54 +03:00
Marc Delisle
0e4d7af07a Merge branch 'atul' 2012-06-29 07:59:24 -04:00
Alex Marin
c1b8b9ca86 oop: rename database bug 2012-06-29 12:28:57 +03:00
Alex Marin
b1b674afdf Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin 2012-06-29 12:06:35 +03:00
J.M
dd2cf47fde Fix bug #3538655 with a workaround, revert this commit when PMA drops PHP5.2 support 2012-06-29 12:06:25 +03:00
Michal Čihař
79925dec44 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-29 09:37:04 +02:00
Michal Čihař
a5737474d8 Translated using Weblate. 2012-06-29 09:35:30 +02:00
Alexsandro Preis Dubinski
2cc8dcca9d Translated using Weblate. 2012-06-29 09:35:29 +02:00
Michal Čihař
159f5615c2 Merge remote-tracking branch 'origin/master' 2012-06-29 09:19:17 +02:00
Michal Čihař
aa29a641e7 Translated using Weblate. 2012-06-29 09:19:17 +02:00
Alexsandro Preis Dubinski
5e0b6bf8c7 Translated using Weblate. 2012-06-29 09:19:16 +02:00
Michal Čihař
149fa8400f Adjust docs headers 2012-06-29 09:19:02 +02:00
Atul Pratap Singh
ceea0e13f1 Merge remote-tracking branch 'upstream/master' 2012-06-29 00:29:57 +05:30
Atul Pratap Singh
417856ee9f Variable name improvements 2012-06-29 00:10:30 +05:30
Yasitha Pandithawatta
89600d7b1b test cases for DisplayResults.class.php 2012-06-28 22:29:47 +05:30
Michal Čihař
3b68252564 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-28 15:08:03 +02:00
Alexsandro Preis Dubinski
1dcb2c9ee3 Translated using Weblate. 2012-06-28 15:04:49 +02:00
Michal Čihař
183ce14feb Merge remote-tracking branch 'origin/master' 2012-06-28 14:56:41 +02:00
Alexsandro Preis Dubinski
db209d57d8 Translated using Weblate. 2012-06-28 14:56:40 +02:00
J.M
bbb4a6c5aa PMA_DRIZZLE is not always defined in libraries/Menu.class.php#428
Use of undefined constant PMA_DRIZZLE - assumed 'PMA_DRIZZLE'

Backtrace

.\libraries\Menu.class.php#104: PMA_Menu->_getServerTabs()
.\libraries\Menu.class.php#75: PMA_Menu->_getMenu()
.\libraries\Header.class.php#315: PMA_Menu->getDisplay()
.\libraries\Response.class.php#244: PMA_Header->getDisplay()
.\libraries\Response.class.php#257: PMA_Response->_getDisplay()
.\libraries\Response.class.php#308: PMA_Response->_htmlResponse()
.\libraries\OutputBuffering.class.php#110: PMA_Response::response()
PMA_OutputBuffering::stop()
2012-06-28 14:55:28 +02:00
J.M
13d7f61ef1 Fix bug #3538655 with a workaround, revert this commit when PMA drops PHP5.2 support 2012-06-28 14:46:11 +02:00
Burak Yavuz
517bcf7941 Translated using Weblate. 2012-06-28 12:41:03 +02:00
Michal Čihař
5278cebe6a Update po files 2012-06-28 09:06:46 +02:00
Michal Čihař
7041e161d1 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-28 07:59:17 +02:00