Commit Graph

125453 Commits

Author SHA1 Message Date
Isaac Bennetch
43de7826e1 Fix merge conflicts
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-02-07 21:45:13 -05:00
Isaac Bennetch
d5db011a74 Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-02-07 16:49:52 -05:00
Isaac Bennetch
11e127f3fa Adding composer lock for 5.2.1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-02-07 16:23:39 -05:00
Isaac Bennetch
372185c302 Prepare for version 5.2.1
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-02-07 16:20:27 -05:00
Isaac Bennetch
cc715676b3 Add ChangeLog entry for security fix PMASA-2023-01
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-02-07 16:18:56 -05:00
Isaac Bennetch
e9b1db6b10 Merge remote-tracking branch 'security/QA_5_2-security' into QA_5_2 2023-02-07 16:17:33 -05:00
Isaac Bennetch
c3460a7f04 Merge branch 'QA_5_2' 2023-02-07 13:57:03 -05:00
Isaac Bennetch
185f5219d3
Merge pull request #345 from phpmyadmin/sec/343/52
[5.2] Fix not escaped title when using drag and drop upload
2023-02-07 13:44:03 -05:00
Maurício Meneghini Fauth
e7aa3fdacb
Merge pull request #18068 from kamil-tekiela/Fix-#18065
Revert earlier change - fix #18065
2023-02-06 15:35:51 -03:00
Maurício Meneghini Fauth
91167fb70b
Create the DesignerConfig JS object
This removes the properties from the Window object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-05 13:00:03 -03:00
phpMyAdmin bot
4be069c5db Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2023-02-05 00:20:52 +00:00
Kamil Tekiela
1a387693aa Revert earlier change
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-02-04 23:26:39 +00:00
Maurício Meneghini Fauth
ede1e82c28
Refactor DB designer JS to use modules
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-04 18:26:08 -03:00
Kristijan Fremen Velkovski
e95c377de9
Translated using Weblate (Macedonian)
Currently translated at 26.1% (897 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2023-02-02 12:39:51 +01:00
Masahiro Fujimoto
909294300e
Translated using Weblate (Japanese)
Currently translated at 100.0% (3427 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ja/
Signed-off-by: Masahiro Fujimoto <mfujimot@gmail.com>
2023-02-02 12:39:51 +01:00
JL Pilgram
e44a5bbbb6
Translated using Weblate (Italian)
Currently translated at 99.8% (3422 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/it/
Signed-off-by: JL Pilgram <twich_89@hotmail.it>
2023-02-02 12:39:50 +01:00
Maurício Meneghini Fauth
3bafef8f2b
Add type info for some jQuery plugins
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-02 01:06:20 -03:00
Maurício Meneghini Fauth
ef385e2259
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-01 22:04:27 -03:00
Maurício Meneghini Fauth
b5a0c10687
Fix coding standard issue
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-01 21:28:02 -03:00
Maurício Meneghini Fauth
827e69157f
Upgrade JavaScript dependecies
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-01 20:34:31 -03:00
Kristijan Fremen Velkovski
df0cd9da8b
Translated using Weblate (Macedonian)
Currently translated at 26.2% (903 of 3442 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2023-02-01 13:10:07 +01:00
Masahiro Fujimoto
fe5b3d2587
Translated using Weblate (Japanese)
Currently translated at 100.0% (3442 of 3442 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/
Signed-off-by: Masahiro Fujimoto <mfujimot@gmail.com>
2023-02-01 13:10:06 +01:00
Maurício Meneghini Fauth
d8ca5a4227
Improve type inference of some JS functions
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-31 20:38:49 -03:00
William Desportes
ae1e6dadbc
Merge #18054 - Remove quotes (typo)
Pull-request: #18054

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-01-31 23:49:24 +01:00
William Desportes
97edddf1ce
Add TEST_PATH for out of source tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-01-31 23:48:31 +01:00
William Desportes
e11c385d35
Add TEST_PATH for out of source tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-01-31 23:48:29 +01:00
Liviu-Mihail Concioiu
f45cd23222 Remove double quotes
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
2023-01-31 22:57:56 +01:00
Maurício Meneghini Fauth
8d968c66c7
Fix some JS doc issues
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-31 16:15:08 -03:00
Maurício Meneghini Fauth
eb1ba4c90c
Merge pull request #18050 from kamil-tekiela/Twig-whitespace
Remove newlines in Twig
2023-01-31 13:43:54 -03:00
Maurício Meneghini Fauth
6303a23dd4
Extract Functions.on() into a module
This removes the last circular dependency.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-31 12:47:21 -03:00
Maurício Meneghini Fauth
7a324fd6d7
Extract Navigation.onload() into a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-31 12:06:30 -03:00
Kristijan Fremen Velkovski
b0ac3398f8
Translated using Weblate (Macedonian)
Currently translated at 25.9% (890 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2023-01-31 03:41:41 +01:00
Kristijan Fremen Velkovski
2229b964b2
Translated using Weblate (Macedonian)
Currently translated at 26.0% (895 of 3442 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2023-01-31 03:39:28 +01:00
Maurício Meneghini Fauth
88025a6d84
Extract Functions.formatDateTime() to a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-30 21:41:01 -03:00
Maurício Meneghini Fauth
648ee27492
Extract Config.isStorageSupported() to a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-30 20:42:29 -03:00
Maurício Meneghini Fauth
a90229f2d2
Extract Functions.mainMenuResizerCallback() to a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-30 20:03:21 -03:00
Kamil Tekiela
5f009765ca Remove newlines in Twig
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-01-30 22:31:51 +00:00
Maurício Meneghini Fauth
ace3fe6771
Extract Functions.checkIndexName() to a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-30 17:23:17 -03:00
Maurício Meneghini Fauth
e7c7e6eed8
Extract Indexed.checkIndexType() to a module
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-30 13:06:33 -03:00
Kristijan Fremen Velkovski
2427236965
Translated using Weblate (Macedonian)
Currently translated at 25.7% (884 of 3427 strings)

[ci skip]

Translation: phpMyAdmin/5.2
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2023-01-30 00:12:55 +01:00
Hosted Weblate
b4b43e3f76
Merge branch 'origin/master' into Weblate.
[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/
2023-01-29 01:21:09 +01:00
Kristijan Fremen Velkovski
cc4e571045
Translated using Weblate (Macedonian)
Currently translated at 25.8% (889 of 3442 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/
Signed-off-by: Kristijan Fremen Velkovski <me@krisfremen.com>
2023-01-29 01:21:08 +01:00
phpMyAdmin bot
05379c36f7 Update po files
[ci skip]

Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
2023-01-29 00:20:19 +00:00
Kamil Tekiela
f7524fd3b9
Minor code refactoring of Privileges.php (#17993)
* Small fixes
* Replace escapeString with quoteString
This also fixes bug with $_POST['old_username'].
* Add userExists() method
* Merge if statements
* Use ServerRequest for $initial
* Extract getExportPageTitle from getExportUserDefinitionTextarea
* Update baselines
* Complete redesign of getCurrentAuthenticationPlugin()
* Add method getEmptyUserNotice()
* Remove redundant variable sets and unsets
* Add method checkStructureOfPrivilegeTable()
* Remove testGetHtmlForViewUsersError()
* Privatize getAddUserHtmlFieldset
* Improve tests for mysql.user table checks

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-01-28 20:40:30 -03:00
Maurício Meneghini Fauth
1ec3868265
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-28 14:45:42 -03:00
Maurício Meneghini Fauth
1a81122650
Fix Psalm error related to TEST_PATH constant
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-28 14:37:51 -03:00
Maurício Meneghini Fauth
0926ddf864
Merge pull request #18044 from kamil-tekiela/Fix-incomplete-test
Fix incomplete test after previous PR
2023-01-28 13:46:13 -03:00
Maurício Meneghini Fauth
47f1d677b3
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-01-28 13:09:51 -03:00
Kamil Tekiela
78de670d61 Fix incomplete test after previous PR
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-01-28 14:01:26 +00:00
William Desportes
7ec4ea0e66
Add TEST_PATH for out of source tests
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-01-28 09:18:56 +01:00