1
0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-23 18:29:15 +03:00
Commit Graph

1330 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
6ad017dfc5 Move po and locale directories to resources
- Related to #18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-11-30 12:01:48 -03:00
Maurício Meneghini Fauth
1d1c55e250 Move test directory to tests
- Related to #18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-11-30 10:47:42 -03:00
Maurício Meneghini Fauth
2aac253b47 Bump required Node version to 16
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-11-29 17:00:24 -03:00
Maurício Meneghini Fauth
f56284d80b Rename scripts directory to bin
- Related to #18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-11-24 20:40:25 -03:00
Maurício Meneghini Fauth
d888c29e0d Move ./js directory to ./resources/js
- Related to https://github.com/phpmyadmin/phpmyadmin/issues/18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-25 11:24:14 -03:00
Maurício Meneghini Fauth
87c494fa5f Rename ./libraries directory to ./app
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-24 16:58:48 -03:00
Maurício Meneghini Fauth
a4fad2488d Move ./sql directory to ./resources/sql
- Related to https://github.com/phpmyadmin/phpmyadmin/issues/18512

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-18 13:40:38 -03:00
Maurício Meneghini Fauth
ed3d632a99 Add composer.lock to version control
This will allow more control over the dependencies and will be easier to
investigate issues from past commits as the dependencies will be locked.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-10-04 11:25:26 -03:00
Maurício Meneghini Fauth
1b2da96123 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-09-02 19:35:41 -03:00
Maurício Meneghini Fauth
53d3aaea82 Add a documentation note to the nopassword config
Adds a note to the $cfg['Servers'][$i]['nopassword'] directive to add a
reference to the $cfg['Servers'][$i]['AllowNoPassword'].

Fixes https://github.com/phpmyadmin/phpmyadmin/issues/18680.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-09-02 15:48:42 -03:00
Maurício Meneghini Fauth
1ddcad2bfb Replace libraries/classes references with src
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-30 15:59:29 -03:00
Isaac Bennetch
9af1d3d222 Add Daniel Hinostroza, MD as Spanish translator for his work from (at least) phpMyAdmin 2.3.0 through 3.1.5
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-08-26 13:16:52 -04:00
Maurício Meneghini Fauth
57fd47a170 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-08-06 14:08:54 -03:00
William Desportes
2ad1339845 Change docker-compose for docker compose as it's now part of Docker
And remove a mistake space

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-08-03 15:59:27 +02:00
William Desportes
41d3c52717 Document Docker ENVs PMA_SOCKET and PMA_SOCKETS
Fixes: https://github.com/phpmyadmin/docker/issues/421

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-08-03 15:59:22 +02:00
Maurício Meneghini Fauth
ef69ad4453 Fix the public/themes path in the documentation
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-07-26 14:32:35 -03:00
Maurício Meneghini Fauth
c245ab5e9b Remove support for the Recode extension
The Recode extension is not supported in PHP >= 7.4.

