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

116637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
5b72d832cd
Merge pull request #15549 from Tithugues/fix/replace-gettype-by-is-functions 
Use is_* functions instead of gettype
 2019-11-01 20:40:56 -03:00
Maurício Meneghini Fauth
153d527240
Merge pull request #15548 from Tithugues/fix/missing-static-invocation 
Use static invocation when needed
 2019-11-01 20:40:12 -03:00
Maurício Meneghini Fauth
d46f0ac637
Merge pull request #15547 from Tithugues/fix/add-default-return-value 
Add default return value for unoverwritten methods
 2019-11-01 20:36:54 -03:00
Maurício Meneghini Fauth
1c32c4cc8e
Merge pull request #15545 from Tithugues/refactor-duplicated-methods 
Refactor duplicated methods
 2019-11-01 20:32:48 -03:00
Maurício Meneghini Fauth
0bdd1ff988
Merge pull request #15544 from Tithugues/code-cleaning 
Replace fake loop by try/catch with exceptions
 2019-11-01 20:30:18 -03:00
Hugues Peccatte
bb94bdeb2e Use is_* functions instead of gettype 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-01 22:55:56 +01:00
Hugues Peccatte
24e9fb5d29 Use static invocation when needed 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-01 22:50:42 +01:00
Hugues Peccatte
bf1bbe21ff Add default return value for unoverwritten methods 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-01 22:43:31 +01:00
Hugues Peccatte
69a4061441 Refactor duplicated methods 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-01 19:20:15 +01:00
Hugues Peccatte
b3b8a84783 Replace fake loop by try/catch with exceptions 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-01 17:31:25 +01:00
Isaac Bennetch
c37f7d70ea Merge branch 'QA_5_0' 2019-11-01 08:33:17 -04:00
Isaac Bennetch
3eff900881 Merge branch 'QA_4_9' into QA_5_0 2019-11-01 08:32:14 -04:00
Kongfa Warorot
267568b15b
Translated using Weblate (Thai) 
Currently translated at 39.3% (1298 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/th/
Signed-off-by: Kongfa Warorot <gongpha@hotmail.com>
 2019-10-31 09:04:28 +01:00
Kongfa Warorot
0519eac3ba
Translated using Weblate (Thai) 
Currently translated at 38.7% (1290 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/th/
Signed-off-by: Kongfa Warorot <gongpha@hotmail.com>
 2019-10-31 08:04:18 +01:00
William Desportes
1f472fb58d
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 23:57:12 +01:00
William Desportes
ab0b6e248a
Add ChangeLog entry for #15540 
Ref: 128d3a09a0
Yes, the commit comes from QA 4.9 and the ChangeLog is QA 5.0
This is because 4.9 users are not affected but they can still have the fix.
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 23:54:58 +01:00
William Desportes
cbdc5c0e83
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 23:52:18 +01:00
William Desportes
128d3a09a0
Fix #15540 - Uncaught TypeError: htmlspecialchars() in NavigationTree 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 23:47:45 +01:00
William Desportes
77d156c321
Add ChangeLog entry for #15475 
Ref: 44e168d7d3

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 23:35:14 +01:00
William Desportes
44e168d7d3
Merge #15537 - Sort By Key issues 
Fixes: #15475
Pull-request: #15537
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 23:31:33 +01:00
William Desportes
3ad6f48ad3
Fix Sort By Key issue #15475 
Fixes: #15475

Co-authored-by: Vitalii Medvediev <vitaliim@onehourtranslation.com>
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Vitalii Medvediev <vitaliim@onehourtranslation.com>
 2019-10-30 23:27:17 +01:00
Oleg Abrazhaev
43e1d4cade use twig in Structure and Variables controller and add missing tests #14801 (#15534) 
* use twig in Structure and Variables controller and add missing tests #14801

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>

* fix lint

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>

* Update templates/database/structure/overhead.twig

fix code review

Co-Authored-By: Maurício Meneghini Fauth <mauricio@fauth.dev>

* Update libraries/classes/Controllers/Database/StructureController.php

fix code review

Co-Authored-By: Maurício Meneghini Fauth <mauricio@fauth.dev>

* fix code review

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
 2019-10-29 22:48:29 -03:00
Oleg Abrazhaev
02c8704fc0 extract twig for TextImageLinkTransformationsPlugin method and fix test #14801 (#15533) 
* extract twig for TextImageLinkTransformationsPlugin method and fix test #14801

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>

* fix code review

Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
 2019-10-29 22:47:12 -03:00
Maurício Meneghini Fauth
1360cca700
Merge pull request #15532 from seyfer/extract-twig-for-url 
extract TWIG for url.php and fix formatting #14801
 2019-10-29 22:46:02 -03:00
William Desportes
cccf849ca7
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-29 00:46:10 +01:00
William Desportes
bbdd2cd19b
Merge branch 'QA_5_0' 2019-10-29 00:45:13 +01:00
William Desportes
bccc828700
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-29 00:44:00 +01:00
William Desportes
2575421da4
Merge branch 'QA_4_9' into QA_5_0 2019-10-29 00:42:29 +01:00
William Desportes
1a67c192df
Update po files 
[ci skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-29 00:35:35 +01:00
William Desportes
0cdbaf0adf
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-29 00:32:24 +01:00
William Desportes
d6da466fc0
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-29 00:29:16 +01:00
Maurício Meneghini Fauth
1b59e2d7f3
Merge pull request #15530 from seyfer/extract-twig-file-listing 
extract html for FileListing into twig and add tests #14801
 2019-10-28 19:59:11 -03:00
William Desportes
b5945d3bc4
Add ChangeLog entry for #15522 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-28 23:19:01 +01:00
William Desportes
d4d1f66495
Fix #15522 - Remove ic_b_info icon 
Fixes: #15522
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-28 23:16:32 +01:00
William Desportes
c6d9292596
Add ChangeLog entry for 0eeb98275e 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-28 22:33:40 +01:00
William Desportes
0eeb98275e
Merge #15514 - Unit test fixes for phpunit 8 compatibility 
Pull-request: #15514
Ref: #15236

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-28 22:30:40 +01:00
William Desportes
e646a9cca9
Add ChangeLog entry for #15477 2019-10-28 22:27:20 +01:00
William Desportes
5feb0ec989
Merge #15477 - display referential integrity checks for internal relations 
Pull-request: #15477

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-28 22:26:29 +01:00
Oleg Abrazhaev
ba370e2311 fix code review 
Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
 2019-10-28 19:31:15 +01:00
Maurício Meneghini Fauth
bfd9d1f6c2
Merge pull request #15531 from seyfer/extract-twig-import-status 
extract TWIG template from import_status.php #14801
 2019-10-28 12:43:46 -03:00
Maurício Meneghini Fauth
998d833c0c Move database data dictionary to routes file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 19:53:21 -03:00
Maurício Meneghini Fauth
5b1256b737 Remove server common from MonitorController constructor 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 17:45:42 -03:00
Maurício Meneghini Fauth
ae05259f9c Move server replication entry point to routes file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 15:49:22 -03:00
Maurício Meneghini Fauth
09224241da Use method aliases for GET and POST routes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 15:29:47 -03:00
Maurício Meneghini Fauth
bad2b8eca9 Move server variables entry point to routes file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 15:21:59 -03:00
Maurício Meneghini Fauth
a42b6a1588 Move server status variables to routes file 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 14:31:44 -03:00
Maurício Meneghini Fauth
3804d4e8cc Move server status queries entry point to routes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 14:13:55 -03:00
Maurício Meneghini Fauth
11ace284fa Move srv status processes entry point to routes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-27 14:01:20 -03:00
Oleg Abrazhaev
5a36d65114 sanitize list entries 
Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
 2019-10-27 15:19:45 +01:00
Oleg Abrazhaev
c0a93fadf7 fix test 
Signed-off-by: Oleg Abrazhaev <seyferseed@gmail.com>
 2019-10-27 15:05:34 +01:00