Commit Graph

116942 Commits

Author SHA1 Message Date
dingo thirteen
62e7296434
Translated using Weblate (Dutch)
Currently translated at 100.0% (3334 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/nl/
Signed-off-by: dingo thirteen <dingo13@d404.nl>
2020-03-30 08:26:41 +02:00
Kristjan Räts
b481f2ab9a
Translated using Weblate (Estonian)
Currently translated at 100.0% (3334 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
2020-03-30 08:26:41 +02:00
Maurício Meneghini Fauth
22ee68b163
Fix Display\ResultsTest test on Windows
Cherry-picked-from: b2d1615176

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-03-28 11:37:04 +01:00
Domen
728a55b668
Translated using Weblate (Slovenian)
Currently translated at 100.0% (3334 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/sl/
Signed-off-by: Domen <mitenem@outlook.com>
2020-03-27 23:46:41 +01:00
Olivier Humbert
4465fd20b8
Translated using Weblate (French)
Currently translated at 100.0% (3334 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/
Signed-off-by: Olivier Humbert <trebmuh@tuxfamily.org>
2020-03-25 19:20:48 +01:00
Burak Yavuz
d52a900bc3
Translated using Weblate (Turkish)
Currently translated at 100.0% (3334 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
2020-03-25 19:20:47 +01:00
William Desportes
eebc8a973a
Merge 'QA_4_9' into QA_5_0
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-24 23:06:42 +01:00
William Desportes
8be7d11225
Update po files
[CI skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-24 23:04:38 +01:00
William Desportes
e54a217a21
Add ChangeLog entry for #15983
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-24 22:51:02 +01:00
William Desportes
7fd0187dbd
Merge #16040 - fix #15983 - require twig ^2.9
Pull-request: #16040
Fixes: #15983

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-24 22:49:59 +01:00
Matthias Blümel
33f091a389
fix #15983 - require twig ^2.9
this is necessary for the 'apply' tag which came in 2.9 and 1.40

See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954766
See: https://salsa.debian.org/phpmyadmin-team/phpmyadmin/issues/43
Signed-Off-By: Matthias Blümel <blaimi@blaimi.de>
2020-03-24 22:47:56 +01:00
Hara Desu
6e69ccb632
Translated using Weblate (Indonesian)
Currently translated at 79.4% (2647 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/id/
Signed-off-by: Hara Desu <aqjbgr09@gmail.com>
2020-03-24 17:44:36 +01:00
anonymous
dae35cbcb1
Translated using Weblate (Indonesian)
Currently translated at 79.4% (2647 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/id/
Signed-off-by: anonymous <noreply@weblate.org>
2020-03-24 14:54:22 +01:00
Hara Desu
2a0dff09ab
Translated using Weblate (Indonesian)
Currently translated at 79.4% (2647 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/id/
Signed-off-by: Hara Desu <aqjbgr09@gmail.com>
2020-03-24 14:54:22 +01:00
Hosted Weblate
11efa7de48
Merge branch 'origin/QA_5_0' into Weblate.
[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/
2020-03-23 21:53:07 +01:00
Burak Yavuz
00b1852470
Translated using Weblate (Turkish)
Currently translated at 100.0% (3332 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
2020-03-23 21:53:01 +01:00
Burak Yavuz
941122a7ef
Translated using Weblate (Turkish)
Currently translated at 100.0% (3307 of 3307 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>
2020-03-23 21:52:54 +01:00
Isaac Bennetch
095cb4d5a2 Fix phpcs test errors
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-22 23:08:22 -04:00
Ian Gilfillan
07772d8549 Fix typo on requirements doc page
Signed-off-by: Ian Gilfillan <github@greenman.co.za>
2020-03-22 22:48:32 -04:00
Isaac Bennetch
00ec06e4af Prepare for version 5.0.3-dev
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-21 00:39:02 -04:00
Isaac Bennetch
c746c0a074 Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-21 00:20:15 -04:00
Isaac Bennetch
4520c9d172 Adding composer lock for 5.0.2
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-21 00:17:30 -04:00
Isaac Bennetch
b2fc6760f7 Removing composer.lock
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-21 00:10:18 -04:00
Isaac Bennetch
1651d674d6 Adding composer lock for 4.9.5
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-21 00:07:58 -04:00
Isaac Bennetch
6f698b87b3 Fix tests for phpunit 9
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-20 23:02:44 -04:00
Isaac Bennetch
8c847c55ca Merge branch 'QA_4_9' into QA_5_0 2020-03-20 23:01:53 -04:00
Isaac Bennetch
3133be3e82 Prepare for 5.0.2
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-20 23:01:37 -04:00
Isaac Bennetch
2ee7e9840f Fix transformation test
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-20 23:00:57 -04:00
Isaac Bennetch
f98618a77c Merge branch 'QA_4_9' into QA_5_0 2020-03-20 22:12:50 -04:00
Isaac Bennetch
28a79c9d09 Prepare for version 4.9.5
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-20 22:02:51 -04:00
Isaac Bennetch
0d4c7c66a5 Merge branch 'QA_4_9' into QA_5_0 2020-03-20 22:01:14 -04:00
Isaac Bennetch
0f9fff3846 Merge remote-tracking branch 'origin/QA_4_9' into QA_5_0 2020-03-20 21:50:45 -04:00
Isaac Bennetch
10c9709f7d Merge branch 'QA_4_9-security' into QA_4_9 2020-03-20 20:31:11 -04:00
Isaac Bennetch
d193fdc31b ChangeLog for 4.9.5
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-20 20:27:36 -04:00
Isaac Bennetch
1aee403733
Merge pull request #307 from phpmyadmin/security/302
Fix External Transformation RCE
2020-03-20 19:07:35 -04:00
Isaac Bennetch
163f05cac1 Improve warning message for external transformation
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-20 18:58:15 -04:00
Isaac Bennetch
155f3b2b41
Merge pull request #297 from phpmyadmin/security/296
SQL Injection in SearchController
2020-03-20 18:21:05 -04:00
Isaac Bennetch
9ce61ea0e5
Merge pull request #306 from phpmyadmin/security/295
Fix SQL Injection and Data Extraction with XS-Search
2020-03-19 22:38:27 -04:00
Isaac Bennetch
1a1f00bad4 Corrected documentation for External Transformation
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2020-03-19 22:34:35 -04:00
William Desportes
307717bc49
Add ChangeLog entry for #15224
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-20 00:17:30 +01:00
William Desportes
646f83cbfd
Merge #16026 - Fixes #15224 - Don't fire keyboard shortcuts while SQL query area is focused
Pull-request: #16026
Fixes #15224

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-20 00:16:03 +01:00
William Desportes
bc982466f0
Add ChangeLog entry for #15898
Ref: e1f5dfcd16
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 23:21:58 +01:00
William Desportes
e1f5dfcd16
Merge #16004 - Fix #15898 - escape tbl_storage_engine argument
Pull-request: #16004
Fixes: #15898
Security: ca42395ee4
Ref: https://github.com/phpmyadmin/phpmyadmin/pull/16004
Ref: https://github.com/phpmyadmin/phpmyadmin/issues/15898
For now I do not have a CVE code for this one.
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 23:21:33 +01:00
William Desportes
abcf875ae2
Merge #16034 - Fix #16033 Remove composer bin files
Pull-request: #16034
Fixes: #16033
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 23:17:16 +01:00
William Desportes
ab43e7a4a1
Add ChangeLog entry for #16033
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 21:59:54 +01:00
William Desportes
166938b318
Fix #16033 - remove bin files from non source version of phpMyAdmin
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 21:58:38 +01:00
Isaac Bennetch
51d54d62bb
Merge pull request #310 from phpmyadmin/298
Another instance to escape username and password when changing password
2020-03-19 09:58:40 -04:00
yagoub fadel
2cd86fa308
Translated using Weblate (Arabic)
Currently translated at 49.3% (1643 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
2020-03-19 12:36:43 +01:00
William Desportes
7035cb978a
Translated using Weblate (Arabic)
Currently translated at 49.3% (1643 of 3332 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/ar/
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 12:36:43 +01:00
yagoub fadel
f8035a7c62
Translated using Weblate (Arabic)
Currently translated at 49.5% (1639 of 3307 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ar/
Signed-off-by: yagoub fadel <yagoub76@gmail.com>
2020-03-19 12:36:27 +01:00