Skip to content
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
wants to merge 7,069 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Jun 13, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Jun 13, 2021
williamdes and others added 28 commits April 27, 2024 13:44
…an existing grant

Pull-request: #19039
Fixes #19037

Signed-off-by: William Desportes <williamdes@wdes.fr>
Pull-request: #19122
Fixes #19117

Signed-off-by: William Desportes <williamdes@wdes.fr>
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>
…SE INDEX hint

Pull-request: #19135
Fixes #18566

Signed-off-by: William Desportes <williamdes@wdes.fr>
…l query box with multiple statements

Pull-request: #19121
Fixes: #18389
Fixes: #18487
Fixes: #18511

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
…nstraint during column move

Pull-request: #19105
Fixes: #17920
Fixes: #18006
Fixes: #18962

Signed-off-by: William Desportes <williamdes@wdes.fr>
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>
Signed-off-by: William Desportes <williamdes@wdes.fr>
Pull-request: #18537
Fixes #18529

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
…IMESTAMP` active

Pull-request: #18991
Fixes: #18276

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
…hout param

Pull-request: #19131
Fixes: #18240

Signed-off-by: William Desportes <williamdes@wdes.fr>
Pull-request: #19129
Fixes: #19125

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
…terTableSql

Signed-off-by: William Desportes <williamdes@wdes.fr>
Pull-request: #19136
Fixes: #18674

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: William Desportes <williamdes@wdes.fr>
BouRock and others added 30 commits June 14, 2024 18:09
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>
Adds dependency on chartjs-plugin-zoom to support the zoom feature.

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/ru/
Signed-off-by: Andrei Stepanov <adem4ik@gmail.com>
Currently translated at 100.0% (3405 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/uk/
Signed-off-by: Hotripak <hotr1pak@gmail.com>
Replace jqPlot with Chart.js in table zoom search page
Currently translated at 100.0% (3405 of 3405 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
Currently translated at 93.5% (3184 of 3405 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>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Move chart.ts to modules/chart.ts.
Rename table/zoom_plot_jqplot.ts to table/zoom_search.ts.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Replace jqPlot library with Chart.js library
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet