Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-04Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-10-04Add ChangeLog entry for #12359Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-30Merge branch 'origin/QA_5_2'William Desportes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-09-30Add a ChangeLog entry for #16418William Desportes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-09-29Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-29Add a ChangeLog entry for #17736William Desportes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-09-26Update the docs to reflect the blowfish_secret changesMaurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-26Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-26Add ChangeLog entries for #17728 and #17734Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-20Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-09-10Add a ChangeLog entry for 6230c197ddWilliam Desportes
Ref: 6230c197dd9d78de0f0bcc7c508b74bd18070863 Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-08-15Merge branch 'QA_5_2'William Desportes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-08-15Add ChangeLog entries for #17543 and #17546William Desportes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-08-15Add ChangeLog entries for #17620, a9356e4d16, 2365ec78e2, d0093468d0, 8b99611988William Desportes
Ref: a9356e4d16579103292a0ec03ffb39373ffaafe8 Ref: 2365ec78e2eff6af28e8118706554427e6610076 Ref: d0093468d00c1aa8e6c4f524e1060100a5f5a4cb Ref: 8b99611988342c12a69fab4940de47898538061b Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-08-13Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-08-13Add ChangeLog entry for #17673 #17658 #17663Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-24Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-24Fix error when a db group name is same as container nameMaurício Meneghini Fauth
Fixes #17659 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-21Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-21Fix Enum/Set editor error when creating a new columnMaurício Meneghini Fauth
Fixes #17551 https://github.com/phpmyadmin/phpmyadmin/issues/17551#issuecomment-1136074722 Co-authored-by: William Desportes <williamdes@wdes.fr> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19fixed find replace regex issue if no matching result set foundAnkush Patil
When find and replace searching used with regex, at the time of replace empty CASE END condition was causing issue. Fixes #17388 Closes #17641 Signed-off-by: Ankush Patil <aspraz2658@gmail.com> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19Fixed broken filtering - ticket #17593Angelo Grebenarov
Fixes #17593 Closes #17610 In (Page-related settings) -> (Where to show the table row links) there are 4 options: Left, Right, Both, and Nowhere. The 3 dummy elements (mentioned in this ticket) are only needed for Left, Both, and Nowhere... and they are NOT needed for "Right". Since the main thing that distinguishes the "Right" position from the other 3 is - "colspan", my code checks for the presence of "colspan" on the first existing (non-dummy) element, and then decides whether or not to add the 3 additional dummy- elements. Signed-off-by: Angelo Grebenarov <grebenarov@gmail.com> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-19replace isset to emptyatomu330
IF statement ! isset($this->uiprefs) was causing issue. Private property 'uiprefs' is initialized to empty array, so ! isset($this->uiprefs) is always FALSE; It's not hopefull, so I replace ! isset($this->uiprefs) to empty($this->uiprefs) to fix #17617 bug; Fixes #17617 Closes #17644 Signed-off-by: Atomu Oku <atomu.work@gmail.com> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-16Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-16Fix some languages not getting correctly detectedMaurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-07-13Add a ChangeLog entry for 6a69face6cWilliam Desportes
Ref: 6a69face6cb4f9233127795cf0739f89e5036685 Signed-off-by: William Desportes <williamdes@wdes.fr>
2022-06-17Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-17Fix Symfony exception when db/table has two %%Maurício Meneghini Fauth
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17584 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-15Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-15Fix error when clicking New index in sidebarMaurício Meneghini Fauth
Fixes https://github.com/phpmyadmin/phpmyadmin/issues/17592 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11Add ChangeLog entry for #17586Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11Add ChangeLog entry for #17121Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-11Add ChangeLog entry for #17577Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10Add ChangeLog entry for #17366Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10Add ChangeLog entry for #17424Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-10Add ChangeLog entry for #17271Maurício Meneghini Fauth
Fixes #17271 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-06Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-06-06Add ChangeLog entry for #17517Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-29Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-29Add ChangeLog entry for #17386Maurício Meneghini Fauth
[ci skip] Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2022-05-21Merge branch 'QA_5_2'Maurício Meneghini Fauth
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>