gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,634 Commits 12 Branches 481 Tags 2.4 GiB
dc1e81e6b2
Commit Graph

116634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
dc1e81e6b2 Fix merge conflicts from QA_4_9 and prepare for 5.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 20:56:25 -05:00
William Desportes
e16ccbdbc7
Add ChangeLog entry for #15351 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:12:30 +01:00
William Desportes
21c1bb81b0
Merge #15749 - Fix #15351 - retain 2FA setting 
Pull-request: #15749
Fixes: #15351
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:11:09 +01:00
Jayati Shrivastava
7e007f8b7c
Fix #15351 - retain 2FA setting 
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
 2020-01-07 21:06:22 +01:00
Isaac Bennetch
fa53b374ad Prepare for version 4.9.4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 14:10:45 -05:00
Isaac Bennetch
ce10567b74 Merge remote-tracking branch 'security/fix/293-sql-injection' into QA_4_9 2020-01-07 14:07:17 -05:00
William Desportes
af100abddf
Add more tests for testCookieDecrypt 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 19:07:27 +01:00
bepsvpt
fd553a45d5
Update and revert "Remove a test that can not be predictible" 
This reverts commit a6155da6a9.

Co-authored-by: bepsvpt <og7lsrszah6y3lz@infinitefa.email>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:02:04 +08:00
Timothy Aditya Sutantyo
b74ed2f98e
Translated using Weblate (Indonesian) 
Currently translated at 79.4% (2644 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/id/
Signed-off-by: Timothy Aditya Sutantyo <timisutantyo@gmail.com>
 2020-01-07 02:21:20 +01:00
William Desportes
a6155da6a9
Remove a test that can not be predictible 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:28:35 +01:00
William Desportes
5e6ca74b1f
Add ChangeLog entry for #14299 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:13:34 +01:00
William Desportes
12270a49cf
Merge #15747 - fix #14299 - PMA_makegrid is not defined 
Pull-request: #15747
Fixes: #14299
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:11:09 +01:00
William Desportes
874c5afd59
Add ChangeLog entry for #14875 2020-01-06 23:41:29 +01:00
William Desportes
a5ec07f0e9
Merge #15753 - fix #14875 shp import tests where failing 
Pull-request: #15753
Fixes: #14875
Closes: #15753
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:40:56 +01:00
William Desportes
551b2262bc
Remove allow failure for dbase on build matrix and check it is active 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:14:52 +01:00
William Desportes
3c701066c3
Add ChangeLog entry for #15742 
Ref: 4450bcec55
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:14:14 +01:00
William Desportes
4450bcec55
Merge #15742 - remove double slash on TempDir 
Pull-request: #15742
Closes: #15742
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:04:43 +01:00
bepsvpt
879b7fe681
fix #14875 - fix shp filename sanitization and update test 
Co-authored-by: bepsvpt <og7lsrszah6y3lz@infinitefa.email>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:00:55 +01:00
William Desportes
4129e16edc
Fix #15752 - use DIRECTORY_SEPARATOR instead of slash 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 21:45:49 +01:00
William Desportes
21c2bcdbb3
Add Unit tests 
Closes #15752

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 21:45:49 +01:00
bepsvpt
07066775c9
remove duplicate slash for tempdir path 
Co-authored-by: bepsvpt <og7lsrszah6y3lz@infinitefa.email>

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 21:45:49 +01:00
William Desportes
bd808c8d4f
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 15:23:34 +01:00
William Desportes
156231d5bf
Fix not isset $GLOBALS['dblist'] 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 15:22:35 +01:00
William Desportes
d01dab811c
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 14:25:25 +01:00
William Desportes
71e67af91f
Add ChangeLog entry for #15724 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 14:20:08 +01:00
William Desportes
6c35ea3be7
Fix #15724 - Fix 2FA disabled 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 14:17:03 +01:00
Isaac Bennetch
af28c53645 Update documentation for creating a controluser. 
This now provides information for newer MySQL (newer than 8.0) and MariaDB servers.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-05 15:03:09 -05:00
Isaac Bennetch
1ae14b59a4 Documentation for the MySQL > 8.0 with PHP < 7.4 compatibility problem 
Document fixes for caching_sha2_password authentication problems

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-05 15:01:34 -05:00
Yash Bothra
2fef516a4c #14299 added makegrid.js file 
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
 2020-01-04 23:19:28 +05:30
Olivier Humbert
62f068d048
Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2020-01-04 15:21:17 +01:00
Olivier Humbert
162fb5731c
Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2020-01-04 15:21:17 +01:00
William Desportes
7c0bdfd48e
Fix #14936 - improve the fix for #14936 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 17:27:42 +01:00
William Desportes
02d13f6128
Add ChangeLog entry for #15734 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 17:20:15 +01:00
William Desportes
63b9f41a07
Fix #15734 - Uncaught TypeError: http_build_query() in setup 
Fixes: #15734 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 17:19:31 +01:00
William Desportes
637ec3d8f5
Add ChangeLog entry #15693 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 16:19:54 +01:00
William Desportes
207d5a57ba
Merge #15703 - Fix #15693 - tab focus using refresh button 
Pull-request: #15703
Fixes: #15693 

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 16:17:10 +01:00
Jayati Shrivastava
9cae108c11
Fix #15693 - tab focus using refresh button 
Fixes #15693
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
 2020-01-02 16:12:10 +01:00
William Desportes
9f0b428f3b
Add ChangeLog entry for #15717 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 15:49:56 +01:00
William Desportes
8571ede403
Merg #15718 - Fixes #15717 - Warning popup not dissapearing 
Pull-request: #15718
Fixes: #15717 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 15:48:06 +01:00
Jayati Shrivastava
f428e4eeb7
Fixes #15717 - Warning popup not dissapearing 
Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
 2020-01-02 15:44:37 +01:00
William Desportes
9119a961ef
Add ChangeLog entry for #15726 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 15:34:09 +01:00
William Desportes
1b913f611e
Merge #15730 - fix #15726 - double icon on enum editor 
Pull-request: #15730
Fixes: #15726 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-02 15:33:48 +01:00
Yash Bothra
c0a99eec94
fix #15726 - double icon on enum editor 
Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
 2020-01-02 15:28:19 +01:00
Olivier Humbert
7955f672d7
Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2020-01-02 14:21:21 +01:00
Olivier Humbert
abe433ea7e
Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2020-01-02 14:21:19 +01:00
William Desportes
c86acbf3ed
Fix sql injection in user exists request 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-01 13:55:06 +01:00
Olivier Humbert
096feb5e8f
Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2020-01-01 12:21:18 +01:00
Olivier Humbert
9f82b71f69
Translated using Weblate (French) 
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/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2020-01-01 12:21:18 +01:00
William Desportes
4a5294932e
Add ChangeLog entry for #15725 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-31 12:01:44 +01:00
William Desportes
609cd722e9
Fix #15725 - error 500 when exporting - set time limit 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-12-31 12:00:25 +01:00