Commit Graph

95413 Commits

Author SHA1 Message Date
Michael Koch
fff27355bd Translated using Weblate (German)
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
2014-10-14 18:13:53 +02:00
Matías Bellone
21b5fd8bb7 Translated using Weblate (Spanish)
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
2014-10-14 03:19:03 +02:00
Marc Delisle
b3b0d86abb Merge branch 'QA_4_2' 2014-10-13 10:14:44 -04:00
Marc Delisle
4395279216 Merge commit '33a3979' 2014-10-13 10:14:37 -04:00
Marc Delisle
39498e594c Move ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 10:12:22 -04:00
Weblate
33a39799a0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-13 16:03:27 +02:00
josep constanti
bb49e4a50f Translated using Weblate (Catalan)
Currently translated at 87.2% (2414 of 2768 strings)

[CI skip]
2014-10-13 16:03:26 +02:00
hassan mokhtari
61dedd8629 Translated using Weblate (Arabic)
Currently translated at 41.0% (1137 of 2768 strings)

[CI skip]
2014-10-13 16:03:24 +02:00
Smita Kumari
b57fc337dd Merge pull request #1376 from smita786/QA_4_2
Fix: Table_onover is not defined error.
2014-10-13 19:33:22 +05:30
Smita Kumari
bd259a9ed9 removing extra slash character
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-10-13 19:29:21 +05:30
Marc Delisle
4f6b4bb412 Remove doc for unused parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 09:12:05 -04:00
Weblate
188c6fcc87 Merge remote-tracking branch 'origin/master' 2014-10-13 14:14:11 +02:00
josep constanti
0ad35dd956 Translated using Weblate (Catalan)
Currently translated at 82.6% (2452 of 2965 strings)

[CI skip]
2014-10-13 14:14:09 +02:00
Marc Delisle
efdde2ec22 Remove unused parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 08:14:01 -04:00
Marc Delisle
21f1716f81 Remove incorrect parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-13 08:09:11 -04:00
Marc Delisle
558e76ca55 Fix code execution path warning
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-12 14:56:04 -04:00
Weblate
84bb5b3616 Merge remote-tracking branch 'origin/master' 2014-10-12 16:02:19 +02:00
hassan mokhtari
9f16a4ebbb Translated using Weblate (Arabic)
Currently translated at 37.5% (1113 of 2965 strings)

[CI skip]
2014-10-12 16:02:17 +02:00
Marc Delisle
3fb80ff57f Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-12 10:02:08 -04:00
Marc Delisle
759c2065b6 Fix code execution path warning and coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-12 09:14:18 -04:00
Marc Delisle
a728099e01 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-12 08:42:51 -04:00
Marc Delisle
42ecc045a9 Merge branch 'QA_4_2' 2014-10-11 07:59:07 -04:00
Marc Delisle
1d2684cee1 Merge commit 'f1d8620' 2014-10-11 07:58:59 -04:00
Marc Delisle
360073a933 4.2.10 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-11 07:58:03 -04:00
Weblate
c32d1d6230 Merge remote-tracking branch 'origin/master' 2014-10-11 13:51:55 +02:00
Anders Jonsson
26c01500bc Translated using Weblate (Swedish)
Currently translated at 91.6% (2716 of 2965 strings)

[CI skip]
2014-10-11 13:51:54 +02:00
Xosé Calvo
964b2a47ad Translated using Weblate (Galician)
Currently translated at 79.3% (2352 of 2965 strings)

[CI skip]
2014-10-11 13:51:52 +02:00
Marc Delisle
afd078124d Merge commit '4fb6012' 2014-10-11 07:51:36 -04:00
Marc Delisle
e8c57794cd 4.2.11-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-11 07:51:11 -04:00
Weblate
f1d862096d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-11 13:50:15 +02:00
Anders Jonsson
6dcb49a959 Translated using Weblate (Swedish)
Currently translated at 99.7% (2762 of 2768 strings)

[CI skip]
2014-10-11 13:50:13 +02:00
Xosé Calvo
9492a73fd1 Translated using Weblate (Galician)
Currently translated at 86.3% (2389 of 2768 strings)

[CI skip]
2014-10-11 13:50:11 +02:00
Marc Delisle
4fb60125fb 4.2.11-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-11 07:49:52 -04:00
Marc Delisle
8aa7a15ee0 Code cleanup
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-10 08:56:58 -04:00
Marc Delisle
9d187c0df6 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-10 08:03:25 -04:00
Madhura Jayaratne
f7140cfdd5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-10 12:04:19 +05:30
Madhura Jayaratne
460b71fc8d Status menu should be active for server_status_processes.php
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-10 12:00:42 +05:30
Weblate
17bb5aed89 Merge remote-tracking branch 'origin/master' 2014-10-10 08:14:05 +02:00
이 형진
a98f3bfbef Translated using Weblate (Korean)
Currently translated at 80.4% (2384 of 2965 strings)

[CI skip]
2014-10-10 08:14:03 +02:00
Madhura Jayaratne
dcaf3e1ab1 Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-10 11:43:31 +05:30
Weblate
44f127c318 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-10 08:08:53 +02:00
이 형진
d275e429c4 Translated using Weblate (Korean)
Currently translated at 84.9% (2352 of 2768 strings)

[CI skip]
2014-10-10 08:08:52 +02:00
Michael Koch
ef075ea270 Translated using Weblate (German)
Currently translated at 99.5% (2756 of 2768 strings)

[CI skip]
2014-10-10 08:08:51 +02:00
Madhura Jayaratne
dc4d694bd4 bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-10 11:38:19 +05:30
Weblate
f9ada30dba Merge remote-tracking branch 'origin/master' 2014-10-09 16:01:28 +02:00
Michael Koch
7126860139 Translated using Weblate (German)
Currently translated at 99.7% (2959 of 2965 strings)

[CI skip]
2014-10-09 16:01:27 +02:00
Marc Delisle
dbf5533376 Refactor code duplication
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-09 10:01:15 -04:00
Madhura Jayaratne
b71e7a0599 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-09 12:29:54 +05:30
Madhura Jayaratne
f399b3f2ee Add a ChangeLog entry for bug #3165
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-10-09 12:27:42 +05:30
Weblate
bd9d791157 Merge remote-tracking branch 'origin/master' 2014-10-09 08:18:43 +02:00