gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,110 Commits 12 Branches 481 Tags 2.4 GiB
28892052df
Commit Graph

12031 Commits

Author SHA1 Message Date
William Desportes
db2f6e636d
Merge branch 'QA_5_2' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-03 14:00:15 +01:00
William Desportes
4bea65e29a
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-03 13:47:51 +01:00
William Desportes
bc32e25cff
Add ChangeLog entries for #17331 and #17315 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-02-03 13:43:19 +01:00
Maurício Meneghini Fauth
5743de3457
Merge branch 'QA_5_2' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-28 17:28:42 -03:00
Maurício Meneghini Fauth
6c52955c61
Merge branch 'QA_5_1' into QA_5_2 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-28 17:21:15 -03:00
Maurício Meneghini Fauth
362deb2d8b
Add ChangeLog entry for #17308 
- Fix broken pagination links in the navigation sidebar

[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-28 16:58:02 -03:00
Maurício Meneghini Fauth
9554df8f2c
Merge branch 'QA_5_2' 2022-01-22 16:21:17 -03:00
Maurício Meneghini Fauth
9fe9fe8ad1
Merge branch 'QA_5_1' into QA_5_2 2022-01-22 16:19:24 -03:00
Maurício Meneghini Fauth
48b4ff8247
Fix hide_connection_errors being undefined when a controluser is set 
Fixes #17307
Closes #17304

(cherry picked from commit fd692ca382)

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-22 12:33:43 -03:00
Isaac Bennetch
d820993b06 Prepare for version 5.3.0-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-22 08:34:48 -05:00
Isaac Bennetch
a5a231300c Merge QA_5_1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-22 08:29:26 -05:00
Isaac Bennetch
184bd55c50 Prepare for version 5.1.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-22 08:23:39 -05:00
Isaac Bennetch
60cfc78e1c Finish fixing merge conflicts from QA_5_1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:40:38 -05:00
Isaac Bennetch
42fdd04e21 Fix merge conflicts from QA_5_1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:37:51 -05:00
Isaac Bennetch
985912f58f Fix merge conflicts from security branch 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:28:17 -05:00
Isaac Bennetch
32e76f7bc9 Fix typo in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:13:58 -05:00
Isaac Bennetch
4506733ed3 Prepare ChangeLog for 5.1.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 11:13:00 -05:00
Isaac Bennetch
60d398ec9a Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 11:07:21 -05:00
Isaac Bennetch
37f6089b9d Fix typos in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 10:57:27 -05:00
Isaac Bennetch
6124ed4376 ChangeLog for 4.9.8 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 10:15:30 -05:00
Maurício Meneghini Fauth
7aaab24463
Remove the phpseclib dependency 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 17:43:50 -03:00
William Desportes
76113e8f69
Merge branch 'origin/QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-03 13:10:56 +01:00
William Desportes
fca3dfa592
Require Twig 3.3.5 for PHP 8.1 compatibility 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-03 13:10:07 +01:00
William Desportes
666f0d6a27
Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-03 13:06:27 +01:00
William Desportes
0ff9d908e7
Add ChangeLog entries for #16746 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-03 12:38:47 +01:00
Maurício Meneghini Fauth
0f678e8d7d
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-27 16:19:18 -03:00
Maurício Meneghini Fauth
3968808e76
Fix broken link in the Simulate DML query modal 
Fixes #17259

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-27 16:09:07 -03:00
Maurício Meneghini Fauth
5658a99ba0
Add ChangeLog entry for #17257 
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-26 19:11:43 -03:00
Maurício Meneghini Fauth
2a4b170a34
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-21 13:13:09 -03:00
Maurício Meneghini Fauth
119eaaa671
Add ChangeLog entry for #17247 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-21 13:03:18 -03:00
William Desportes
5abbb1463d
Add a ChangeLog entry for 78fd92fde9 
Pull-request: #17242
Ref: #16005
Ref: 78fd92fde9

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-12-19 22:22:40 +01:00
Maurício Meneghini Fauth
fa5c684f27
Replace the master/slave terminology 
Replaces master with primary and slave with replica.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-12-18 14:26:56 -03:00
William Desportes
f718f475e4
Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-12-12 19:35:54 +01:00
William Desportes
57f1d32048
Add a ChangeLog entry for #16746 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-12-12 19:28:14 +01:00
William Desportes
934287250c
Add a ChangeLog entry for #17228 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-12-12 12:15:41 +01:00
Maurício Meneghini Fauth
fbd5b0a67c
Redesign the export/import pages to use Bootstrap components 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-25 13:37:47 -03:00
Maurício Meneghini Fauth
4001460066
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-21 15:00:06 -03:00
Maurício Meneghini Fauth
d7ced91ae2
Fix db selection when nav tree is disabled 
$cfg['ShowDatabasesNavigationAsTree'] = false;

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-21 12:08:21 -03:00
Maurício Meneghini Fauth
d5954ff7de
Add ChangeLog entry for #17171 
Remove printview.css theme files

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-11-01 09:43:19 -03:00
Maurício Meneghini Fauth
3922cb7928
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-10-27 15:04:40 -03:00
Maurício Meneghini Fauth
6ea1cbbe04
Add ChangeLog entry for #17090 
Fix bbcode not rendered for error messages on setup

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-10-27 14:42:28 -03:00
Maurício Meneghini Fauth
e5f9012280
Use composer/ca-bundle to manage the CA cert file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-10-09 12:50:51 -03:00
Maurício Meneghini Fauth
74f142d997
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-23 13:10:38 -03:00
Maurício Meneghini Fauth
6387eaad66
Fix a PHP notice when logging out 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-23 12:47:43 -03:00
Maurício Meneghini Fauth
322dc72621
Merge branch 'QA_5_1' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2021-09-05 00:51:20 -03:00
William Desportes
aca838370c
Add ChangeLog entries for #16693 and #12753 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-09-03 01:04:26 +02:00
William Desportes
828d8e1de4
Merge branch 'QA_5_1' 
Also fixed tests from previous merge: 2d307ed062

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-31 00:46:37 +02:00
William Desportes
df651fe5a5
Add 7 ChangeLog entries for #16906 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-31 00:27:35 +02:00
William Desportes
806e2740ba
Merge branch 'QA_5_1' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-27 22:09:55 +02:00
William Desportes
7290be3de2
Add a ChangeLog entry for #17092 
Ref: #1232
Fixes: #17092

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2021-08-27 21:46:27 +02:00