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

117045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maurício Meneghini Fauth
f126e14599 Extract js variables from js/messages.php 
Moves JavaScript variables to templates/javascript/variables.twig.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-18 16:48:41 -03:00
William Desportes
c01377b161
Fix undefined index for proxysql on @@version_comment and @@version 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-18 18:40:21 +01:00
Maurício Meneghini Fauth
670f5babe9
Merge pull request #15667 from mauriciofauth/whitelist-js 
Remove js/whitelist.js
 2019-12-18 10:04:04 -03:00
Maurício Meneghini Fauth
73c1ff9875 Fix Plugins/Auth/AuthenticationCookieTest.php 
Related to commit 9f32a895b5.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit 39770eec88)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-17 22:52:34 -03:00
Maurício Meneghini Fauth
04b72cf560 Merge branch 'QA_5_0' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-17 22:39:13 -03:00
Maurício Meneghini Fauth
4cbcf4889b Fix TypeError in Util class 
TypeError: str_replace() expects parameter 3 to be string or array, int given

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-17 22:37:14 -03:00
Maurício Meneghini Fauth
4a79e27e10 Remove js/whitelist.js 
Removes the GotoWhitelist global.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-17 21:09:54 -03:00
Maurício Meneghini Fauth
39770eec88 Fix Plugins/Auth/AuthenticationCookieTest.php 
Related to commit 9f32a895b5.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-12-17 20:16:20 -03:00
William Desportes
643eb0f544
Fix raw html displayed in password change hashing dropdowns 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-17 23:33:57 +01:00
William Desportes
0ea7dd6660
Use apply tag instead of filter 
This commit fixes new changes since b475cfdd6c

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-17 23:20:19 +01:00
William Desportes
1cb0ec7286
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-17 23:19:15 +01:00
William Desportes
bed84bbf58
Add type-hints to prevent a type error 
Uncaught TypeError: Argument 1 passed to PhpMyAdmin\Message::notice() must be of the type string, object given

This error only occurs because of 4bb10d2ed3 that changed filter to apply

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-17 23:17:18 +01:00
Володимир Бриняк
9ef2215ca0
Translated using Weblate (Ukrainian) 
Currently translated at 99.9% (3304 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/uk/
Signed-off-by: Володимир Бриняк <bardvv@gmail.com>
 2019-12-17 09:21:06 +01:00
Володимир Бриняк
d13f05ea87
Translated using Weblate (Ukrainian) 
Currently translated at 98.9% (3298 of 3335 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/uk/
Signed-off-by: Володимир Бриняк <bardvv@gmail.com>
 2019-12-17 09:21:06 +01:00
William Desportes
ef7a121c84
Fix phpstan & phpcs after 850c125684 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 23:59:01 +01:00
William Desportes
d6aa52c9e7
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 23:47:21 +01:00
William Desportes
f00273209e
Fix a phpstan error 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 23:46:38 +01:00
William Desportes
850c125684
Fix #14732 Can't rename primary key with auto increment 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 23:46:35 +01:00
Maurício Meneghini Fauth
c1ff70107f
Merge pull request #15616 from victorphoenix3/pass 
Extract HTML from php files
 2019-12-16 19:36:18 -03:00
Jayati Shrivastava
cab5253da0 Extracts HTML from ChangePassword.php to a twig template #14801 
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
 2019-12-17 03:49:04 +05:30
William Desportes
05cd0eb4aa
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:20:18 +01:00
William Desportes
ea8f8f3a86
Merge #15654 - Keep PMA_handleRedirectAndReload compatility with old versions 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:19:44 +01:00
William Desportes
303a1017c4
Merge branch 'QA_5_0' 2019-12-16 22:13:22 +01:00
William Desportes
782f39602c
Add ChangeLog entry for #14732 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:12:40 +01:00
William Desportes
a993e36aca
Merge #15659 - Fix #14732 Can't rename primary key with auto increment 
Pull-request: #15659
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:11:56 +01:00
William Desportes
91ed866c63
Add ChangeLog entry for #15623 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:10:13 +01:00
William Desportes
ac9118d044
Merge #15632 and #15631 - UI fixes for datetime picker and modal 
Fixes: #15623
Pull-request: #15631
Pull-request: #15632
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 22:09:02 +01:00
Hugues Peccatte
16efdd1b5f
Display date/time picker only for date/time fields 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-12-16 22:01:08 +01:00
Hugues Peccatte
bee397e680
#15623 Set automatic width 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-12-16 22:01:01 +01:00
Nikhil Nagdev
13e91a0e93 Fixed issue of renaming the primary key 
Signed-off-by: Nikhil Nagdev <nnagdev58@gmail.com>
 2019-12-17 02:22:46 +05:30
William Desportes
20116b5e3e
Merge branch 'QA_5_0' 2019-12-16 21:46:38 +01:00
William Desportes
b4bcd34e28
Fix eslint after #15435 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 21:46:16 +01:00
William Desportes
f0bbd00186
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 21:32:09 +01:00
William Desportes
6b564e3780
Add ChangeLog entry for #15435 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 21:31:05 +01:00
William Desportes
9f32a895b5
Fix #15435 - ReCAPTCHA couldn't find user-provided function: Functions.recaptchaCallback 
Fixes: #15435
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 21:30:22 +01:00
William Desportes
4bb10d2ed3
Merge branch 'QA_5_0' 2019-12-16 21:12:28 +01:00
William Desportes
990978f064
Add ChangeLog entry for b475cfdd6c 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 21:08:41 +01:00
William Desportes
b475cfdd6c
Use apply tag instead of filter and fix for loop 
https://twig.symfony.com/doc/1.x/tags/apply.html
https://twig.symfony.com/doc/2.x/deprecated.html#tags
"The filter tag is deprecated in Twig 2.9. Use the apply tag instead (the Twig\TokenParser\FilterTokenParser classes is also deprecated)."
and "Adding an if condition on a for tag is deprecated in Twig 2.10. 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-16 21:03:44 +01:00
William Desportes
6f034732c3
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-16 20:40:27 +01:00