Commit Graph

72094 Commits

Author SHA1 Message Date
Michal Čihař
d9bcdae909 Translated using Weblate. 2012-09-05 10:59:24 +02:00
Agron Selimaj
44d8fff7e6 Translated using Weblate. 2012-09-05 10:59:23 +02:00
Weblate
7f498ac477 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-04 23:06:43 +02:00
Vojislav Pavić
e86cdc2747 Translated using Weblate. 2012-09-04 23:06:39 +02:00
J.M
5f2b0549c4 Add SolOS bug id to changelog 2012-09-04 22:42:23 +02:00
Weblate
9b0a4fabb5 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-04 22:31:42 +02:00
Vojislav Pavić
afe2e71aa4 Translated using Weblate. 2012-09-04 22:31:39 +02:00
J.M
2fce20d69f Add SunOS to status_monitor.js 2012-09-04 22:31:20 +02:00
J.M
af32d57f84 Don't limit SunOS memory and swap to the value range of int 2012-09-04 22:24:03 +02:00
J.M
b136af3292 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-09-04 22:22:05 +02:00
J.M
fed871cd6f fix SunOS swap calculation 2012-09-04 22:19:38 +02:00
Weblate
ed950a6c1c Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-04 22:16:07 +02:00
Vojislav Pavić
3c69bc07f0 Translated using Weblate. 2012-09-04 22:16:04 +02:00
مترجم حرّ
60de108cbd Translated using Weblate. 2012-09-04 22:16:01 +02:00
J.M
bf5f51bee2 add support for Solaris and FreeBSD system load and memory display in server status 2012-09-04 22:15:32 +02:00
Vojislav Pavić
ff1a14a7f1 Translated using Weblate. 2012-09-04 10:13:34 +02:00
Weblate
52b58d63ad Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-09-03 21:03:28 +02:00
Vojislav Pavić
0ec98eedce Translated using Weblate. 2012-09-03 21:03:26 +02:00
Vojislav Pavić
3f3d27ecc1 Translated using Weblate. 2012-09-03 21:03:23 +02:00
مترجم حرّ
c967a5aab6 Translated using Weblate. 2012-09-03 21:03:20 +02:00
Atul Pratap Singh
c35f55c8d8 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-09-04 00:32:59 +05:30
Atul Pratap Singh
d5b4856194 Merge branch 'QA_3_5-jqplot' into QA_3_5 2012-09-04 00:26:07 +05:30
Atul Pratap Singh
10ebddaf89 jqplot: y axis autoscaling enabled, jqplot's autoscale didn't seem to work 2012-09-04 00:24:05 +05:30
Atul Pratap Singh
6eadd03c80 jqplot: fix to plot multiple series 2012-09-03 22:38:52 +05:30
Michal Čihař
a547f3d3e2 Escape json reply received from server 2012-09-03 15:03:34 +02:00
Michal Čihař
50edafc088 Load JSON rather than javascript from phpmyadmin.net
Conflicts:
	js/functions.js
	libraries/Header.class.php
2012-09-03 15:03:22 +02:00
Michal Čihař
ceaee4471b Fix format strings 2012-09-03 09:05:02 +02:00
Vitor Barbosa
6994532d6b Translated using Weblate. 2012-09-03 09:01:48 +02:00
Rouslan Placella
b2140eaf55 Translated using Weblate. 2012-09-03 09:01:47 +02:00
مترجم حرّ
6a5986aab4 Translated using Weblate. 2012-09-03 09:01:44 +02:00
ProUser
02d93c239e Translated using Weblate. 2012-09-01 18:25:11 +02:00
Rafael Ferreira
f11c3a50ff Translated using Weblate. 2012-09-01 07:05:03 +02:00
Weblate
694f971755 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-08-31 08:52:01 +02:00
ProUser
12300850cd Translated using Weblate. 2012-08-31 08:51:58 +02:00
Michal Čihař
66ec8870eb Add missing format string 2012-08-31 08:50:47 +02:00
Weblate
5a8a458f5a Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-08-30 22:15:53 +02:00
Rui Simoes
7c24e9472a Translated using Weblate. 2012-08-30 22:15:50 +02:00
مترجم حرّ
d172c8ac44 Translated using Weblate. 2012-08-30 22:15:47 +02:00
Madhura Jayaratne
efafb8c156 Ignore jqplot files in CheckStyle analysis 2012-08-31 01:45:00 +05:30
Weblate
0c13414f23 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-08-30 19:55:07 +02:00
Guto Rocha
2833a60d0d Translated using Weblate. 2012-08-30 19:55:03 +02:00
مترجم حرّ
f11d5422ef Translated using Weblate. 2012-08-30 19:54:58 +02:00
Atul Pratap Singh
87e5288441 Merge branch 'QA_3_5-jqplot' into QA_3_5 2012-08-30 23:19:52 +05:30
Atul Pratap Singh
2f88914bbd jqplot: fix settings to somewhat enable charts 2012-08-30 23:05:02 +05:30
Alexander Luiz Marinho
5544164beb Translated using Weblate. 2012-08-30 13:47:35 +02:00
Atul Pratap Singh
4c283ca560 jqplot: fix broken data refresh, still not displayed properly in charts 2012-08-30 01:27:15 +05:30
Michal Čihař
35161bac23 Translated using Weblate. 2012-08-29 11:24:09 +02:00
Michal Čihař
52399734f3 Translated using Weblate. 2012-08-29 11:24:09 +02:00
Michal Čihař
7521cd7326 Translated using Weblate. 2012-08-29 11:24:09 +02:00
Michal Čihař
e821cc89df Translated using Weblate. 2012-08-29 11:24:08 +02:00