Commit Graph

116402 Commits

Author SHA1 Message Date
Luis45ccs
2bd439e499
Translated using Weblate (Spanish)
Currently translated at 97.7% (3255 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/es/
Signed-off-by: Luis45ccs <luis45ccs@hotmail.com>
2019-09-08 22:23:58 +02:00
ssantos
0a9d0625f9
Translated using Weblate (Portuguese)
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: ssantos <ssantos@web.de>
2019-09-08 22:23:52 +02:00
William Desportes
d43e34868b
Merge branch 'QA_5_0' into master
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 16:44:15 +02:00
William Desportes
d070127c2d
Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 16:13:06 +02:00
William Desportes
7110206cb9
Fix redirected links in docs
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 16:09:58 +02:00
William Desportes
8343320841
Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 16:02:41 +02:00
William Desportes
4de8243469
Move php 5.5 step to custom steps to use trusty instead of xenial
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 15:30:04 +02:00
William Desportes
3ce36efe4f
Use xenial and remove mysql-server-5.6 from packages on TravisCI
Ref: bcdf6dcde9

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 15:15:42 +02:00
William Desportes
42ec546c56
Use NodeJS 10 on travis CI release step and fix OSX step
- remove sudo
- Cherry-pick of 0376662200
- Cherry-pick of e361a5ccfe

Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 15:01:47 +02:00
William Desportes
1095d793f0
Update brew on travis CI OSX step
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 14:45:26 +02:00
William Desportes
983a49dc00
Revert "Add ChangeLog entry for #15127"
This reverts commit 61ea8b799a.

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 14:45:26 +02:00
William Desportes
1056e65b2b
Revert "Fix #15127 - fixed the white square in floating menubar"
This reverts commit 61691091e5.

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 14:02:10 +02:00
William Desportes
27f56863fe
Add ChangeLog entries for #15349, #15440, 58f56111, 79c1b628, baada957, 631de237a
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 13:53:32 +02:00
William Desportes
631de237a3
Fix designer exit full screen mode icon and text back to enter mode
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 13:49:25 +02:00
William Desportes
baada9571f
Fix designer page URLs when saving
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 13:49:16 +02:00
William Desportes
79c1b62831
Fix designer page number -1 is an int
Because of 58f56111df

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 12:17:55 +02:00
William Desportes
58f56111df
Fix reloading a designer page
- Added cast to be sure pageNumber is an int -1 or postitive

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 11:40:13 +02:00
William Desportes
f49c253b9a
Fix #15440 - Page number is not being updated in the URL after saving a designer's page
Fixes: #15440
Pull-request: #15464
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 11:18:30 +02:00
William Desportes
57a00351a2
Fix #15439 - Designer page status not updated when added a new table from another database
Fixes: #15439
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-09-08 11:08:52 +02:00
Ankush Patil
3b9eb2b1f1 Fixed #15440 page number not showing in url bug
Signed-off-by: Ankush Patil <aspraz2658@gmail.com>
2019-09-08 10:50:35 +05:30
Maurício Meneghini Fauth
10003ee263 Extract HTML from Privileges::getUsersOverview
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-07 18:18:09 -03:00
Maurício Meneghini Fauth
a958569564 Remove Server\Privileges::formatPrivilege method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-07 11:55:59 -03:00
Maurício Meneghini Fauth
5d2266ae41 Fix missing global declaration
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-05 20:35:22 -03:00
Maurício Meneghini Fauth
3221ebb7cc Refactor routine specific privileges method
Refactors Server\Privileges::getHtmlForRoutineSpecificPrivileges

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-05 20:31:58 -03:00
ssantos
854dec7562
Translated using Weblate (Portuguese)
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pt/
Signed-off-by: ssantos <ssantos@web.de>
2019-09-06 00:23:39 +02:00
ssantos
7bf17c70bf
Translated using Weblate (Portuguese)
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt/
Signed-off-by: ssantos <ssantos@web.de>
2019-09-06 00:23:39 +02:00
Maurício Meneghini Fauth
ee59b98a01 Merge branch 'QA_5_0' 2019-09-04 18:37:42 -03:00
Maurício Meneghini Fauth
25c16c6fd8 Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-04 18:36:41 -03:00
Maurício Meneghini Fauth
a5ba1064d7 Fix type error when editing routine privs
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-04 18:31:30 -03:00
Maurício Meneghini Fauth
e3f891f604 Refactor SqlQueryForm::getHtml
Move insert and page templates into page template

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-03 20:41:36 -03:00
Maurício Meneghini Fauth
fc606d2746 Extract HTML from SqlQueryForm::getHtmlForBookmark
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-03 12:15:59 -03:00
Maurício Meneghini Fauth
53ce1d256c Extract HTML from SqlQueryForm::getHtml
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 22:19:29 -03:00
Maurício Meneghini Fauth
732236c137 Extract HTML from SqlQueryForm::getHtmlForInsert
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 21:28:58 -03:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Maurício Meneghini Fauth
8929b84289 Extract HTML from user privileges header
Extract the HTML from the
Server\Privileges::getHtmlHeaderForUserProperties method to a Twig
template.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-01 12:01:29 -03:00
Maurício Meneghini Fauth
bac7a4a26d Extract HTML from user properties view
Extract the HTML from the Server\Privileges::getHtmlForUserProperties
method to a Twig template.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-01 10:33:02 -03:00
Maurício Meneghini Fauth
f2b2c51ea8 Move table specific privs logic to privs table
Moves getHtmlForTableSpecificPrivileges logic to
getHtmlToDisplayPrivilegesTable

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-31 20:41:12 -03:00
Maurício Meneghini Fauth
b7250665c2 Move some table privileges view logic to template
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-31 15:05:55 -03:00
Maurício Meneghini Fauth
5379ad5f1f Extract HTML from privileges form table
Extracts the HTML from the Server\Privileges::getHtmlToDisplayPrivilegesTable
method to a Twig template.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-31 00:16:32 -03:00
William Desportes
aabd93fc7b
Add ChangeLog entry for e844368b46
Pull-request: #15437
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-31 00:01:51 +02:00
William Desportes
e844368b46
Merge #15437 - Fixed url.php crashing because it's not loading the DatabaseInterface service
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-31 00:00:26 +02:00
Mauro Valvano
319057e33c
Fixed url.php crashing because it was not loading the DatabaseInterface service
Signed-off-by: Mauro Valvano <valvano.m@live.it>
2019-08-30 23:57:53 +02:00
Joshua PowellNishiyama
bed2160e63
Translated using Weblate (Japanese)
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
2019-08-30 02:23:24 +02:00
Joshua PowellNishiyama
ea9bf51ad9
Translated using Weblate (Japanese)
Currently translated at 100.0% (3304 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ja/
Signed-off-by: Joshua PowellNishiyama <nzjpnboy@outlook.com>
2019-08-30 02:23:23 +02:00
Maurício Meneghini Fauth
d19908eab1 Extract global/db specific privs view logic to twig
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-08-29 18:54:56 -03:00
William Desportes
f3bdd3521d
Merge branch 'QA_5_0' into master
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-29 22:43:40 +02:00
William Desportes
2f2c942282
Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-29 22:42:33 +02:00
William Desportes
2345be5c37
Add ChangeLog entries for #15425 and #15380 2019-08-29 22:38:29 +02:00
William Desportes
d1bce912ab
Fix #15380 - Advisor error
Fixes: #15380
Pull-request: #15456

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-29 22:35:47 +02:00
William Desportes
00b93de248
Fix #15425 - Backslash in column name resulting an error in editing
Fixes: #15425
Pull-request: #15455

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-08-29 22:33:38 +02:00