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

102293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
e3ff4592a0 Merge branch 'MAINT_4_5_0' into QA_4_5 2015-09-14 10:49:52 -04:00
Marc Delisle
31262ccbf6 Merge commit 'ae77949' into QA_4_5 2015-09-14 10:49:45 -04:00
Remi Collet
41858689dd allow to use system udan11/sql-parser 
Signed-off-by: Remi Collet <fedora@famillecollet.com>
 2015-09-14 10:47:37 -04:00
Marc Delisle
e6c7f66b0e Fixes #11480 Notice Undefined index: drop_database 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-14 08:16:38 -04:00
Weblate
829a5f7b42 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-14 10:35:59 +02:00
Martin Lacina
2bf27f7426 Translated using Weblate (Slovak) 
Currently translated at 82.0% (2633 of 3209 strings)

[CI skip]
 2015-09-14 10:35:56 +02:00
muhammad
4608b4f77e Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.3% (589 of 3209 strings)

[CI skip]
 2015-09-14 10:35:53 +02:00
Atul Pratap Singh
8c7f40393d Translated using Weblate (Hindi) 
Currently translated at 37.9% (1219 of 3209 strings)

[CI skip]
 2015-09-14 10:35:51 +02:00
Xosé Calvo
d9cba54024 Translated using Weblate (Galician) 
Currently translated at 81.2% (2606 of 3209 strings)

[CI skip]
 2015-09-14 10:35:48 +02:00
Michal Čihař
9edddbf598 Avoid failure if allowdeny rules are not set 
Fixes #11478

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-14 10:34:58 +02:00
Marc Delisle
9c20e644a5 Fix error report #14350 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 07:31:10 -04:00
Marc Delisle
efb71af6f4 Fix error report #14326 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 06:51:51 -04:00
Marc Delisle
d4bcfa1076 Translated using Weblate (French) 
Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]
 2015-09-11 00:12:11 +02:00
Marc Delisle
ae77949f39 Fixes #11472 Tiny translation issue in French 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-10 18:10:07 -04:00
Weblate
441dc1bde9 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-10 16:25:55 +02:00
Andrey Aleksanyants
946a939b98 Translated using Weblate (Armenian) 
Currently translated at 62.8% (2016 of 3209 strings)

[CI skip]
 2015-09-10 16:25:50 +02:00
Marc Delisle
d2475b6f8b Merge branch 'QA_4_4' into QA_4_5 2015-09-10 10:25:21 -04:00
Marc Delisle
cff9058c36 Another instance of "Invalid argument supplied for foreach()" 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-10 10:24:45 -04:00
Weblate
a9cd33e4d0 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-09 16:53:30 +02:00
Andrey Aleksanyants
14e0db03af Translated using Weblate (Armenian) 
Currently translated at 62.7% (2015 of 3209 strings)

[CI skip]
 2015-09-09 16:53:28 +02:00
Madhura Jayaratne
b333793375 Merge branch 'QA_4_4' into QA_4_5 2015-09-10 00:53:15 +10:00
Madhura Jayaratne
0bc6f30f5d Change value for lower_case_table_names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:47:30 +10:00
Madhura Jayaratne
08ac7e630d Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-09-10 00:44:24 +10:00
Madhura Jayaratne
ef5177f555 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:43:26 +10:00
Weblate
fc58d4518f Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-09-09 16:35:18 +02:00
Andrey Aleksanyants
eca6bc5864 Translated using Weblate (Armenian) 
Currently translated at 62.3% (1894 of 3040 strings)

[CI skip]
 2015-09-09 16:35:13 +02:00
Madhura Jayaratne
9131b59936 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:34:47 +10:00
Madhura Jayaratne
dbf9ff2723 Fix #11461 Foreign key constraints for InnoDB tables with upper-case letters disabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 00:31:52 +10:00
Marc Delisle
7ab576930b 4.5.0-rc1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-09 06:03:45 -04:00
Weblate
77c7a4da84 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-09-09 11:09:10 +02:00
Andrey Aleksanyants
fc5065c339 Translated using Weblate (Armenian) 
Currently translated at 62.7% (2013 of 3209 strings)

[CI skip]
 2015-09-09 11:09:07 +02:00
Marc Delisle
fe1d3ce9ba 4.5.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-09 05:08:59 -04:00
Marc Delisle
f447cd94b0 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:35:05 -04:00
Marc Delisle
bab165b39c Merge commit '5b2b959' into QA_4_5 2015-09-08 11:22:13 -04:00
Marc Delisle
e33fd04fad Merge commit '945991a' into QA_4_5 2015-09-08 11:21:48 -04:00
Marc Delisle
46786d5ab0 Merge commit 'f7f483e' into QA_4_4 2015-09-08 11:20:51 -04:00
Marc Delisle
f8739dc3e3 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:20:30 -04:00
Marc Delisle
17118e95b0 Merge commit '5b2b959' into QA_4_4 2015-09-08 11:19:25 -04:00
Marc Delisle
f7f483e99a 4.4.14.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 11:16:27 -04:00
Michal Čihař
8fb89dd8f8 Translated using Weblate (Galician) 
Currently translated at 80.0% (2569 of 3209 strings)

[CI skip]
 2015-09-08 15:14:39 +02:00
Michal Čihař
4ec5bb051e Translated using Weblate (Galician) 
Currently translated at 84.0% (2556 of 3040 strings)

[CI skip]
 2015-09-08 15:14:33 +02:00
Xosé Calvo
1d7d291dbf Translated using Weblate (Galician) 
Currently translated at 80.0% (2569 of 3209 strings)

[CI skip]
 2015-09-08 15:12:41 +02:00
Weblate
e2004cff52 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-09-08 14:08:10 +02:00
Egorov Artyom
77bbbaa37c Translated using Weblate (Russian) 
Currently translated at 99.3% (3019 of 3040 strings)

[CI skip]
 2015-09-08 14:08:06 +02:00
ashkan shirian
5863bb9dc1 Translated using Weblate (Persian) 
Currently translated at 27.9% (849 of 3040 strings)

[CI skip]
 2015-09-08 14:08:03 +02:00
Seongki Shin
ea7ea08f88 Translated using Weblate (Korean) 
Currently translated at 82.2% (2501 of 3040 strings)

[CI skip]
 2015-09-08 14:07:59 +02:00
Deven Bansod
78a04b06ca Translated using Weblate (Hindi) 
Currently translated at 41.6% (1266 of 3040 strings)

[CI skip]
 2015-09-08 14:07:56 +02:00
Xosé Calvo
429a05bf89 Translated using Weblate (Galician) 
Currently translated at 84.0% (2556 of 3040 strings)

[CI skip]
 2015-09-08 14:07:54 +02:00
Marc Delisle
20eca76f51 Document that the minimum PHP version is 5.3.7, but do not require it in 
the code because it's difficult to ascertain whether PHP has been patched
to include the related fix.

See http://stackoverflow.com/questions/32349895/warning-in-libraries-phpseclib-crypt-base-php967

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-08 08:06:19 -04:00
Madhura Jayaratne
785f4e2711 Fix reCaptcha bypass 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-08 07:13:24 +10:00