gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,353 Commits 12 Branches 481 Tags 2.4 GiB
128b4195b1
Commit Graph

104353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
128b4195b1 Merge pull request #11803 from Achilles-96/Issue-11730 
Bug fix for #11746
 2016-01-02 10:46:15 -05:00
Achilles-96
fbe8fbb362 Bug fix for #11746 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-01-02 20:18:35 +05:30
Marc Delisle
a68ae54bde Merge branch 'QA_4_5' 2016-01-02 08:51:25 -05:00
Marc Delisle
59fe5e234d Undefined index: host 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-02 08:51:04 -05:00
Marc Delisle
f15805ef31 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-01 12:00:54 -05:00
Marc Delisle
1be4fc7a99 Refactor duplicated code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-01 12:00:46 -05:00
Weblate
b7d27eab93 Merge remote-tracking branch 'origin/master' 2016-01-01 15:11:43 +01:00
Sebastian Weremczuk
3e64452dc7 Translated using Weblate (Polish) 
Currently translated at 82.7% (2661 of 3217 strings)

[CI skip]
 2016-01-01 15:11:42 +01:00
Bob
9834729348 Translated using Weblate (Korean) 
Currently translated at 77.3% (2489 of 3217 strings)

[CI skip]
 2016-01-01 15:11:42 +01:00
Marc Delisle
acea807ed8 Remove unneeded PHP tag that triggers an Unreachable code warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-01 09:11:31 -05:00
Weblate
6aef0a192e Merge remote-tracking branch 'origin/master' 2015-12-31 14:10:00 +01:00
Sebastian Weremczuk
af58ae43e4 Translated using Weblate (Polish) 
Currently translated at 82.5% (2657 of 3217 strings)

[CI skip]
 2015-12-31 14:09:59 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Marc Delisle
746baabd2d Merge pull request #11801 from vnwildman/master 
l10n: Updated Vietnamese translation (2805t412u)
 2015-12-31 04:57:35 -05:00
Deven Bansod
cbb6e3eda0 Merge branch 'QA_4_5' 
Conflicts:
	po/eo.po
	po/li.po
	po/uz@latin.po
 2015-12-31 12:01:10 +05:30
Deven Bansod
9f5ef70d99 ChangeLog entry for issue 11802 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-31 11:58:53 +05:30
Deven Bansod
23e74f5312 Fix #11802 : undefined index 'field_name_orig' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-31 11:57:48 +05:30
Trần Ngọc Quân
72b49e5438 l10n: Updated Vietnamese translation (2805t412u) 
Signed-off-by: Trần Ngọc Quân <vnwildman@gmail.com>
 2015-12-31 08:51:56 +07:00
Marc Delisle
a87f16a48c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-30 10:10:23 -05:00
Binyamin Laukstein
72cbfd920e CloudFlare's Flexible SSL support 
Resource https://www.cloudflare.com/ssl/

Signed-off-by: Binyamin Laukstein <7raivis@inbox.lv>
 2015-12-30 10:04:50 -05:00
Stefano Martinelli
2d00b6c3e4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-30 13:45:00 +01:00
Weblate
153acd6ee0 Merge remote-tracking branch 'origin/master' 2015-12-30 13:31:14 +01:00
Stefano Martinelli
3a6758874f Translated using Weblate (Italian) 
Currently translated at 99.9% (3216 of 3217 strings)

[CI skip]
 2015-12-30 13:31:12 +01:00
Marc Delisle
ce41ee3b85 Variable was already defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-30 07:31:03 -05:00
Michal Čihař
32e79dd2d8 Translated using Weblate (Uzbek (latin)) 
Currently translated at 32.9% (1059 of 3210 strings)

[CI skip]
 2015-12-29 20:32:15 +01:00
Robin van der Vliet
d22482e2a3 Translated using Weblate (Limburgish) 
Currently translated at 1.5% (51 of 3210 strings)

[CI skip]
 2015-12-29 20:32:13 +01:00
Robin van der Vliet
88faa8beb9 Translated using Weblate (Esperanto) 
Currently translated at 15.2% (491 of 3210 strings)

