Commit Graph

116511 Commits

Author SHA1 Message Date
William Desportes
582a013f35
Merge #15489 - Use onhashchange event instead of polling for hash changes
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 23:03:59 +02:00
William Desportes
163d1e67e9
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 23:00:20 +02:00
William Desportes
2efeb1185d
Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:58:11 +02:00
William Desportes
e95a73ea08
Add ChangeLog entry for #14898
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:48:24 +02:00
William Desportes
db07522491
Fix #14898 - Bottom table in list in left pane blocked by horizontal scroll bar
Fixes: #14898
Pull-request: #15442

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:47:16 +02:00
William Desportes
d9e5414cec
Add ChangeLog entry for #15482
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:26:51 +02:00
William Desportes
99cade4a5d
Fix #15482 - plus sign (+) in the table or database name when configuring foreign keys
Fixes: #15482
Pull-request: #15483

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:25:18 +02:00
William Desportes
21378f8909
Add ChangeLog entry for #15499
Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:22:13 +02:00
William Desportes
9ddca22264
Fix #15499 - Unparenthesized a ? b : c ? d : e is deprecated.
Fixes: #15499
Pull-request: #15503

Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-10-17 22:20:39 +02:00
Maurício Meneghini Fauth
875b7e1b06 Remove custom font-size in Bootstrap theme
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-16 16:25:13 -03:00
Maurício Meneghini Fauth
6f0f7420b0
Merge pull request #15500 from mauriciofauth/bootstrap-theme
Add the Bootstrap theme for phpMyAdmin
2019-10-16 16:20:22 -03:00
Benoit Portrat
5bef2d8e1f
Translated using Weblate (French)
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/fr/
Signed-off-by: Benoit Portrat <benoit.portrat@kwanko.com>
2019-10-16 17:52:40 +02:00
Maurício Meneghini Fauth
87c1133fb1
Merge pull request #15466 from mauriciofauth/entry-points-refactor
Refactor the server databases entry point
2019-10-13 13:34:35 -03:00
Maurício Meneghini Fauth
ddb298bb58 Update po files
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:55:48 -03:00
Maurício Meneghini Fauth
cf031eacff Merge branch 'QA_5_0'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:55:05 -03:00
Maurício Meneghini Fauth
389945bc92 Update po files
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:51:43 -03:00
Maurício Meneghini Fauth
cc50cf178e Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:51:03 -03:00
Kozioł Marcin
1da5dbfb41
Translated using Weblate (Polish)
Currently translated at 96.1% (3202 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pl/
Signed-off-by: Kozioł Marcin <koziol.martin@gmail.com>
2019-10-11 17:43:57 +02:00
Maurício Meneghini Fauth
10cb8e1dfd Update po files
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:35:00 -03:00
Maurício Meneghini Fauth
cf4d6de840 Fix advisor2po script
Related to 88821f8248

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:34:34 -03:00
Kozioł Marcin
70281956bb
Translated using Weblate (Polish)
Currently translated at 98.9% (3269 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pl/
Signed-off-by: Kozioł Marcin <koziol.martin@gmail.com>
2019-10-10 20:28:51 +02:00
Dan Thorpe
39d0b47322 FIX: Unparenthesized a ? b : c ? d : e is deprecated.
Signed-off-by: Dan Thorpe <danthorpe@live.co.uk>
Signed-off-by: Dan Thorpe <dant@linx.net>
2019-10-10 12:50:20 +01:00
Maurício Meneghini Fauth
0581806162 Fix issue with changing pages when browsing foreign
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-09 23:25:50 -03:00
Maurício Meneghini Fauth
5e5d0a1411
Merge pull request #15492 from mauriciofauth/mysqli-prepare
Add initial suport for prepared statements
2019-10-09 21:32:58 -03:00
Maurício Meneghini Fauth
c385995461 Add the Bootstrap theme for phpMyAdmin
Bootstrap theme uses the default styles from Bootstrap and initially
based on the pmahomme theme.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-09 10:47:22 -03:00
Maurício Meneghini Fauth
13e1362f26 Add initial suport for prepared statements
Creates the DbiExtension::prepare method.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-06 11:46:40 -03:00
Maurício Meneghini Fauth
d7bc90fa2c Extract HTML from db and table links line
Server\Privileges::getLinkToDbAndTable

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-05 20:07:38 -03:00
Maurício Meneghini Fauth
cc44bd9e67 Move change login info to user properties template
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-05 16:37:08 -03:00
Maurício Meneghini Fauth
dff5619d53 Move radio fields HTML to the template
... in Server\Privileges::getChangeLoginInformationHtmlForm

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-05 13:48:00 -03:00
Maurício Meneghini Fauth
441a33d1fc Merge branch 'QA_5_0' 2019-10-05 12:10:02 -03:00
Maurício Meneghini Fauth
4bb1a2d80e Fix missing version key on AdvisorControllerTest
Related to 88821f8248

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-05 12:07:04 -03:00
Maurício Meneghini Fauth
dc13e00241 Add conflict on pragmarx/google2fa >=6.1
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
(cherry picked from commit dd5d6d834d)
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-05 11:23:51 -03:00
Maurício Meneghini Fauth
462b139503 Extract HTML from change user login info form
Server\Privileges::getChangeLoginInformationHtmlForm

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-04 21:44:20 -03:00
Tom Atkinson
4ddea61846 Use onhashchange event instead of polling for hash changes
Signed-off-by: Tom Atkinson <atkinson.tommy@nsoft.com>
2019-10-05 00:40:36 +02:00
Maurício Meneghini Fauth
5cc67095fe Extract HTML from new user ajax call
Server\Privileges::getExtraDataForAjaxBehavior

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-03 22:25:40 -03:00
Ненад Генералски
431c954be2
Translated using Weblate (Serbian)
Currently translated at 20.9% (689 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/sr/
Signed-off-by: Ненад Генералски <generalski@mail.ru>
2019-10-02 19:56:03 +02:00
kemist80
adff35ac1c
Translated using Weblate (Hungarian)
Currently translated at 95.9% (3168 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/hu/
Signed-off-by: kemist80 <kemist1980@gmail.com>
2019-10-02 19:55:59 +02:00
Maurício Meneghini Fauth
b075f07b02 Extract method from getAllPrivileges
Extracts specific privilege logic to the getSpecificPrivilege method.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-02 10:17:20 -03:00
Vadim Chernyshev
936314bd7e add encodeURIComponent
Fixes: #15482

Signed-off-by: Vadim Chernyshev <tryfunc@gmail.com>
2019-10-01 13:42:34 +03:00
Maurício Meneghini Fauth
672aee2d8a Create Database\PrivilegesController
Extracts Server\Privileges::getHtmlForSpecificDbPrivileges method to a
controller.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-29 21:09:24 -03:00
Maurício Meneghini Fauth
600079f0f0 Create Table\PrivilegesController
Extract Server\Privileges::getHtmlForSpecificTablePrivileges to a
controller.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-29 16:32:07 -03:00
Maurício Meneghini Fauth
9b36c0116d Extract method to get all db and table privileges
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-29 00:38:48 -03:00
Maurício Meneghini Fauth
2330212d0d Refactor and extract HTML from db privileges page
Server\Privileges::getHtmlForSpecificDbPrivileges

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-28 21:04:24 -03:00
Maurício Meneghini Fauth
860290eef4 Refactor and Extract HTML from table privs page
Server\Privileges::getHtmlForSpecificTablePrivileges

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-28 20:25:01 -03:00
Burak Yavuz
275f36e8f4
Translated using Weblate (Turkish)
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/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
2019-09-28 20:55:46 +02:00
Burak Yavuz
ecd9b08dbb
Translated using Weblate (Turkish)
Currently translated at 100.0% (3331 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
2019-09-28 20:55:46 +02:00
Manuela Silva
acca7b547a
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: Manuela Silva <mmsrs@sky.com>
2019-09-27 18:25:55 +02:00
Maurício Meneghini Fauth
dd5d6d834d Add conflict on pragmarx/google2fa >=6.1
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-25 16:17:20 -03:00
Maurício Meneghini Fauth
b24c2fb7f8 Refactor db and table privileges code
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-25 16:15:17 -03:00
Володимир Бриняк
f9eec90182
Translated using Weblate (Ukrainian)
Currently translated at 99.9% (3303 of 3304 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/uk/
Signed-off-by: Володимир Бриняк <bardvv@gmail.com>
2019-09-23 13:27:47 +02:00