forked from phpmyadmin/phpmyadmin
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[pull] master from phpmyadmin:master #428
Open
pull
wants to merge
7,057
commits into
blackzilla2126:master
Choose a base branch
from
phpmyadmin:master
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+2,285,961
−2,224,809
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Fix failing E2E tests
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Replace the `trans` tag and filter with the `t` function in templates
Pull-request: #19077 Signed-off-by: William Desportes <williamdes@wdes.fr>
Pull-request: #17662 Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
… edit privilege table/db Signed-off-by: Sachin Bahukhandi <sachinb0013@gmail.com>
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
The css expects all table cells to have a wrapping span, but the wrapping was only done when no span existed in the cell. If the formatting is done before the wrapping there already exist nested spans and no top-level span is created. In this case the style that makes the sql displayed inline did not apply. Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
When a view uses USE INDEX syntax import failed because of the missing index. Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
[ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
Pull-request: #18534 Signed-off-by: William Desportes <williamdes@wdes.fr>
- Upgrading phpstan/extension-installer (1.4.0 => 1.4.1) - Upgrading slim/psr7 (1.6.1 => 1.7.0) Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Currently translated at 42.6% (1453 of 3404 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/az/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 92.9% (3163 of 3404 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 45.4% (1557 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/az/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 99.9% (3426 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/nl/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 95.9% (3288 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/zh_Hant/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Currently translated at 99.1% (3376 of 3404 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/nl/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 100.0% (3404 of 3404 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
Currently translated at 99.6% (3393 of 3404 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Currently translated at 93.5% (3184 of 3404 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hant/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
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/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
Currently translated at 96.4% (3305 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/zh_Hant/ Signed-off-by: Ricky From Hong Kong <lamricky11@hotmail.com>
Change Util::localisedDate() to use DateTimeImmutable
[ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
Fixes #19187 Depends on phpmyadmin/sql-parser#560 to work without regression in the case of a condition `0` because now the query is parsed and built again to remove comments. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
The PR will modify the 'GetCookieName' functtion by hard coding the prefix ' __Secure-' to each cookie name when 'isHttps()' is true, Apparently the prefix will be recognise d and enforced by most browsers (ignored by the older ones).Update Config.php The raison d'aitre for this PR is contained in my issue # 18608. This PR will replace the line 953, part of the GetCookieName function : return $cookieName . ( $this->isHttps ? '_https' : '' ); with the amended line: return ( $this->isHttps() ? '__Secure-' : '’ ) . $cookieName . ( $this->isHttps() ? '_https' : ‘’ ); Signed-off-by: martin762 <martin762green@btinternet.com> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Fixes #18608 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Adds date-fns to support the timeline chart. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Replace jqplot by Chart.js for table/chart page
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
[ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Currently translated at 100.0% (3405 of 3405 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )