Commit Graph

26 Commits

Author SHA1 Message Date
Michal Čihař
e12cd648b0 Merge remote-tracking branch 'origin/QA_3_5'
Conflicts:
	libraries/common.lib.php
2012-09-06 16:19:05 +02:00
Michal Čihař
6d86eae212 Merge remote-tracking branch 'origin/QA_3_5'
Conflicts:
	libraries/common.lib.php
2012-09-06 12:12:37 +02:00
Michal Čihař
f2a64f26d1 Add support for 5.6 manual 2012-09-06 11:43:55 +02:00
Michal Čihař
1d2462be02 Recent MySQL manual versions are not translated, so lets drop this option 2012-09-06 11:43:55 +02:00
Madhura Jayaratne
5aea2de2cb Proper function naming 2012-08-30 22:52:32 +05:30
Madhura Jayaratne
3062786732 Coding style fixes 2012-08-30 22:50:31 +05:30
Dieter Adriaenssens
623de27ef2 use include(_once) in case of conditional including 2012-08-30 17:35:56 +02:00
Michal Čihař
b6848d971b Merge remote-tracking branch 'alex/plugins-and-OOP' 2012-08-20 12:44:06 +02:00
Chanaka Indrajith
a8d7041db8 Defined missing heading in CommonFunctions.class.php file 2012-08-19 12:03:47 +05:30
Alex Marin
c806f1d64d oop: fix ExportLatex 2012-08-17 11:06:41 +03:00
Marc Delisle
1cb4d24414 Typo 2012-08-16 06:52:13 -04:00
Michal Čihař
df1badb0fd Merge branch 'master' of git://github.com/hastenax/phpmyadmin into hastenax-master
Conflicts:
	libraries/plugins/export/ExportSql.class.php
2012-08-13 20:02:30 +02:00
hastenax
2bc1d1d4bd Update libraries/CommonFunctions.class.php
Refactored, changed backquote_compat parameters order.
2012-08-02 23:19:33 +04:00
Chanaka Indrajith
d9d92dda46 Image link display transformed data in sql query results 2012-08-03 00:35:09 +05:30
hastenax
93d8688340 Update libraries/CommonFunctions.class.php
Added new $compatibility param for backquote_compat method.
2012-08-02 17:26:47 +04:00
hastenax
335218a8bc Update libraries/CommonFunctions.class.php
Misprint correction.
2012-08-02 16:49:23 +04:00
hastenax
450322c7db Update libraries/CommonFunctions.class.php
added new function backquote_compat for improved mssql export support
2012-08-02 16:23:41 +04:00
Alex Marin
16f5f0aa57 Merge branch 'master' into plugins-and-OOP 2012-07-18 17:40:04 +03:00
Rouslan Placella
7d286f41a4 Fixed PHP warning 2012-07-17 18:52:46 +01:00
Alex Marin
26f0a4ebf0 Merge branch 'master' into plugins-and-OOP 2012-07-17 14:01:54 +03:00
Alex Marin
9458f9d062 oop: integrate the properties system for ExportXml 2012-07-17 13:32:13 +03:00
Michal Čihař
169bdc8692 Do not cache sprites while running testsuite (we test for different themes) 2012-07-17 12:10:17 +02:00
Alex Marin
e591f31f69 fix get extensions for import plugins 2012-07-03 21:28:25 +03:00
Chanaka Indrajith
e0b8f6f798 Fix some code violations in PMA_CommonFunctions class 2012-07-01 00:08:02 +05:30
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Chanaka Indrajith
74de5e3fd3 common.lib.php file renamed to CommonFunctions.class.php 2012-06-28 06:00:58 +05:30