Marc Delisle
|
0034213a1b
|
Fix merge conflicts
|
2012-09-22 07:17:24 -04:00 |
|
Atul Pratap Singh
|
d1a7a8560a
|
Merge branch 'QA_3_5-jqplot' into QA_3_5
|
2012-09-22 16:30:58 +05:30 |
|
Atul Pratap Singh
|
af0e34e274
|
Fix jqplot charts display in IE versions less than 9
|
2012-09-22 16:19:16 +05:30 |
|
Marc Delisle
|
9671e65dac
|
Fix merge conflicts
|
2012-09-22 06:48:24 -04:00 |
|
Michal Čihař
|
6f187886fb
|
Set real version in bootstrap
|
2012-09-22 09:58:07 +02:00 |
|
Michal Čihař
|
83ac2800ab
|
Few simple tests for Header class
|
2012-09-22 09:53:26 +02:00 |
|
Weblate
|
2c9efacb0b
|
Merge remote-tracking branch 'origin/master'
|
2012-09-22 09:37:28 +02:00 |
|
Haval Abdulkarim
|
61347d31d6
|
Translated using Weblate.
|
2012-09-22 09:37:24 +02:00 |
|
Michal Čihař
|
52ab2b51b3
|
Ooops, put it into wrong file
|
2012-09-22 09:37:07 +02:00 |
|
Weblate
|
8cd7fc0b11
|
Merge remote-tracking branch 'origin/master'
|
2012-09-21 19:43:26 +02:00 |
|
Haval Abdulkarim
|
e733efb1e7
|
Translated using Weblate.
|
2012-09-21 19:43:24 +02:00 |
|
Madhura Jayaratne
|
58bf42a4a5
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-09-21 22:08:22 +05:30 |
|
Michal Čihař
|
64cded2443
|
Unset POST array before test
|
2012-09-21 16:02:52 +02:00 |
|
Michal Čihař
|
9a82e9d3ca
|
Adjust MySQL version to new default
|
2012-09-21 16:01:02 +02:00 |
|
Michal Čihař
|
8a1d19ee4e
|
Single place to define MySQL version used in tests
|
2012-09-21 15:36:11 +02:00 |
|
Michal Čihař
|
ba5b4cd2a6
|
Add simple test for displaying footer
|
2012-09-21 15:31:50 +02:00 |
|
Michal Čihař
|
124c8339a3
|
Actually implement test for Footer->disable
|
2012-09-21 15:28:23 +02:00 |
|
Michal Čihař
|
c0daa766b1
|
Various coding style improvements
|
2012-09-21 15:26:34 +02:00 |
|
Michal Čihař
|
adf6088894
|
Add simple testcase for PMA_Menu class
|
2012-09-21 15:24:08 +02:00 |
|
Michal Čihař
|
0d1dd744c7
|
Fix callback name
|
2012-09-21 15:05:13 +02:00 |
|
Marc Delisle
|
787a0aa573
|
Merge branch 'QA_3_5-jqplot' into QA_3_5
|
2012-09-21 06:25:24 -04:00 |
|
Atul Pratap Singh
|
660efa1d53
|
Fix time formatting in tooltip
|
2012-09-21 12:58:14 +05:30 |
|
Marc Delisle
|
ab92682350
|
Remove Highcharts library and dead code still using it
|
2012-09-20 20:48:10 -04:00 |
|
Atul Pratap Singh
|
91330c5b31
|
fix for end_time less than start_time
|
2012-09-20 23:50:36 +05:30 |
|
Atul Pratap Singh
|
05fe6108c5
|
Add custom tooltip to monitor charts
|
2012-09-20 23:45:23 +05:30 |
|
Atul Pratap Singh
|
a45e539815
|
Fix time span continuation on to adjacent chart
|
2012-09-20 21:56:08 +05:30 |
|
Atul Pratap Singh
|
73b5104d6e
|
Left in 2548043adf
|
2012-09-20 21:14:51 +05:30 |
|
Atul Pratap Singh
|
85dc955afb
|
Merge branch 'QA_3_5-jqplot' of git://github.com/lem9/phpmyadmin into QA_3_5-jqplot
|
2012-09-20 01:22:47 +05:30 |
|
Atul Pratap Singh
|
2548043adf
|
Fix unwanted error on mouseup
|
2012-09-20 01:21:31 +05:30 |
|
Michal Čihař
|
536ebb21aa
|
Fix typo
|
2012-09-19 20:03:06 +02:00 |
|
Madhura Jayaratne
|
be4a39d5e8
|
Remove extraneous new lines
|
2012-09-19 22:24:00 +05:30 |
|
Michal Čihař
|
0087992c06
|
Various coding style improvements
|
2012-09-19 15:08:48 +02:00 |
|
Michal Čihař
|
ff5d2fe583
|
Fix function name
|
2012-09-19 15:06:20 +02:00 |
|
Michal Čihař
|
3e050ff9d9
|
Various docblocks improvements
|
2012-09-19 15:05:26 +02:00 |
|
Michal Čihař
|
8901450d3a
|
Update po files
|
2012-09-19 14:28:52 +02:00 |
|
Michal Čihař
|
0f3136b38c
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-09-19 14:28:09 +02:00 |
|
Michal Čihař
|
b9d55b0328
|
Fixed concatenation
|
2012-09-19 14:22:43 +02:00 |
|
Michal Čihař
|
adfe019053
|
Add missing include
|
2012-09-19 14:22:18 +02:00 |
|
Michal Čihař
|
c850c30342
|
Fix order of parms for assertEquals
|
2012-09-19 14:20:00 +02:00 |
|
Robert Readman
|
bd387b85d4
|
Translated using Weblate.
|
2012-09-19 14:18:56 +02:00 |
|
Robert Readman
|
75448e3673
|
Translated using Weblate.
|
2012-09-19 14:17:26 +02:00 |
|
Michal Čihař
|
edd30e6681
|
Missing include for util class
|
2012-09-19 14:16:38 +02:00 |
|
Michal Čihař
|
7474e4635e
|
Wrap some long lines
|
2012-09-19 14:14:33 +02:00 |
|
Michal Čihař
|
9fddc8a725
|
Simplify code
|
2012-09-19 14:14:33 +02:00 |
|
Michal Čihař
|
d5f7a90703
|
Replace mixed html and php with php
|
2012-09-19 14:14:33 +02:00 |
|
Madhura Jayaratne
|
b13d547e04
|
Various improvements to doc blocks
|
2012-09-19 17:27:03 +05:30 |
|
Michal Čihař
|
83f25cc0e1
|
Drop some inline html
|
2012-09-19 13:47:20 +02:00 |
|
Michal Čihař
|
c64707ea79
|
Docblocks improvements
|
2012-09-19 13:47:20 +02:00 |
|
Madhura Jayaratne
|
7cd8052846
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-09-19 17:14:50 +05:30 |
|
Madhura Jayaratne
|
0725e792fa
|
Fix doc blocks
|
2012-09-19 17:14:08 +05:30 |
|
