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

123025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
de9c1788ce Adding composer lock for 5.2.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 13:40:41 -05:00
Isaac Bennetch
8a4a8a3612 Don't remove phpseclib files when creating release, they don't exist. Related to 7aaab24463 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:48:01 -05:00
Isaac Bennetch
d4f1f6d552 Prepare for version 5.2.0-rc1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 12:43:04 -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
9a9ef9e9b0 Merge commit 'd1ee5245c8' 2022-01-20 12:38:19 -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
b553913248 Merge commit '3c917074b1' 2022-01-20 12:30:46 -05:00
Isaac Bennetch
ede9244669 Merge commit 'c92658f96f' 2022-01-20 12:29:22 -05:00
Isaac Bennetch
ef32bc5077 Merge remote-tracking branch 'origin/QA_5_1' 2022-01-20 12:28:45 -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
bfad8a8d85 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 11:37:34 -05:00
Isaac Bennetch
6256309136 Adding composer lock for 5.1.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 11:28:35 -05:00
Isaac Bennetch
d7a9a9156f Prepare for version 5.1.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 11:13:18 -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
d1ee5245c8 Merge commit 'c92658f96f' into QA_5_1 2022-01-20 11:03:58 -05:00
Isaac Bennetch
3c917074b1 Merge remote-tracking branch 'security/QA_5_1-security' into QA_5_1 2022-01-20 10:58:18 -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
d8515f83ba Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 10:49:38 -05:00
Isaac Bennetch
1a02b32396 Adding composer lock for 4.9.8 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 10:38:22 -05:00
Isaac Bennetch
51f96694a0 Prepare for version 4.9.8 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2022-01-20 10:34:55 -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
Isaac Bennetch
f271cadd59 Merge remote-tracking branch 'security/QA_4_9-security' into QA_4_9 2022-01-20 09:55:49 -05:00
Maurício Meneghini Fauth
2a906047e0
Translated using Weblate (Polish) 
Currently translated at 99.9% (3383 of 3384 strings)

[ci skip]

Translation: phpMyAdmin/5.1
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-1/pl/
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-19 19:55:02 +01:00
Maurício Meneghini Fauth
8fa99a3363
Add stub file for uploadprogress_get_info function 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-19 14:49:12 -03:00
Maurício Meneghini Fauth
e260351af9
Replace badge with stryker in infection.json.dist 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-19 12:24:06 -03:00
Maurício Meneghini Fauth
6177f83b03
Merge pull request #17279 from kamil-tekiela/Dbal-pt.4 
Major Dbal refactoring pt.4
 2022-01-19 12:16:14 -03:00
Maurício Meneghini Fauth
c03cbdea88
Merge pull request #17276 from kamil-tekiela/microtime-sql 
Expose execution time as public property
 2022-01-19 12:13:12 -03:00
Maurício Meneghini Fauth
369f9ed662
Merge pull request #17274 from kamil-tekiela/Refactor-sql.php 
Minor refactoring of Sql.php
 2022-01-19 12:11:23 -03:00
Maurício Meneghini Fauth
3db6a8a7eb
Merge pull request #17300 from mauriciofauth/dbi-dummy-mark-test 
Mark test as incomplete for not supported queries
 2022-01-19 11:40:11 -03:00
Maurício Meneghini Fauth
04176cd9db
Mark test as incomplete for not supported queries 
Instead of printing the query, it marks the test as incomplete, this way
we have a stack trace that help finding why it happened.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-19 11:39:27 -03:00
Maurício Meneghini Fauth
0036275d3f
Translated using Weblate (Polish) 
Currently translated at 96.2% (3286 of 3415 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pl/
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-18 19:01:16 +01:00
Maurício Meneghini Fauth
6bc9fadde2
Update PHPStan/Psalm baselines 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-18 14:51:09 -03:00
Kozioł Marcin
d6da962798
Translated using Weblate (Polish) 
Currently translated at 100.0% (3384 of 3384 strings)

[ci skip]

Translation: phpMyAdmin/5.1
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-1/pl/
Signed-off-by: Kozioł Marcin <koziol.martin@gmail.com>
 2022-01-17 00:57:02 +01:00
Kozioł Marcin
c92658f96f
Translated using Weblate (Polish) 
Currently translated at 99.5% (3295 of 3309 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pl/
Signed-off-by: Kozioł Marcin <koziol.martin@gmail.com>
 2022-01-17 00:52:31 +01:00
Hosted Weblate
0d96c67c3a
Merge branch 'origin/master' into Weblate. 
[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/
 2022-01-16 01:13:49 +01:00
Kozioł Marcin
c09aa410dd
Translated using Weblate (Polish) 
Currently translated at 96.2% (3287 of 3415 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pl/
Signed-off-by: Kozioł Marcin <koziol.martin@gmail.com>
 2022-01-16 01:13:48 +01:00
phpMyAdmin bot
ff3e87c3b6 Update po files 
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
 2022-01-16 00:13:24 +00:00
Maurício Meneghini Fauth
794ee7914b
Merge pull request #339 from phpmyadmin/phpseclib-removal 
Remove phpseclib dependency
 2022-01-15 12:14:03 -03:00
Максим Крикуненко
cfb10db387
Translated using Weblate (Ukrainian) 
Currently translated at 95.9% (3247 of 3384 strings)

[ci skip]

Translation: phpMyAdmin/5.1
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-1/uk/
Signed-off-by: Максим Крикуненко <mxxmus@meta.ua>
 2022-01-15 13:56:30 +01:00
Максим Крикуненко
66c422b6d2
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3309 of 3309 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/uk/
Signed-off-by: Максим Крикуненко <mxxmus@meta.ua>
 2022-01-15 13:52:34 +01:00
Максим Крикуненко
2efb835723
Translated using Weblate (Ukrainian) 
Currently translated at 92.5% (3162 of 3415 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/uk/
Signed-off-by: Максим Крикуненко <mxxmus@meta.ua>
 2022-01-14 17:51:25 +01:00
Maurício Meneghini Fauth
411bacf613
Use Sodium for auth cookies encryption 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 18:46:04 -03: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
Maurício Meneghini Fauth
9b3a1f7734
Merge branch 'QA_5_1-security' into master-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 17:41:16 -03:00
Maurício Meneghini Fauth
813ffbf562
Merge branch 'QA_4_9-security' into QA_5_1-security 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2022-01-13 17:20:04 -03:00
Maurício Meneghini Fauth
30dd8de7e8
Merge pull request #338 from phpmyadmin/sec/332/51 
Fix Multiple vunerabilities: XSS, HTML Injection, Open Redirect
 2022-01-13 17:07:34 -03:00
Maurício Meneghini Fauth
13bb2e10bc
Merge pull request #337 from phpmyadmin/fix-2fa-disable 
security - Fix - 2FA/U2F can be disabled without any code change
 2022-01-13 17:07:06 -03:00
William Desportes
ca54f1db05
security - Fix - 2FA/U2F can be disabled without any code change 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2022-01-13 19:07:34 +01:00