- https://www.php.net/manual/en/intro.recode.php
- https://www.php.net/manual/en/migration74.removed-extensions.php

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-07-19 17:42:27 -03:00
Maurício Meneghini Fauth
e339418ba0 Fix required Node.js version in doc/setup.rst
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-07-15 15:29:09 -03:00
Maurício Meneghini Fauth
eaad8d8a1c Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-07-15 15:19:35 -03:00
Maurício Meneghini Fauth
12c79d6a60 Bump Node.js minimum version to 12
This version was already required by dependencies since 5.2.0.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-07-14 14:18:42 -03:00
William Desportes
bf9519444a Merge #18474 - Require min php 80102 (8.1.2)
Pull-request: #18474
Ref: #18217

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-06-01 10:00:32 +02:00
Kamil Tekiela
231ec1ba8b Remove QBE
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
2023-05-19 11:21:46 +01:00
William Desportes
25bd2ac711 Merge #18223 - Add a configuration option to allow shared bookmarks: $cfg['AllowSharedBookmarks']
Pull-request: #18223

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-05-06 12:02:50 +02:00
Maurício Meneghini Fauth
2f4dab8880 Add missing Config\Settings\Server control_ properties
https://docs.phpmyadmin.net/en/latest/config.html#cfg_Servers_control_*

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-05-02 15:24:59 -03:00
Erki Aring
c716102d09 Add configuration option to allow shared bookmarks
Signed-off-by: Erki Aring <erki@example.ee>
2023-04-14 12:09:01 +03:00
Maurício Meneghini Fauth
a431286fe3 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-29 13:51:17 -03:00
Sumit Chahal
66b4b1a158 Correct description for DisableShortcutKeys
Signed-off-by: Sumit Chahal <smtchahal@gmail.com>
2023-03-29 13:49:40 -03:00
William Desportes
e8b1437fff Merge #18225 - Make database and web server info separately configurable on $cfg['ShowServerInfo']
Pull-request: #18225

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-03-10 16:22:15 +01:00
William Desportes
ab5fc856ad Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-03-10 16:18:27 +01:00
William Desportes
33f9b57e18 Add examples for Google reCapatcha
Fixes: #17988

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-03-10 15:30:36 +01:00
SlushUwU
9188cf251b Add CloudFlare Turnstile captcha example (#18098)
Added reCaptcha example for CloudFlare Turnstile

Cloudflare Developer Page for Turnstile: https://developers.cloudflare.com/turnstile/get-started/

Pull-Request: #18098
Cherry-picked-from: d10b5d9e4e

Signed-off-by: SlushUwU <rolgoy@satowa-network.eu>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: William Desportes <williamdes@wdes.fr>
2023-03-10 15:30:34 +01:00
Erki Aring
b7ce755f07 Make database and web server info separately configurable
Signed-off-by: Erki Aring <erki@example.ee>
2023-03-10 10:12:24 +02:00
Maurício Meneghini Fauth
687c51dc1e Replace $GLOBALS['cfg']['ZeroConf'] in Common class
Replaces it with PhpMyAdmin\Config\Settings::$zeroConf access.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-03-02 17:55:58 -03:00
Maurício Meneghini Fauth
2a4eb5ae62 Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-28 12:55:44 -03:00
Maurício Meneghini Fauth
2a8932588d Add some configuration options to documentation
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-28 12:53:52 -03:00
Maurício Meneghini Fauth
25cce47ae2 Merge config.default.php with Config\Settings classes
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-28 12:19:02 -03:00
William Desportes
b8849f5690 Fix .rst doc links
Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-28 02:18:13 +01:00
William Desportes
f57012dcff Fix weird website on .info, they seem to now use .com at dongleauth
Ref: https://github.com/Nitrokey/dongleauth
Ref: https://github.com/2factorauth/twofactorauth/issues/7348#issuecomment-1409488754

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-28 02:08:04 +01:00
William Desportes
ba059251fa Document back $cfg['EditInWindow'], $cfg['QueryWindowWidth'], $cfg['QueryWindowHeight'], $cfg['QueryWindowDefTab']
Removed in 35dab58bf5

Feature-request: https://github.com/phpmyadmin/phpmyadmin/issues/11983 ($cfg['EditInWindow'])

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-28 02:07:51 +01:00
William Desportes
86e6d1270b Add back documentation for DisplayBinaryAsHex
Added in: c67fd7f732
Removed in: 85390a7169

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-28 01:37:05 +01:00
William Desportes
af84b002ac Add documentation for version added of config $cfg['LintEnable']
Added in eef994f122

Signed-off-by: William Desportes <williamdes@wdes.fr>
2023-02-27 23:11:02 +01:00
Maurício Meneghini Fauth
11f483eb5e Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 19:07:05 -03:00
Maurício Meneghini Fauth
6ebbd62a7d Add documentation for the config $cfg['LintEnable']
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-27 19:03:52 -03:00
SlushUwU
d10b5d9e4e Add CloudFlare Turnstile captcha example (#18098)
Added reCaptcha example for CloudFlare Turnstile

Cloudflare Developer Page for Turnstile: https://developers.cloudflare.com/turnstile/get-started/

Pull-Request: #18098

Signed-off-by: SlushUwU <rolgoy@satowa-network.eu>
Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Co-authored-by: William Desportes <williamdes@wdes.fr>
2023-02-22 13:14:10 +01:00
Isaac Bennetch
b6101dc4f9 Merge branch 'QA_5_2' 2023-02-14 13:16:14 -05:00
Isaac Bennetch
8944383e53 Some improvements to the description of the customizations of the browser title bar text.
Fixes #18082

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2023-02-14 13:14:54 -05:00
Maurício Meneghini Fauth
040b4c582d Bump minimum PHP version to 8.1.0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-10 19:20:51 -03:00
Maurício Meneghini Fauth
20d748e841 Prepare for version 6.0.0-dev
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-10 19:20:51 -03:00
Maurício Meneghini Fauth
ae560e0ffb Prepare for version 5.2.2-dev
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2023-02-08 11:28:34 -03: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