gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,586 Commits 12 Branches 481 Tags 2.4 GiB
74dde79412
Commit Graph

114586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
74dde79412 Use Homebrew addon in osx build 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-22 22:19:57 -02:00
Maurício Meneghini Fauth
ad7b80bcee Upgrade PHP and node.js on OSX 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-22 20:49:31 -02:00
Maurício Meneghini Fauth
215b85187d
Merge pull request #14892 from mauriciofauth/windows-travis 
Fix Windows build on Travis
 2019-01-22 19:39:45 -03:00
Maurício Meneghini Fauth
d9b14460eb Fix Windows build on Travis 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-22 20:23:36 -02:00
Michal Čihař
85c2d2ce5f Merge branch 'QA_4_8' 2019-01-22 07:25:52 +01:00
Michal Čihař
4011b34088 Merge remote-tracking branch 'origin/QA_4_8' 2019-01-22 07:25:48 +01:00
Michal Čihař
8d759f8fcf Ignore pear.php.net in linkcheck 
It is down after hack, no ETA for resuming service right now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2019-01-22 07:25:25 +01:00
Michal Čihař
c9b22397d7 Merge branch 'QA_4_8' 2019-01-21 19:33:32 +01:00
Hosted Weblate
e172aa7548
Merge branch 'origin/QA_4_8' into Weblate. 2019-01-21 19:30:50 +01:00
Walter Cheuk
6eaa885914
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3295 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-01-21 19:30:41 +01:00
Michal Čihař
828f740158 Merge branch 'allow_local_infile' into QA_4_8 2019-01-21 19:30:07 +01:00
Michal Čihař
98506151d4
Merge pull request #14886 from vrana/master 
Actually set MYSQLI_OPT_LOCAL_INFILE
 2019-01-21 19:29:55 +01:00
Jakub Vrana
c5e01f84ad Actually set MYSQLI_OPT_LOCAL_INFILE 
1e6b740e tried to set this but failed due to https://bugs.php.net/77496
and nobody probably ever tested it.

Tested: Executed `LOAD DATA LOCAL INFILE 'README' INTO TABLE text(text)`
SQL command successfully before, unsuceesfully after.

Signed-off-by: Jakub Vrana <jakub@vrana.cz>
 2019-01-21 19:27:26 +01:00
Jakub Vrana
c5ae592370 Actually set MYSQLI_OPT_LOCAL_INFILE 
1e6b740e tried to set this but failed due to https://bugs.php.net/77496
and nobody probably ever tested it.

Tested: Executed `LOAD DATA LOCAL INFILE 'README' INTO TABLE text(text)`
SQL command successfully before, unsuceesfully after.

Signed-off-by: Jakub Vrana <jakub@vrana.cz>
 2019-01-21 18:53:33 +01:00
Hosted Weblate
54f0a2c4d1
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL:
 2019-01-21 18:06:59 +01:00
