Commit Graph

78697 Commits

Author SHA1 Message Date
Chanaka Indrajith
5fab2fa57b Test for _getRowInfoForSpecialLinks function in PMA_DisplayResults class 2012-08-14 21:59:31 +05:30
Yasitha Pandithawatta
64c8310611 Create engines test suit and fixed failing test cases 2012-08-14 21:33:20 +05:30
Yasitha Pandithawatta
7c872205cf Test cases for engines library 2012-08-14 21:23:24 +05:30
Yasitha Pandithawatta
ca65d686fe Test classes for engines library 2012-08-14 20:06:31 +05:30
Alex Marin
e300dbaf65 Merge branch 'master' into plugins-and-OOP 2012-08-14 15:42:37 +03:00
Alex Marin
efdc08fad3 oop: ExportLatex - wrong usage of expandUserString 2012-08-14 15:41:33 +03:00
Marc Delisle
04c877ef42 Merge branch 'thilina' 2012-08-14 06:10:51 -04:00
Alex Marin
4b010454b4 oop: fix undefined variable 2012-08-14 12:36:53 +03:00
Michal Čihař
ae3db91f6d Merge remote-tracking branch 'alex/plugins-and-OOP' 2012-08-14 11:04:36 +02:00
Yasitha Pandithawatta
7ca27e29ef Test case for CachedFileReader 2012-08-14 13:28:50 +05:30
Yasitha Pandithawatta
cce7524f45 Merge remote-tracking branch 'upstream/master' 2012-08-14 13:23:28 +05:30
Yasitha Pandithawatta
615ae47836 Test class for FileReader 2012-08-14 13:21:37 +05:30
Alex Marin
92bb8d4b70 oop: fix XML handler for ExportCodegen 2012-08-14 10:40:30 +03:00
Atul Pratap Singh
619d4c1e1a Use replot with chart object 2012-08-14 01:32:39 +05:30
Atul Pratap Singh
bfd22db4a2 Separate data series for each chart 2012-08-14 00:13:29 +05:30
Michal Čihař
dae3543da1 Various coding style improvements (issue #88) 2012-08-13 20:17:59 +02:00
Thilina Buddika
70dbf2aa56 missing global variables 2012-08-13 23:47:11 +05:30
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
Atul Pratap Singh
3f082551a0 Separate timeout variables for separate charts 2012-08-13 22:59:30 +05:30
Thilina Buddika
37bef7f5dd implementation of PMA_getHtmlForMoreOptionInTableStructure() 2012-08-13 22:44:52 +05:30
Michal Čihař
46bfb2598e Merge remote-tracking branch 'origin/QA_3_5' 2012-08-13 14:22:49 +02:00
shanyan baishui
30ed38d00c Translated using Weblate. 2012-08-13 14:22:25 +02:00
Weblate
5473bfc91f Merge remote-tracking branch 'origin/master' 2012-08-13 14:17:22 +02:00
shanyan baishui
cabc50d872 Translated using Weblate. 2012-08-13 14:17:18 +02:00
Michal Čihař
aa3071a95d Saner color for error messages (and consistent with default theme) 2012-08-13 14:17:06 +02:00
Marc Delisle
bb98205389 Fix merge conflicts for security patch 2012-08-13 07:51:35 -04:00
Michal Čihař
2df005b9e5 Merge remote-tracking branch 'alex/plugins-and-OOP' 2012-08-13 11:47:08 +02:00
Michal Čihař
2eeddb7c5f Merge remote-tracking branch 'yasitha/master' 2012-08-13 11:46:49 +02:00
Weblate
c1a70c49bf Merge remote-tracking branch 'origin/master' 2012-08-13 11:44:54 +02:00
shanyan baishui
bd18f6fb26 Translated using Weblate. 2012-08-13 11:44:51 +02:00
Michal Čihař
a8c9bded2f Merge remote-tracking branch 'chanaka/master' 2012-08-13 11:43:56 +02:00
Alex Marin
8ebbab0c30 oop: fix getTableDefStandIn for ExportSql 2012-08-13 09:42:22 +03:00
Alex Marin
c26356e9ca oop: fix properties object in plugin_interface 2012-08-13 09:36:29 +03:00
Michal Čihař
29ea192a81 These look obviously wrong 2012-08-13 07:19:37 +02:00
Thilina Buddika
865e9e488f missing function parameters and remove some HTML duplicates 2012-08-13 08:12:48 +05:30
Thilina Buddika
4cb1094dcf missing function parameters 2012-08-13 07:15:46 +05:30
Thilina Buddika
c50d0a5d49 Render html for information tables and add missing doc comment 2012-08-13 01:19:55 +05:30
Chanaka Indrajith
054fab3ffe Merge remote branch 'upstream/master' 2012-08-12 23:57:17 +05:30
Chanaka Indrajith
fde2a58bab Improve some tests for functions in PMA_DisplayResults class 2012-08-12 23:56:31 +05:30
Thilina Buddika
3653bd9862 remove duplicate code from Space usage table 2012-08-12 22:54:49 +05:30
Thilina Buddika
539bf1b505 implementation of PMA_getHtmlForDisplayIndexes() 2012-08-12 20:45:41 +05:30
Atul Pratap Singh
94d03f6130 Make default data points as 12, i.e. 2nd on the index list 2012-08-12 19:49:27 +05:30
Marc Delisle
7bf3fe03a4 Merge branch 'QA_3_5' 2012-08-12 09:26:11 -04:00
Marc Delisle
9ca1bee3c2 Fix merge conflicts 2012-08-12 09:25:37 -04:00
Marc Delisle
5289a032ce 3.5.2.2 release 2012-08-12 09:22:10 -04:00
Thilina Buddika
2d60319e2a implementation of PMA_getHtmlForAddColumn() 2012-08-12 18:49:55 +05:30
Marc Delisle
6c73243bb0 Merge remote branch 'security/MAINT_3_5_2-security' into MAINT_3_5_2 2012-08-12 09:19:16 -04:00
Marc Delisle
dde8fc471d Merge branch 'QA_3_5' 2012-08-12 09:18:04 -04:00
Marc Delisle
cdf9bf3b83 Merge branch 'MAINT_3_5_2' into QA_3_5 2012-08-12 09:17:19 -04:00
Marc Delisle
6f200703a3 Fix merge conflicts 2012-08-12 09:17:02 -04:00