Commit Graph

81085 Commits

Author SHA1 Message Date
Dieter Adriaenssens
de2eae90c8 Update po files 2013-01-18 14:17:56 +01:00
Dieter Adriaenssens
04cf068dc5 fix incorrect description of BLOB 2013-01-18 14:16:32 +01:00
Michal Čihař
7ce2420bfd Merge remote-tracking branch 'origin/QA_3_5' 2013-01-18 13:35:33 +01:00
Michal Čihař
d0b855040f Fix typo 2013-01-18 13:35:18 +01:00
Michal Čihař
91266113b6 Fix operation when path contains spaces
Conflicts:
	build.xml
2013-01-18 13:25:55 +01:00
Michal Čihař
075728dbbc Merge remote-tracking branch 'origin/QA_3_5' 2013-01-18 13:24:32 +01:00
Michal Čihař
cbdd92a30e Fix operation when path contains spaces 2013-01-18 13:23:54 +01:00
Weblate
60b4a8f833 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-18 13:21:45 +01:00
Nicu Plai
fcf06e32dd Translated using Weblate (Romanian)
Currently translated at 62.3% (1597 of 2562)
2013-01-18 13:21:43 +01:00
Michal Čihař
0ec0a67d13 These tests take long 2013-01-18 13:20:38 +01:00
Madhura Jayaratne
42f66dc716 Move fillToZero to optional to be able to override them 2013-01-17 23:44:59 +05:30
Madhura Jayaratne
6a05965053 Stop propagation only for relational links 2013-01-17 22:36:28 +05:30
Madhura Jayaratne
f0e1f12dd4 Use stricter filters 2013-01-17 21:37:56 +05:30
Marc Delisle
be42bf2035 This is now called the navigation panel 2013-01-17 06:32:09 -05:00
Marc Delisle
e610174ef2 Default value for NavigationDisplayServers now set to true 2013-01-17 06:28:41 -05:00
Marc Delisle
aa22e68d31 Do not display the server selector in the navigation panel if there is
just one server choice (same logic as in the login panels).
2013-01-17 06:01:00 -05:00
Michal Čihař
f957ec8f7d Merge remote-tracking branch 'origin/QA_3_5' 2013-01-17 09:18:25 +01:00
Michal Čihař
c38046f172 Translated using Weblate (Uzbek)
Currently translated at 54.6% (1398 of 2562)
2013-01-17 09:18:08 +01:00
Panagiotis Papazoglou
8e2b14d22d Translated using Weblate (Greek)
Currently translated at 100.0% (2562 of 2562)
2013-01-17 09:18:07 +01:00
Michal Čihař
d51a0d1b70 Translated using Weblate (Uzbek)
Currently translated at 49.9% (1299 of 2602)
2013-01-17 09:13:17 +01:00
Panagiotis Papazoglou
5953cc3237 Translated using Weblate (Greek)
Currently translated at 100.0% (2602 of 2602)
2013-01-17 09:13:04 +01:00
Murodjon Abduvohidov
db3b9a8a93 Translated using Weblate (Uzbek)
Currently translated at 54.6% (1398 of 2562)
2013-01-17 09:11:00 +01:00
Murodjon Abduvohidov
9db6bdea06 Translated using Weblate (Uzbek)
Currently translated at 49.9% (1299 of 2602)
2013-01-17 09:10:51 +01:00
Weblate
0a21cfbb00 Merge remote-tracking branch 'origin/master' 2013-01-16 22:03:53 +01:00
Murodjon Abduvohidov
46a6dbfd32 Translated using Weblate (Uzbek)
Currently translated at 49.8% (1296 of 2602)
2013-01-16 22:03:50 +01:00
Dieter Adriaenssens
87ebdb581b improve coding style : remove mixed php and html 2013-01-16 22:02:33 +01:00
Atul Pratap Singh
4128a40b7f Manually escape title in monitor charts 2013-01-16 20:55:08 +05:30
Weblate
f9680906fb Merge remote-tracking branch 'origin/master' 2013-01-16 13:54:27 +01:00
Dieter Adriaenssens
a693506f64 Translated using Weblate (Dutch)
Currently translated at 98.5% (2563 of 2602)
2013-01-16 13:54:22 +01:00
Marc Delisle
ebed7ca61a Merge pull request #134 from madhuracj/charts
Improvements to PMA charts
2013-01-16 04:53:58 -08:00
Madhura Jayaratne
6121c1a7cf Merge branch 'QA_3_5'
Conflicts:
	libraries/header_http.inc.php
	po/ko.po
2013-01-16 06:20:32 +05:30
Madhura Jayaratne
49c24c4dd2 Merge pull request #133 from lem9/QA_3_5
Fix "Uncaught EvalError" on Chrome
2013-01-15 16:43:55 -08:00
Madhura Jayaratne
4ca7711e9f Fix typo 2013-01-16 05:51:57 +05:30
Dieter Adriaenssens
ed3a0fe7e7 wrap long lines, fix coding style 2013-01-15 21:13:35 +01:00
Dieter Adriaenssens
9d845c1582 fix coding style 2013-01-15 20:54:14 +01:00
Dieter Adriaenssens
95068b4983 improve coding style 2013-01-15 20:42:18 +01:00
Dieter Adriaenssens
df4c535d06 improve coding style 2013-01-15 20:36:14 +01:00
Dieter Adriaenssens
be2c09f36c improve coding style 2013-01-15 20:15:50 +01:00
Dieter Adriaenssens
d7f02a4598 wrap long lines 2013-01-15 20:03:39 +01:00
Dieter Adriaenssens
ead7b1a95d use include_once when including a file conditionally 2013-01-15 19:59:21 +01:00
Dieter Adriaenssens
f07573e28a improve coding style 2013-01-15 19:54:37 +01:00
Dieter Adriaenssens
e382d0ad82 improve coding style 2013-01-15 19:47:06 +01:00
Weblate
0d5633d0d9 Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-01-15 19:05:23 +01:00
Dong-bum Kim
d15ec227a5 Translated using Weblate (Korean)
Currently translated at 41.5% (1064 of 2562)
2013-01-15 19:05:17 +01:00
Marc Delisle
86ebd0130d I don't understand this test (which now fails) 2013-01-15 13:04:28 -05:00
Marc Delisle
0fb7b5907d Fix merge conflicts 2013-01-15 12:50:14 -05:00
Marc Delisle
6314225f41 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2013-01-15 12:42:40 -05:00
Marc Delisle
373a7a025e bug #3599362 [core] Double-escaped error message 2013-01-15 12:42:04 -05:00
Madhura Jayaratne
50865948fa Merge branch 'master' into charts
Conflicts:
	tbl_chart.php
2013-01-15 22:42:14 +05:30
Madhura Jayaratne
178919f6d6 More space needed due to increase of chart types 2013-01-15 22:36:28 +05:30