webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-25 06:39:48 +03:00
Code Activity
127,988 Commits 12 Branches 481 Tags
STABLE
Commit Graph

127988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
20c93e1f48 Merge branch 'QA_5_2' into STABLE 2025-10-07 16:43:13 -04:00
Isaac Bennetch
fd3799cdc5 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2025-10-07 16:43:13 -04:00
Isaac Bennetch
962857e4f6 Adding composer lock for 5.2.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
RELEASE_5_2_3 		2025-10-07 16:38:55 -04:00
Isaac Bennetch
cabbe159ae Prepare for version 5.2.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2025-10-07 16:37:57 -04:00
Kristijan \"Fremen\" Velkovski
1f3d5213e2 Translated using Weblate (Macedonian) 
Currently translated at 29.1% (1000 of 3428 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com>
 2025-09-29 01:02:03 +00:00
Maurício Meneghini Fauth
5690ca81b1 Merge pull request #19864 from MauricioFauth/collation-grant-user 
Fix collation error when checking for grant permission
 2025-09-22 17:52:43 -03:00
Maurício Meneghini Fauth
7a5ad92e5f Fix collation error when checking for grant permission 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-22 17:40:39 -03:00
Maurício Meneghini Fauth
bdb2306b85 Merge pull request #19870 from liviuconcioiu/lint 
Fail on lint error
 2025-09-22 13:44:22 -03:00
Maurício Meneghini Fauth
ffa0a7cb42 Merge pull request #19871 from liviuconcioiu/syntax 
Fix syntax error
 2025-09-22 13:43:14 -03:00
Liviu-Mihail Concioiu
81f550c693 Fix syntax error 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-22 17:35:23 +02:00
Liviu-Mihail Concioiu
25be09a799 Fail on lint error 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-22 17:15:39 +02:00
Maurício Meneghini Fauth
016fb0c095 Revert "Fix #19109 - Do not enforce character encoding when checking roles" 
This reverts commit 0878841fba.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-17 20:15:41 -03:00
Liviu-Mihail Concioiu
b5fb37b939 Fix #19570 - Check for HTTP_HOST and document the issue in FAQ (#19858) 
Fixes #19570

* Check for HTTP_HOST and document the issue in FAQ

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Remove whitespace

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Update libraries/classes/Controllers/HomeController.php

Co-authored-by: William Desportes <williamdes@wdes.fr>

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Co-authored-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 16:00:21 -03:00
William Desportes
f28ac15745 Add a ChangeLog entry for #19611 
Pull-request: #19612
Reverts pull request: #19499

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 20:01:55 +02:00
William Desportes
e73dbd251c Merge #19612 - Fix #19611 - restore text operators order 
Pull-request: #19612
Fixes: #19611
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 19:59:20 +02:00
William Desportes
03f5a7a55e Add missing ChangeLog entries 
Add ChangeLog entries for #17141, #19138, #19351, #18170, #17535, #18922, #19641, #18903, #19404, #19133, #19685, #19715, #19653, #18807, #19744, #19757, #16869, #19775, #19073, #19772, #17329, #19625, #19643, #19593, #19504, #19760, #19371, #19701, #18066, #19822, #19109,18472,18437,19859,19850

Skipped:
- Fix Disable two-factor authentication button position

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 19:57:02 +02:00
William Desportes
ae27e63d8e Merge #19621 - Fix #19109 - Do not enforce character encoding when checking roles 
Pull-request: #19621
Fixes: #19109
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 18:50:16 +02:00
Daniel Schindler
0878841fba Fix #19109 - Do not enforce character encoding when checking roles 
The functions `getInformationSchemaDataForCreateRequest()` and `getInformationSchemaDataForGranteeRequest()` generate a query that fails with the error `COLLATION 'utf8mb4_general_ci' is not valid for CHARACTER SET 'utf8mb3'` on some servers that got migrated from MySql 5.7. This lead to admin users not being able to create new users via PhpMyAdmin's UI. Instead, the error message "You do not have the privileges to administrate the users!" is being shown. When not forcing the encoding to `utf8mb4_general_ci` in the query, everything works fine.

Signed-off-by: Daniel Schindler<post@danielschindler.de>
 2025-09-14 18:48:52 +02:00
William Desportes
5df6629ff3 Merge #19089 - Fix #18472 - responsive table edit-box in rtl mode 
Pull-request: #19089
Fixes: #18472
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 17:58:29 +02:00
Reza Askari
c21b960ac2 Fix responsive table edit-box in rtl mode 
Signed-off-by: Reza Askari <git@rzsk.net>
 2025-09-14 17:53:43 +02:00
William Desportes
b78182d8ac Merge #19088 - Fix #18437 - SQL editor's alignment in rtl 
Pull-request: #19088
Fixes: #18437
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 17:39:04 +02:00
Reza Askari
273cceda02 Fix SQL editor's alignment in rtl 
Initially added in 75f255bc0f

Co-Authored-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Reza Askari <git@rzsk.net>
 2025-09-14 17:35:59 +02:00
William Desportes
e903b739a7 Merge #19860 - Fix #19859 - Fix deprecated null array offset 
Pull-request: #19860
Fixes: #19859
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 15:51:34 +02:00
Liviu-Mihail Concioiu
9f234877e5 Update PHPStan 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-14 15:06:51 +02:00
William Desportes
03961f50df Merge #19861 - Rename PHPMyAdmin to phpMyAdmin 
Pull-request: #19861
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 14:46:42 +02:00
William Desportes
5781a2a149 Ajust php compilation options on Scrutinizer to have all PHP extensions needed 2025-09-14 14:43:20 +02:00
William Desportes
4c9519c2bc Force composer 2 and fix PHP 7.2 compilation 2025-09-14 14:42:13 +02:00
William Desportes
b0fa42e042 Update Scrutinizer to Ubuntu jammy 
Ref: c0feb46b8e

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2025-09-14 14:42:13 +02:00
Liviu-Mihail Concioiu
f5290679c7 Fix deprecated null array offset 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-14 14:35:13 +02:00
Maurício Meneghini Fauth
e5ce13fe3b Merge pull request #19851 from liviuconcioiu/19850 
Fix #19850 - Fix Undefined array key 4
 2025-09-13 13:46:08 -03:00
Maurício Meneghini Fauth
992b7a0a76 Update Yarn dependencies 
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
 2025-09-10 12:47:00 -03:00
Liviu-Mihail Concioiu
a1b46884ba Fix Undefined array key 4 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-10 01:35:47 +02:00
Liviu-Mihail Concioiu
5060169e19 Add support for bacon-qr-code v3 (#19837) 
* Add support for bacon-qr-code v3

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix #2

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Quote packages

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

* Fix

Co-authored-by: Maximilian Krög <maxi_kroeg@web.de>

* Fix

Co-authored-by: William Desportes <williamdes@wdes.fr>

* Add quotes to the package version

* Fix again

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>

---------

Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Co-authored-by: Maximilian Krög <maxi_kroeg@web.de>
Co-authored-by: William Desportes <williamdes@wdes.fr>
 2025-09-09 20:04:47 -03:00
Liviu-Mihail Concioiu
7b4712dca0 Rename PHPMyAdmin to phpMyAdmin 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-08 19:56:47 +02:00
Maurício Meneghini Fauth
d2fdad042c Merge pull request #19838 from MoonE/count-sql-no-cache 
Fix #19822 - Fix incorrect usage/placement of 'SQL_NO_CACHE'
 2025-09-08 13:34:51 -03:00
Maurício Meneghini Fauth
69eb179780 Merge pull request #19836 from liviuconcioiu/2fa 
Fix `Disable two-factor authentication` button position
 2025-09-08 13:27:44 -03:00
Maurício Meneghini Fauth
e0f00c6508 Merge pull request #19840 from liviuconcioiu/18066 
Fix #18066 - Fix u2f is not defined

Fixes #18066
 2025-09-06 20:13:53 -03:00
Maurício Meneghini Fauth
ce4cda9478 Merge pull request #19846 from liviuconcioiu/19701 
Fix #19701 - Add symfony/polyfill-iconv
 2025-09-06 20:07:22 -03:00
Liviu-Mihail Concioiu
8a9086db0d Add symfony/polyfill-iconv 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-07 00:04:59 +02:00
Maurício Meneghini Fauth
8a09f7e8f8 Merge pull request #19845 from MoonE/fix-lint 
Fix linting errors
 2025-09-05 20:57:26 -03:00
Maximilian Krög
a8249efd9b Fix linting errors 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2025-09-04 01:06:42 +02:00
Liviu-Mihail Concioiu
89ca1328c7 Remove whitespace 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-01 13:23:50 +02:00
Liviu-Mihail Concioiu
ab4ca518cb Fix u2f is not defined 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-09-01 12:22:59 +02:00
Maximilian Krög
9d0f6110d5 Fix row count with SQL_NO_CACHE 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
 2025-08-31 23:09:44 +02:00
Liviu-Mihail Concioiu
797b6a76b7 Add text inside <p> tag 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-08-31 13:33:58 +02:00
HEANG SOCHETRA
5a96d520e7 Translated using Weblate (Khmer (Central)) 
Currently translated at 5.3% (185 of 3428 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/km/
Signed-off-by: HEANG SOCHETRA <heangsochetra2@gmail.com>
 2025-08-27 16:02:40 +00:00
ButterflyOfFire
93a87852f8 Translated using Weblate (Kabyle) 
Currently translated at 2.3% (81 of 3428 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/kab/
Signed-off-by: ButterflyOfFire <boffire@users.noreply.hosted.weblate.org>
 2025-08-27 16:02:38 +00:00
Maurício Meneghini Fauth
62e607df2b Merge pull request #19825 from liviuconcioiu/space 
Remove whitespace
 2025-08-26 20:46:02 -03:00
Maurício Meneghini Fauth
c01413bcde Merge pull request #19826 from liviuconcioiu/deprecation 
Fix $http_response_header deprecation
 2025-08-26 15:09:13 -03:00
Liviu-Mihail Concioiu
3882959de7 Remove whitespace 
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
 2025-08-26 19:21:12 +02:00