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 |
|
Michal Čihař
|
787ae98b4a
|
Merge remote-tracking branch 'origin/master'
|
2012-06-28 07:58:31 +02:00 |
|
Alexsandro Preis Dubinski
|
2c25a5cdd0
|
Translated using Weblate.
|
2012-06-28 07:57:39 +02:00 |
|
Alex Marin
|
db4e781485
|
Merge branch 'master' into plugins-and-OOP
|
2012-06-28 07:14:39 +03:00 |
|
Alex Marin
|
beba0419ba
|
oop: DisplayResults bug
|
2012-06-28 07:14:13 +03:00 |
|
Atul Pratap Singh
|
f3d2f17700
|
Move functions to separate library file
|
2012-06-28 07:44:41 +05:30 |
|
Atul Pratap Singh
|
b10429b268
|
Fix comment
|
2012-06-28 07:25:09 +05:30 |
|
Atul Pratap Singh
|
b19d201c16
|
Make variable names more readable in db_search.php
|
2012-06-28 07:17:40 +05:30 |
|
Atul Pratap Singh
|
9e1fca9294
|
Merge remote-tracking branch 'upstream/master'
|
2012-06-27 23:44:20 +05:30 |
|
Michal Čihař
|
b5a40d1c78
|
Merge remote-tracking branch 'origin/master'
|
2012-06-27 19:40:39 +02:00 |
|
Alexsandro Preis Dubinski
|
b8d8335b4f
|
Translated using Weblate.
|
2012-06-27 19:40:38 +02:00 |
|
Madhura Jayaratne
|
98e1debafa
|
Fix indentation
|
2012-06-27 23:09:38 +05:30 |
|
Madhura Jayaratne
|
090bbda51b
|
Wrap some long lines
|
2012-06-27 23:09:23 +05:30 |
|
Alex Marin
|
3fa180b228
|
oop: merge master, fix commits
|
2012-06-27 19:52:37 +03:00 |
|
Michal Čihař
|
8d9ee40cc1
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-06-27 16:13:37 +02:00 |
|