[CI skip]
 2015-12-29 20:32:13 +01:00
Michal Čihař
8381f20f04 Translated using Weblate (Uzbek (latin)) 
Currently translated at 32.8% (1057 of 3217 strings)

[CI skip]
 2015-12-29 19:20:16 +01:00
Nizomiddin Usmonov
5657f50dda Translated using Weblate (Uzbek (latin)) 
Currently translated at 32.9% (1059 of 3210 strings)

[CI skip]
 2015-12-29 19:20:01 +01:00
Weblate
836a41f8cd Merge remote-tracking branch 'origin/master' 2015-12-29 17:23:29 +01:00
Nizomiddin Usmonov
4c6398aaf9 Translated using Weblate (Uzbek (latin)) 
Currently translated at 32.8% (1057 of 3217 strings)

[CI skip]
 2015-12-29 17:23:28 +01:00
Robin van der Vliet
345ce105b2 Translated using Weblate (Limburgish) 
Currently translated at 1.5% (51 of 3217 strings)

[CI skip]
 2015-12-29 17:23:27 +01:00
Robin van der Vliet
35850a17b1 Translated using Weblate (Esperanto) 
Currently translated at 15.0% (484 of 3217 strings)

[CI skip]
 2015-12-29 17:23:26 +01:00
Marc Delisle
5c4d4fcc03 Merge pull request #11795 from Achilles-96/Issue-11538 
Improvements to Issue-11538
 2015-12-29 11:23:21 -05:00
Robin van der Vliet
d652103f2d Translated using Weblate (Esperanto) 
Currently translated at 11.3% (363 of 3210 strings)

[CI skip]
 2015-12-29 15:25:05 +01:00
Robin van der Vliet
1184f014b1 Translated using Weblate (Esperanto) 
Currently translated at 11.1% (358 of 3217 strings)

[CI skip]
 2015-12-29 15:21:52 +01:00
Achilles-96
ba6151fc1b Improvements to Issue-11538 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-29 17:56:10 +05:30
Marc Delisle
f380964afe Remove shaky part of a test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-28 09:50:36 -05:00
Marc Delisle
fb6e971a3b Merge branch 'QA_4_5' 2015-12-28 08:16:01 -05:00
Marc Delisle
9a40c11797 Fixes #11792 Undefined index: parameters 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-28 08:15:23 -05:00
Marc Delisle
cd3c5d6be7 Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2015-12-28 13:36:14 +01:00
Michal Čihař
58ba4b83b8 Merge branch 'QA_4_5' 2015-12-28 11:51:20 +01:00
Michal Čihař
e405586584 Avoid conversion of MySQL error messages 
The messages are properly encoded based on connection collation. This
seems to be the case since introduction of the collations, but the code
has stayed in phpMyAdmin since the times before it.

Fixes #11788

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 11:49:32 +01:00
Michal Čihař
671a5f7b0c Merge branch 'QA_4_5' 2015-12-28 11:28:21 +01:00
Michal Čihař
985bdd11ab Check whether iconv works before using it 
On some systems iconv is installed, but is missing encoding definitions,
what leads to runtime errors when trying to use it. By testing this we
start using it only if it's properly working.

Fixes #11787

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 11:28:03 +01:00
Michal Čihař
b30e0aa194 Merge branch 'QA_4_5' 2015-12-28 10:55:54 +01:00
Michal Čihař
87fb774c02 Provide fallback for mb_detect_encoding 
This fix has been already applied to Kanji library, apply it to
php-gettext as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 10:55:17 +01:00
Michal Čihař
6652ed59e7 Fixed Kanji encoding in some specific cases 
The mb_detect_encoding can return false and we have to handle this
situation.

Fixes #11786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 10:48:31 +01:00
Michal Čihař
3cc092258f Merge branch 'QA_4_5' 2015-12-28 10:07:23 +01:00
Michal Čihař
63b2519ae6 Merge commit 'd0532b1c955eed4daef6fc5bca2f1120c4be8340' 2015-12-28 10:06:59 +01:00