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

116656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Humbert
7cd67290f1
Translated using Weblate (French) 
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
 2019-11-03 18:13:56 +01:00
Maurício Meneghini Fauth
66ded7809b
Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-03 18:13:54 +01:00
William Desportes
a1ba9e2038
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-03 17:15:28 +01:00
William Desportes
15a4cbe505
Fix ErrorReport test after merge of #15273 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-03 17:04:53 +01:00
William Desportes
519aeadbc8
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-03 15:58:13 +01:00
William Desportes
c7f7f9c6c0
Merge branch 'QA_4_9' into QA_5_0 
Revert: 45d46a6316

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-03 15:52:51 +01:00
William Desportes
6baa5f2722
Add ChangeLog entry for #14184 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-03 15:38:11 +01:00
William Desportes
21695cfeb7
Merge #15273 - Fix HTTPS/HTTP cookie separation issue 
Fixes: #14184
Pull-request: #15273

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-11-03 15:32:11 +01:00
Maurício Meneghini Fauth
5227fbf26b Move database multi table query entry point to routes 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-02 21:54:09 -03:00
Kongfa Warorot
2dbaa6f3d9
Translated using Weblate (Thai) 
Currently translated at 40.4% (1334 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-11-02 05:04:01 +01:00
Kongfa Warorot
66ed4b9169
Translated using Weblate (Thai) 
Currently translated at 39.8% (1326 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-11-02 04:04:01 +01:00
Maurício Meneghini Fauth
521af947ef Add ChangeLog entry for #15491 
Improve complexity of generated passwords

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-11-01 20:58:31 -03:00
Maurício Meneghini Fauth
6679499d5c
Merge pull request #15535 from Tithugues/feature/fix-15491-symbols-in-suggested-passwords 
fix #15491 Generate password complexity setting
 2019-11-01 20:54:49 -03:00
Maurício Meneghini Fauth
20eab6257d
Merge pull request #15551 from Tithugues/refactor-duplicated-code 
Refactor duplicated code to create a bookmark
 2019-11-01 20:50:25 -03:00
Hugues Peccatte
4eed889ffa Refactor duplicated code to create a bookmark 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2019-11-02 00:44:00 +01:00
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
45d46a6316
Remove typehints for hhvm 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 00:06:12 +01:00
William Desportes
09464ba8f5
Fix unit tests 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 00:06:12 +01:00
William Desportes
a3d77ce84b
Fix #14184 - HTTPS/HTTP cookie separation issue (aka Failed to set session cookie. Maybe you are using HTTP instead of HTTPS) 
Duplicate-of-pull-request: #14420
Fixes: #14184
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-30 00:06:12 +01: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