gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,983 Commits 12 Branches 481 Tags 2.4 GiB
d21ce68c60
Commit Graph

102983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
d21ce68c60 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-26 18:23:54 +01:00
Michal Čihař
6e6b922ee8 Do not run tests with allowed failures on maintenance branch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-26 18:23:34 +01:00
Weblate
3aba9bc6c1 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-25 12:19:49 +01:00
Daniel Iltanen
cd90c6ed13 Translated using Weblate (Finnish) 
Currently translated at 67.5% (2168 of 3210 strings)

[CI skip]
 2016-01-25 12:19:48 +01:00
Michal Čihař
1e6da495e1 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-25 12:18:42 +01:00
Michal Čihař
316792bf4a Move databse check to correct location 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 12:18:37 +01:00
Weblate
da29e3ba2b Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-25 08:38:55 +01:00
Burak Yavuz
a8a9fa9032 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-25 08:38:54 +01:00
Arturs Nikolajevs
25bcee4035 Translated using Weblate (Latvian) 
Currently translated at 19.0% (611 of 3210 strings)

[CI skip]
 2016-01-25 08:38:54 +01:00
Adam Magnier
975e87d392 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-25 08:38:53 +01:00
Michal Čihař
c048a519d4 Merge branch 'MAINT_4_4_15' into QA_4_5 2016-01-25 08:38:36 +01:00
Michal Čihař
78cea78ab7 Backport safety checks on version check 
Backported from master/QA_4_5

Issue #11713

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-25 08:36:19 +01:00
Weblate
b51a55d6e5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-22 15:27:51 +01:00
Masahiro Nishi
ac9b89b7af Translated using Weblate (Japanese) 
Currently translated at 67.6% (2170 of 3210 strings)

[CI skip]
 2016-01-22 15:27:50 +01:00
Michal Čihař
3d61936b8b Translated using Weblate (Czech) 
Currently translated at 95.8% (3077 of 3210 strings)

[CI skip]
 2016-01-22 15:27:49 +01:00
Michal Čihař
655de3d994 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-22 15:27:22 +01:00
Michal Čihař
da62e19833 Correctly handle what parameter on export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:27:15 +01:00
Michal Čihař
0a7fc9770e Remove trailing space from a string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 10:19:11 +01:00
Michal Čihař
3307d1b5f7 Translated using Weblate (Vietnamese) 
Currently translated at 85.9% (2759 of 3210 strings)

[CI skip]
 2016-01-22 10:18:57 +01:00
Weblate
fdb4cd81e2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-22 09:44:08 +01:00
Martin Lacina
38e511dc47 Translated using Weblate (Slovak) 
Currently translated at 84.1% (2701 of 3210 strings)

[CI skip]
 2016-01-22 09:44:07 +01:00
Michal Čihař
3bd0971db7 Validate version information before further processing it 
Do basic sanity checking before we return the value further. This can
especially happen in case the curl/allow_url_fopen is missing.

Fixes #11874
 2016-01-22 09:42:54 +01:00
Weblate
7e731770e5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-19 17:39:24 +01:00
Marc Delisle
1a046d4d3a Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-19 17:39:22 +01:00
Michal Čihař
91bfa27ee2 Do not cache data if releases attribute is missing 
Issue #11874

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 17:38:22 +01:00
Michal Čihař
a11475efe3 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:59:45 +01:00
Michal Čihař
1431625d68 Fixes possible error when query is empty/not analyzed 
Fixes #11873

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:45:52 +01:00
Michal Čihař
fbb3529fa8 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:39:32 +01:00
Michal Čihař
a5affed07a Validate database before starting designer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:38:50 +01:00
Michal Čihař
76e003a8cb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 11:27:26 +01:00
Michal Čihař
5359d9a968 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:26:59 +01:00
Michal Čihař
a6ae24741e Validate parameters before use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
897a844581 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
1523c4b364 Gracefully handle calling sql.php without SQL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 11:23:36 +01:00
Michal Čihař
0490d20408 Check for parameter before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:48:32 +01:00
Michal Čihař
32c7a54076 Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 10:44:58 +01:00
Michal Čihař
dcdeee28eb Gracefully handle errors in regex based javascript search 
User can write any invalid regex and we should handle this gracefully.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 10:44:03 +01:00
Weblate
62f3c7e3cf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-19 09:00:15 +01:00
BlackyPanther
0ef9cfc300 Translated using Weblate (German) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-19 09:00:13 +01:00
Xosé Calvo
8d006f1a23 Translated using Weblate (Galician) 
Currently translated at 86.2% (2770 of 3210 strings)

[CI skip]
 2016-01-19 09:00:13 +01:00
Michal Čihař
7db4672aeb Merge branch 'MAINT_4_5_4' into QA_4_5 2016-01-19 08:59:56 +01:00
Michal Čihař
59036e1562 Simplify test to avoid need fo multiline regexp 
Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-19 08:59:14 +01:00
Weblate
e6a0694cb0 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-17 18:44:29 +01:00
Marc Delisle
b621d15adf Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-17 18:44:27 +01:00
Michal Čihař
2d658ccad0 Translated using Weblate (Czech) 
Currently translated at 95.7% (3075 of 3210 strings)

[CI skip]
 2016-01-17 18:44:26 +01:00
Michal Čihař
bfaa77ef21 Fix password change on MariaDB 10.1 and newer 
Use SET PASSWORD which seems again do the correct thing there.

Fixes #11855

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 18:43:32 +01:00
Michal Čihař
20a508358b Fix comment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-17 18:35:42 +01:00
Marc Delisle
7d4c570b76 Undefined index: is_ajax_request 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:27:11 -05:00
Domen
19085e7f77 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-16 01:16:53 +01:00
Weblate
7dfaeead42 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 22:52:39 +01:00