gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,084 Commits 12 Branches 481 Tags 2.4 GiB
20da069ee0
Commit Graph

117084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
20da069ee0
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 22:05:52 +01:00
William Desportes
527d1af4c5
Add ChangeLog entry for #15677 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 22:05:21 +01:00
William Desportes
567b39a623
Merge #15683 - Fix #15677 Show Processlist triggers exception 
Pull-request: #15683
Fixes: #15677
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 22:04:23 +01:00
Harsh Kukreja
d2d29ee45e
Show Processlist triggers exception removed 
Signed-off-by: Harsh Kukreja <harshkukreja99@gmail.com>
 2019-12-21 21:55:10 +01:00
William Desportes
06701ab562
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:48:59 +01:00
William Desportes
9633175165
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:38:13 +01:00
William Desportes
a1acccdf59
Add ChangeLog entry for #15608 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:35:38 +01:00
William Desportes
f402a8f2cf
Merge #15681 - Fix #15608 DisableIS is broken on pma 4.9.2 with controluser configured 
Fixes: #15608
Pull-request: #15681
Ref: 2bc8afea5f
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:34:05 +01:00
Maurício Meneghini Fauth
8083de3a01 Create Database\SqlFormatController class 
Moves sql format entry point logic to the SqlFormatController controller
and removes the entry point file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 17:33:37 -03:00
William Desportes
28e2814ee9
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 21:04:39 +01:00
William Desportes
a3d6217622
Disable xdebug for php 7.4 Linux CI 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 20:56:39 +01:00
William Desportes
aa2f369bf3
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 20:27:25 +01:00
William Desportes
774fc686bb
Fix #15641 - Replication actions are not sent to a mysql link 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 19:29:20 +01:00
William Desportes
931a6ecffa
Use phpunit 8 on OSX CI and fix file filter 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 19:10:29 +01:00
Maurício Meneghini Fauth
542ba3025a Fix control user issue 
Partially reverts commit 2bc8afea5f.

Fixes #15608
Related to #14433

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 14:56:59 -03:00
Maurício Meneghini Fauth
9d3f7519c9 Revert "Fix #14433 - "You do not have privileges to manipulate with the users!" on root superadmin" 
This reverts commit b8650115be.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 14:54:40 -03:00
Maurício Meneghini Fauth
6fdedaee9f Fix javascript/variables.twig escaping issue 
Related to https://github.com/phpmyadmin/phpmyadmin/pull/15672#issuecomment-567701998

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-21 13:16:06 -03:00
William Desportes
5000171c40
Fix mysql password issue on OSX build 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:54:12 +01:00
William Desportes
d40f89ebd9
Fix a possible php7.4 error / failing tests 
"Trying to access array offset on value of type null"

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:38:21 +01:00
William Desportes
6e7e90169a
Fix a possibly undefined index as reported to our server 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:38:21 +01:00
William Desportes
e88b6bfc80
Disable xdebug for php 7.4 CI 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 16:38:21 +01:00
William Desportes
6337a888c5
Add php 7.4 step using phpunit 8 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 12:01:41 +01:00
William Desportes
83d05641bb
Fix OSX build 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 11:03:17 +01:00
William Desportes
171bc9a456
Ignore yubico.com from links checks 
Ref: fa2f887703
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 11:03:13 +01:00
William Desportes
313da618bd
Fix redirection form secure.php.net to www.php.net 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 11:03:10 +01:00
William Desportes
e1db42a0f6
Fix phpdoc for Sami 
Ref: #14345
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-21 11:03:07 +01:00
Maurício Meneghini Fauth
0445a6dad7 Merge branch 'QA_5_0' 2019-12-20 22:14:32 -03:00
Maurício Meneghini Fauth
eaa1cebb73 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-20 22:13:39 -03:00
Maurício Meneghini Fauth
e69b22e9f7 Add phpcs to the Travis build 
Adds composer test command.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-20 22:10:42 -03:00
Maurício Meneghini Fauth
beb304c947 Fix coding standard error 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-20 21:25:09 -03:00
William Desportes
58b0ca2d70
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-19 23:58:19 +01:00
William Desportes
198bd239e8
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-19 23:55:06 +01:00
William Desportes
28c29223fc
Add ChangeLog entry for #15641 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-19 23:48:40 +01:00
William Desportes
56e8ebd8e9
Fix #15641 - Replication actions are not sent to a mysql link 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-19 23:48:25 +01:00
Maurício Meneghini Fauth
3dae73718e Merge branch 'QA_5_0' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-19 17:28:06 -03:00
Maurício Meneghini Fauth
9d477ec97d Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-19 17:27:07 -03:00
Maurício Meneghini Fauth
74d4510c3a Fix dbase versions in build matrix 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-19 17:24:48 -03:00
Maurício Meneghini Fauth
0fb628bf4f
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3332 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-19 21:21:16 +01:00
Maurício Meneghini Fauth
b0747a8070
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3307 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-19 20:21:15 +01:00
Maurício Meneghini Fauth
3fde2d7d9a
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3335 of 3335 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-19 20:21:08 +01:00
Maurício Meneghini Fauth
edbb713494
Merge pull request #15672 from mauriciofauth/messages-php-vars 
Extract JavaScript variables from js/messages.php

Moves JavaScript variables to templates/javascript/variables.twig.
 2019-12-18 19:21:40 -03:00
William Desportes
31ee76f507
Fix a phpstan errpr 
Introduced-by: c01377b161
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 23:03:47 +01:00
William Desportes
cc57586f25
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 22:42:20 +01:00
William Desportes
6da3f0ed5e
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 22:33:22 +01:00
William Desportes
bd33d92f39
Fix spaceless is deprecated 
"Deprecation Notice in ./vendor/twig/twig/src/TokenParser/SpacelessTokenParser.php#36
 The spaceless tag in "columns_definitions/column_virtuality.twig" at line 18 is deprecated since Twig 2.7, use the spaceless filter instead."

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 22:31:44 +01:00
William Desportes
99250a88ba
Fix for if in twig is deprecated 
"Using an "if" condition on "for" tag in "columns_definitions/column_attributes.twig" at line 163 is deprecated since Twig 2.10.0, use a "filter" filter or an "if" condition inside the "for" body instead (if your condition depends on a variable updated inside the loop)."

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 22:27:43 +01:00
William Desportes
eb8472ba31
Fix for if in twig is deprecated 
"Using an "if" condition on "for" tag in "columns_definitions/column_attributes.twig" at line 163 is deprecated since Twig 2.10.0, use a "filter" filter or an "if" condition inside the "for" body instead (if your condition depends on a variable updated inside the loop)."

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 22:18:46 +01:00
William Desportes
02304bcebf
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 21:48:27 +01:00
William Desportes
5ed6a7364f
Add ChangeLog entry for #15640 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 21:46:37 +01:00
William Desportes
87a84b396c
Merge #15653 - php 7.4 type error 
Fixes: #15640
Pull-request: #15653

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 21:46:26 +01:00