Domen
2e4890bb2e
Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3310 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2019-01-21 18:06:58 +01:00
Nathan
058e5f3a7f
Translated using Weblate (French) 
Currently translated at 100.0% (3310 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Nathan <bonnemainsnathan@gmail.com>
 2019-01-21 18:06:55 +01:00
Walter Cheuk
d0df1e46f3
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.0% (3278 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-01-21 18:06:53 +01:00
Maurício Meneghini Fauth
1303def5df
Merge pull request #14864 from Tithugues/feature/remove-useless-parentheses 
Remove useless parentheses
 2019-01-21 14:06:42 -03:00
Hugues Peccatte
4321120b80 Fix PHPCS issue 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-01-21 12:27:26 +01:00
Giovanni Sora
2f4a011a89
Translated using Weblate (Interlingua) 
Currently translated at 75.4% (2485 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ia/
Signed-off-by: Giovanni Sora <g.sora@tiscali.it>
 2019-01-20 23:21:10 +01:00
Michal Čihař
aeac90623e Deny using mysql extension with mysql.allow_local_infile 
This allows reading arbitrary files on the server without any way to
disable.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2019-01-20 21:03:23 +01:00
Maurício Meneghini Fauth
b9023dcdf8
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3310 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-20 05:50:29 +01:00
Hosted Weblate
405b89e431
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL:
 2019-01-20 05:44:40 +01:00
Burak Yavuz
5d82a783ca
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3310 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2019-01-20 05:44:39 +01:00
Giovanni Sora
71f922f71e
Translated using Weblate (Interlingua) 
Currently translated at 75.3% (2493 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ia/
Signed-off-by: Giovanni Sora <g.sora@tiscali.it>
 2019-01-20 05:44:37 +01:00
Maurício Meneghini Fauth
5702fdbad8 Extract HTML from Display\Results::_getDataForResettingColumnOrder 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-20 02:43:31 -02:00
Hugues Peccatte
f06883d2a7 Remove useless parenthesis 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-01-20 01:23:53 +01:00
Maurício Meneghini Fauth
607c33b40c Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-19 17:22:39 -02:00
Hosted Weblate
cc98fb8785
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL:
 2019-01-19 20:06:31 +01:00
Joshua PowellNishiyama
0a7be60f1d
Translated using Weblate (Japanese) 
Currently translated at 76.9% (2545 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-01-19 20:06:29 +01:00
Maurício Meneghini Fauth
8d031dc3d4 Extract HTML from Display\Results::_getSortByKeyDropDown 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-19 17:05:25 -02:00
Joshua PowellNishiyama
a56406dfab
Translated using Weblate (Japanese) 
Currently translated at 77.4% (2551 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-01-19 17:13:54 +01:00
Maurício Meneghini Fauth
2929221e8e Allow failure for 'PHP 7.1 with dbase extension' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-18 21:26:57 -02:00
Maurício Meneghini Fauth
938723f4d6 Fix space after not operator 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-18 19:31:50 -02:00
Maurício Meneghini Fauth
a770c71782 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-18 19:18:53 -02:00
Hosted Weblate
cb72c8120a
Merge branch 'origin/QA_4_8' into Weblate. 2019-01-18 22:11:45 +01:00
Joshua PowellNishiyama
c76c37a733
Translated using Weblate (Japanese) 
Currently translated at 77.4% (2550 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-01-18 22:11:44 +01:00
Walter Cheuk
0dc1c8daaa
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.9% (3295 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-01-18 22:11:42 +01:00
Maurício Meneghini Fauth
12c9fc7458 Add tests with dbase extension enabled to build matrix 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-18 18:54:17 -02:00
Hosted Weblate
75763a4665
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL:
 2019-01-18 21:25:40 +01:00
Joshua PowellNishiyama
a56b8482b1
Translated using Weblate (Japanese) 
Currently translated at 76.9% (2544 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-01-18 21:25:37 +01:00
Walter Cheuk
5dcd710c2a
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.1% (3281 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-01-18 21:25:34 +01:00
Maurício Meneghini Fauth
e3fc8929d1 Extract HTML from Display\Results::_getTableHeaders 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-18 18:22:19 -02:00
Walter Cheuk
08acf321a3
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 99.2% (3270 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-01-17 02:17:16 +01:00
Joshua PowellNishiyama
8330f9bacb
Translated using Weblate (Japanese) 
Currently translated at 77.0% (2539 of 3296 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
 2019-01-16 19:49:26 +01:00
Hosted Weblate
a88251f1b1
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL:
 2019-01-16 07:37:28 +01:00
Walter Cheuk
d252965ff2
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 98.5% (3259 of 3310 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/
Signed-off-by: Walter Cheuk <wwycheuk@gmail.com>
 2019-01-16 07:37:26 +01:00
Maurício Meneghini Fauth
0e9f587827 Fix 2FA configuration alignment 
Changes string to "No Two-Factor Authentication":

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-16 04:35:28 -02:00
Maurício Meneghini Fauth
e82e7fb5f7 Revert "Filter Xdebug for PHPUnit" 
This reverts commit 473dc91c14.

PHP nightly does not have Xdebug

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2019-01-16 03:59:46 -02:00