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

117335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
5f36cd8aec Refactor top_menu.twig 
Simplifies the navigation bar tab loop by removing the
get_html_tab function.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-08 19:42:29 -03:00
Maurício Meneghini Fauth
8bb28f82fe Ignore PHPStan errors 
Ignores Plugins\Export\ExportSql class errors.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-08 19:40:57 -03:00
Isaac Bennetch
a89f3fe750 Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-08 15:18:01 -05:00
Maurício Meneghini Fauth
ed415a61b3 Remove unused Bootstrap components 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-08 14:37:51 -03:00
Isaac Bennetch
f8412ea633 Prepare for version 5.0.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:46:55 -05:00
Isaac Bennetch
8c2b30bd1f Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:07:21 -05:00
Isaac Bennetch
645989e87a Adding composer lock for 5.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-01-07 21:03:54 -05:00
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
Maurício Meneghini Fauth
5b7e1c0e06
Merge pull request #15758 from mauriciofauth/common-includes 
Remove server, db and tbl common include files
 2020-01-07 22:53:18 -03:00
Maurício Meneghini Fauth
d0f28cef30 Refactor table pages common code 
Extracts tbl_common.inc.php code to the Common::table() method and
removes the include file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-07 22:49:24 -03:00
Maurício Meneghini Fauth
385e7f86c0 Refactor database pages common code 
Extracts db_common.inc.php code to the Common::database() method and
removes the include file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-07 22:49:24 -03:00
Maurício Meneghini Fauth
a1bcb9f0f3 Refactor server pages common code 
Extracts server_common.inc.php code to the Common::server() method and
removes the include file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-07 22:49:24 -03:00
Maurício Meneghini Fauth
59ce2dbd67 Fix MonitorControllerTest 
Fixes Server\Status\MonitorControllerTest when runned in isolation.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-07 22:46:27 -03:00
Maurício Meneghini Fauth
2e2c20ac31
Merge pull request #15759 from mauriciofauth/replication-include 
Remove replication.inc.php file
 2020-01-07 19:16:19 -03:00
William Desportes
3311c089c4
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 21:25:25 +01: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
Maurício Meneghini Fauth
08afb43653 Remove replication.inc.php file 
Extracts the replication.inc.php code to the ReplicationInfo class and
removes the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-07 14:31:46 -03: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
Maurício Meneghini Fauth
96ee3b8ab0 Remove the table structure entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
7837ab81f2 Remove the table sql entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
634c9f38e9 Remove the table replace entry point file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
4ffb6712ff Remove the table export entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
d190c82f1e Remove the table change entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
42468cb033 Remove the database sql entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
bb42779331 Remove the database export entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
bce0245387 Remove the server export entry point file 
Directly calls the controller instead of including the file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03:00
Maurício Meneghini Fauth
cbce3a66e3 Remove the sql entry point file 
Directly calls the controller instead of including the entry point file.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-01-06 23:15:26 -03: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
106ec8dee2
Merge branch 'QA_5_0' 
[ci skip]
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 01:36:03 +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
77ffaa9d4c
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-07 00:15:26 +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
c1c8e09586
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 23:45:16 +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
d6b25eed4c
Merge #15755 - Fix #15751 - Error 404 when edit sql 
Pull-request: #15755
Fixes: #15751
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 20:16:52 +01:00
William Desportes
5b787e7b6d
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-01-06 20:14:46 +01:00