gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,198 Commits 12 Branches 481 Tags 2.4 GiB
90de334dcf
Commit Graph

113198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
90de334dcf Merge branch 'QA_4_8' into STABLE 2018-08-22 09:44:28 -04:00
Isaac Bennetch
9e7fceca66 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:44:10 -04:00
Isaac Bennetch
b838363dc3 Adding composer lock for 4.8.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:36:18 -04:00
Isaac Bennetch
41283ff079 Add PMASA to ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 09:33:14 -04:00
Isaac Bennetch
8bac4a931b Prepare for version 4.8.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 08:49:55 -04:00
Isaac Bennetch
dc45b8aa04 Merge branch 'madhuracj-bug14548' into QA_4_8 2018-08-22 08:43:30 -04:00
Isaac Bennetch
8154e23139 Fix merge conflicts in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-22 08:43:04 -04:00
Maurício Meneghini Fauth
8f3ddd78f8 Add ChangeLog entry for #14581 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-22 01:17:26 -03:00
Victor Alagwu
3fb214ac9e Fix escaped HTML in 'Add a new server' setup (#14585) 
Fixes #14581

Signed-off-by: Victor Alagwu <victoralagwu@gmail.com>
(cherry picked from commit ec4331b7ce)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-22 01:15:04 -03:00
Madhura Jayaratne
00d90b3ae4 Fix #14548 [security] HTML injection in import warning messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-08-18 23:19:58 +10:00
Kristjan Räts
95732c711e
Translated using Weblate (Estonian) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
 2018-08-17 21:36:32 +02:00
Anusuk Sangubon
bd08cdde0a
Translated using Weblate (Thai) 
Currently translated at 29.6% (976 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/th/
Signed-off-by: Anusuk Sangubon <jaideejung007@gmail.com>
 2018-08-17 12:42:05 +02:00
Maurício Meneghini Fauth
b8a4352da0 Add ChangeLog entry for #14426 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-16 03:28:05 -03:00
Aswani Prakash
73b91caa22 drop table issue on copying tables fixed #14426 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit 8fc4d862a8)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-16 03:24:45 -03:00
Maurício Meneghini Fauth
cd6524ae96 Add ChangeLog entry for #14422 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-15 01:23:52 -03:00
Hosted Weblate
66ee2ebca6
Merge branch 'origin/QA_4_8' into Weblate 2018-08-15 06:10:31 +02:00
BO41
0420491c99
Translated using Weblate (German) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/de/
Signed-off-by: BO41 <lukasw41@gmail.com>
 2018-08-15 06:10:30 +02:00
Maurício Meneghini Fauth
ab488b6f5a
Merge pull request #14550 from williamdes/issue-14422-table-comment-bug 
Fixes #14422 - table comment not showing
 2018-08-15 01:10:21 -03:00
Dan Caragea
e1ce250aac
Translated using Weblate (Romanian) 
Currently translated at 96.6% (3177 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Dan Caragea <dan_caragea@yahoo.com>
 2018-08-13 10:41:52 +02:00
popcorner
91b49880d0
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 94.7% (3114 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hant/
Signed-off-by: popcorner <memoword@163.com>
 2018-08-09 20:35:47 +02:00
Florian Knodt
621044ba10
Translated using Weblate (German) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/de/
Signed-off-by: Florian Knodt <git@adlerweb.info>
 2018-08-09 00:38:30 +02:00
Isaac Bennetch
0294bcc5f2 Fix #14554 Icon missing for creating a new routine, trigger, and event 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-07 13:05:37 -04:00
Jack Cherng
d0233a047a Fix PHP 7.3 warning: "continue" in "switch" is equal to "break" 
Signed-off-by: Jack Cherng <jfcherng@gmail.com>
(cherry picked from commit 9a7a1e35b0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-06 20:55:07 -03:00
Isaac Bennetch
8bcbb950dd Add ChangeLog for issue #14552 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-08-06 13:54:14 -04:00
Andy Baugh
c55755d0ca Fix merge conflicts in QA_4_8 from this pull request 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

Fix bad callers to getError where null was being passed.

Fixes #14552: Considering how function signatures work in PHP, this should
be a reltatively 'safe' change, as the mysqli lib currently would still
do a check for cases where the passed in $link was either null or false.
Otherwise the bug's source appears to be a common mistake in PHP:
null != undefined

Signed-off-by: Andy Baugh <thomas.baugh@cpanel.net>
 2018-08-06 13:45:45 -04:00
William Desportes
8a7f2c30ef
Fix getDatabasesFull query 
Execute: $this->dbi->getDatabasesFull("pma_test")
Fixes missing space after alias

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-06 15:15:32 +02:00
William Desportes
b9d0c91350
Fixes #14422 - table comment not showing 
Closes: #14422
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-08-06 15:15:23 +02:00
Lakshay arora
b3017796b7 Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
(cherry picked from commit 91fa051918)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-08-03 17:35:08 -03:00
H Zeng
b1d34e18fb
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: H Zeng <zhx@cnzhx.net>
 2018-08-02 09:35:43 +02:00
popcorner
abcb301752
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
 2018-08-02 09:35:37 +02:00
H Zeng
1059ecb80b
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: H Zeng <zhx@cnzhx.net>
 2018-08-01 09:00:25 +02:00
popcorner
f657785647
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
 2018-08-01 09:00:19 +02:00
ctyzxx
4631c14d18
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: ctyzxx <ctyzxx@126.com>
 2018-08-01 08:59:39 +02:00
popcorner
0d6aa14930
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
 2018-08-01 08:59:33 +02:00
ctyzxx
0741479213
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: ctyzxx <ctyzxx@126.com>
 2018-08-01 08:58:35 +02:00
Lasm Gratel
f27fb7e572
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: Lasm Gratel <lasm_gratel@gmail.com>
 2018-08-01 08:58:30 +02:00
H Zeng
43035e759d
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: H Zeng <zhx@cnzhx.net>
 2018-08-01 08:58:24 +02:00
popcorner
35b9b78dda
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/zh_Hans/
Signed-off-by: popcorner <memoword@163.com>
 2018-08-01 08:58:18 +02:00
Dan Caragea
eab5cb1f4f
Translated using Weblate (Romanian) 
Currently translated at 96.3% (3169 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Dan Caragea <dan_caragea@yahoo.com>
 2018-07-28 18:41:13 +02:00
Wolterhon
b9540c8375
Translated using Weblate (Russian) 
Currently translated at 98.1% (3227 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ru/
Signed-off-by: Wolterhon <hotmottot.1@gmail.com>
 2018-07-27 10:19:36 +02:00
Michal Čihař
6f177817c3
Translated using Weblate (Romanian) 
Currently translated at 96.3% (3168 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-07-27 10:19:33 +02:00
Dan Caragea
bcf0fa3a1b
Translated using Weblate (Romanian) 
Currently translated at 96.3% (3168 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Dan Caragea <dan_caragea@yahoo.com>
 2018-07-27 10:19:33 +02:00
Yaron Shahrabani
b875ad929e
Translated using Weblate (Hebrew) 
Currently translated at 49.3% (1622 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Yaron Shahrabani <sh.yaron@gmail.com>
 2018-07-26 13:48:19 +02:00
Dan Caragea
af5b68d96a
Translated using Weblate (Romanian) 
Currently translated at 92.4% (3039 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Dan Caragea <dan_caragea@yahoo.com>
 2018-07-26 13:46:18 +02:00
Michal Čihař
8490742413
Translated using Weblate (Hebrew) 
Currently translated at 49.3% (1622 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-07-26 13:46:14 +02:00
Raul Molnar
7e10bf1ef7
Translated using Weblate (Romanian) 
Currently translated at 92.1% (3030 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Raul Molnar <molnar.raul@wservices.eu>
 2018-07-26 13:01:32 +02:00
Dan Caragea
dfcfa64e4c
Translated using Weblate (Romanian) 
Currently translated at 92.1% (3030 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Dan Caragea <dan_caragea@yahoo.com>
 2018-07-26 13:01:26 +02:00
Alex
3875624bd2
Translated using Weblate (Romanian) 
Currently translated at 92.1% (3030 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Alex <amihaita@yahoo.com>
 2018-07-26 13:00:32 +02:00
Dan Caragea
6c2f943662
Translated using Weblate (Romanian) 
Currently translated at 92.1% (3030 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Dan Caragea <dan_caragea@yahoo.com>
 2018-07-26 13:00:26 +02:00
Stefan Murariu
fb26e057e6
Translated using Weblate (Romanian) 
Currently translated at 92.1% (3030 of 3288 strings)

[CI skip]

Translation: phpMyAdmin/4.8
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ro/
Signed-off-by: Stefan Murariu <stefan.murariu@yahoo.com>
 2018-07-26 13:00:07 +02:00