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

118032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hosted Weblate
e84e63afe9
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/
 2020-03-25 19:20:57 +01:00
Olivier Humbert
b3d6b6ea9a
Translated using Weblate (French) 
Currently translated at 100.0% (3351 of 3351 strings)

[CI skip]

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

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2020-03-25 19:20:50 +01:00
Maurício Meneghini Fauth
aff49709a4 Replace fieldset with card in view operations page 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-03-25 15:19:43 -03:00
Maurício Meneghini Fauth
db5baa9cee Replace fieldset with cards for table operations page 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-03-25 02:49:57 -03:00
William Desportes
bf20f1ff24
Update po files 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-24 23:10:29 +01:00
William Desportes
1d60e16526
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-24 23:07:52 +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
d35f7ccfce
Exclude twig-templates temporary folder from phpstan analyse 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-24 23:03:07 +01:00
William Desportes
34b9278265
Exclude twig-templates temporary folder and *.twig files from phpcs 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-24 23:00:46 +01:00
William Desportes
191a0a06ec
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-03-24 22:53:35 +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
152058edb0
Merge branch 'origin/master' into Weblate. 
[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/
 2020-03-24 09:46:21 +01:00
Burak Yavuz
4bbc5baec0
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3349 of 3349 strings)

[CI skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/
Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com>
 2020-03-24 09:46:19 +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
d6ddfe77aa Merge branch 'QA_5_0' 2020-03-22 22:47:09 -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
de1d1002f3 Merge remote-tracking branch 'origin/master' 2020-03-21 00:24:21 -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
Maurício Meneghini Fauth
f705e32a47 Replace fieldset with cards for db operations page 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-03-21 00:38:50 -03:00
Isaac Bennetch
98f761a245 Merge branch 'QA_5_0' 2020-03-20 23:04:06 -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
6efdd77483 Merge branch 'QA_5_0' 2020-03-20 22:50:16 -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
c6321ae552 Merge branch 'QA_5_0' 2020-03-20 20:30:54 -04:00
Isaac Bennetch
ef734c3c81 Merge branch 'QA_4_9' into QA_5_0 2020-03-20 20:30:33 -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