gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,476 Commits 12 Branches 481 Tags 2.4 GiB
cc44bd9e67
Commit Graph

116476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Володимир Бриняк
b6e16888e5
Translated using Weblate (Ukrainian) 
Currently translated at 99.0% (3298 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/uk/
Signed-off-by: Володимир Бриняк <bardvv@gmail.com>
 2019-09-23 13:27:47 +02:00
William Desportes
d33122867f
Merge branch 'QA_5_0' into master 2019-09-22 20:14:45 +02:00
William Desportes
bbf94a7f40
Merge branch 'QA_4_9' into QA_5_0 
Pull-request: #15457
Closes: #15457
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 20:13:09 +02:00
William Desportes
614468f905
Add ChangeLog entry for #14245 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 20:07:47 +02:00
William Desportes
88821f8248
Fix #14245 - mysql 8.0.3 and above fails on advisor 
Fixes: #14245
Pull-request: #15461
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 20:07:22 +02:00
William Desportes
f1f4860043
Merge branch 'QA_5_0' into 'master' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:58:28 +02:00
William Desportes
adbaf63551
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:57:48 +02:00
William Desportes
9a77826c2f
Add ChangeLog entry for #14804 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:32:23 +02:00
William Desportes
9a6a66b9f4
Fix #14804 - Undefined index: ssl_* variables 
Fixes: #14804

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:30:58 +02:00
William Desportes
b5b1488bd6
Add ChangeLog entry for #15304 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:06:02 +02:00
William Desportes
eb525891ce
Fix #15304 - ssl_use php error 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-22 18:03:41 +02:00
Maurício Meneghini Fauth
03b0c0c336 Extract HTML from routine based privileges 
Server\Privileges::getHtmlTableBodyForSpecificDbRoutinePrivs

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-22 11:38:54 -03:00
Maurício Meneghini Fauth
6ea135a0d0 Merge branch 'QA_5_0' 2019-09-21 17:31:48 -03:00
Maurício Meneghini Fauth
3e330fd403 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 17:30:44 -03:00
Maurício Meneghini Fauth
0a8fc4446b Fix some invalid array accesses with PHP 7.4 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 17:22:52 -03:00
Maurício Meneghini Fauth
e222cb8beb Merge branch 'QA_5_0' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 13:02:14 -03:00
Maurício Meneghini Fauth
08696bc55e Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-21 12:51:04 -03:00
Isaac Bennetch
806a880be6 Prepare for 4.9.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-21 00:07:20 -04:00
Isaac Bennetch
249c34d1ef Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 23:57:27 -04:00
Isaac Bennetch
a00f23711e Adding composer lock for 4.9.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 23:54:54 -04:00
Isaac Bennetch
a9329ec767 Prepare for version 4.9.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 18:22:47 -04:00
Isaac Bennetch
7d21d4223b Add ChangeLog entries for: 
* 427fbed55d
* 6e1bbc54c2

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 18:02:38 -04:00
Isaac Bennetch
9c14df7ec7 Merge remote-tracking branch 'security/security/278' into QA_4_9 2019-09-20 18:02:06 -04:00
Isaac Bennetch
0de99c89e1 Merge remote-tracking branch 'security/security/279' into QA_4_9 2019-09-20 17:42:30 -04:00
Isaac Bennetch
a79688da11 Merge branch 'QA_5_0' 2019-09-20 16:30:33 -04:00
Isaac Bennetch
725f407305 Merge branch 'QA_4_9' into QA_5_0 2019-09-20 16:28:24 -04:00
Isaac Bennetch
25a7c7abdb Fix merge confliects 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 16:24:04 -04:00
Isaac Bennetch
7a6827ff11 Merge commit '7a809b7adc' into QA_5_0 2019-09-20 16:19:13 -04:00
William Desportes
988e644c08
Fix texts where not truncated anymore 
Introduced-by-pull-request: #15414

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-19 23:41:13 +02:00
William Desportes
1859f8afc0
Upgrade tcpdf to 6.3.x 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-19 22:24:32 +02:00
Maurício Meneghini Fauth
427fbed55d Require POST method to delete servers in Setup 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-09-18 22:40:32 -03:00
Tailing Yuan
66fcd51495
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.6% (3318 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: Tailing Yuan <yuantailing@gmail.com>
 2019-09-18 20:27:54 +02:00
Huang Zhiyi
f54d99208d
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.6% (3318 of 3331 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/zh_Hans/
Signed-off-by: Huang Zhiyi <hzy980512@126.com>
 2019-09-18 20:27:53 +02:00