gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,639 Commits 12 Branches 481 Tags 2.4 GiB
33965a7a72
Commit Graph

119639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
33965a7a72
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:57:00 +02:00
William Desportes
e9533de88f
Fix HyperFIDO product link 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:54:39 +02:00
William Desportes
682e17e9f3
Merge branch 'QA_5_0' 2020-10-11 18:18:30 +02:00
William Desportes
0d9882961f
#16382 - Remove APC from PHP documentation 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:17:31 +02:00
William Desportes
777dcb2e60
Fix coding standard issues 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:13:35 +02:00
William Desportes
960e3889c7
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:06:50 +02:00
William Desportes
71ceacb79b
Fix a coding standard issue 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:02:27 +02:00
William Desportes
01d8979136
Merge branch 'QA_5_0' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:00:06 +02:00
William Desportes
34a8dfb6b1
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 17:56:52 +02:00
William Desportes
7813f8f2b2
Remove Doctum config files on releases 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 17:45:40 +02:00
William Desportes
b5654b02df
Fix failing tests 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 17:36:59 +02:00
Maurício Meneghini Fauth
ac9bccf67d Replace $GLOBALS['dbi'] with global $dbi 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-11 09:24:21 -03:00
Maurício Meneghini Fauth
fbaa1a946e Remove DBI mock from ImportTest 
Uses the DBI stub instead.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-11 09:09:42 -03:00
Domen
ee1c54529e
Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3352 of 3352 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/
Signed-off-by: Domen <mitenem@outlook.com>
 2020-10-10 21:23:57 +02:00
William Desportes
e0183c6f4d
Translated using Weblate (French) 
Currently translated at 100.0% (3352 of 3352 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/fr/
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-10 21:23:56 +02:00
Burak Yavuz
8886c89017
Translated using Weblate (Turkish) 
Currently translated at 100.0% (3352 of 3352 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-10-10 21:23:55 +02:00
Maurício Meneghini Fauth
58d784f832 Update po files 
[ci skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 14:18:45 -03:00
Maurício Meneghini Fauth
405b6277e7 Merge branch 'QA_5_0' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 14:16:25 -03:00
Maurício Meneghini Fauth
62a40f9363 Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 13:41:39 -03:00
Maurício Meneghini Fauth
06e70795d3 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 13:41:08 -03:00
Maurício Meneghini Fauth
1a5e045045 Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 13:32:13 -03:00
Maurício Meneghini Fauth
9ac1dfb611 Prepare for 4.9.7-dev 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 13:30:38 -03:00
Maurício Meneghini Fauth
e0e2b386fb Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 12:56:24 -03:00
Kristjan Räts
f025985337
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-10-10 17:54:35 +02:00
P
1ccfa603c4
Translated using Weblate (Bulgarian) 
Currently translated at 59.1% (1973 of 3334 strings)

[CI skip]

Translation: phpMyAdmin/5.0
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/bg/
Signed-off-by: P <plamen_mbx@yahoo.com>
 2020-10-10 17:54:34 +02:00
Kristjan Räts
c776fdee17
Translated using Weblate (Estonian) 
Currently translated at 100.0% (3351 of 3351 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
 2020-10-10 17:54:33 +02:00
P
0deb8c4b94
Translated using Weblate (Bulgarian) 
Currently translated at 56.4% (1892 of 3351 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/bg/
Signed-off-by: P <plamen_mbx@yahoo.com>
 2020-10-10 17:54:32 +02:00
Alvin Lazar.C
9bf740c59e
Translated using Weblate (Malayalam) 
Currently translated at 1.7% (59 of 3351 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ml/
Signed-off-by: Alvin Lazar.C <alvinlaz96@yahoo.com>
 2020-10-10 17:54:31 +02:00
Petr Duda
adc60ff306
Translated using Weblate (Czech) 
Currently translated at 100.0% (3351 of 3351 strings)

[ci skip]

Translation: phpMyAdmin/Development
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/cs/
Signed-off-by: Petr Duda <petrduda@seznam.cz>
 2020-10-10 17:54:30 +02:00
Kristjan Räts
e1da2278ed
Translated using Weblate (Estonian) 
Currently translated at 100.0% (3309 of 3309 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/et/
Signed-off-by: Kristjan Räts <kristjanrats@gmail.com>
 2020-10-10 17:54:29 +02:00
Petr Duda
439a8cd4b7
Translated using Weblate (Czech) 
Currently translated at 100.0% (3309 of 3309 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/cs/
Signed-off-by: Petr Duda <petrduda@seznam.cz>
 2020-10-10 17:54:29 +02:00
Maurício Meneghini Fauth
9a9c4525f4 Add js/dist/ to .gitignore 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-10 12:52:32 -03:00
Petr Duda
e0e40a9e4c
Translated using Weblate (Czech) 
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/cs/
Signed-off-by: Petr Duda <petrduda@seznam.cz>
 2020-10-10 07:01:26 +02:00
Isaac Bennetch
1564d94a99 Prepare for 5.0.4-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 23:52:57 -04:00
Isaac Bennetch
258ca97679 Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 23:20:35 -04:00
Isaac Bennetch
3c9ad0a174 Adding composer lock for 5.0.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 23:17:47 -04:00
Isaac Bennetch
4ddd53f26c Removing composer.lock 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 23:05:08 -04:00
Isaac Bennetch
92ead328f2 Adding composer lock for 4.9.6 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 23:02:07 -04:00
Isaac Bennetch
c496ececa3 Prepare for 5.0.3 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 22:35:18 -04:00
Maurício Meneghini Fauth
52cc669cac Remove dbi mock from TrackingTest 
Uses DbiDummy stub instead.

Related to https://github.com/phpmyadmin/phpmyadmin/issues/16332.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2020-10-09 23:33:47 -03:00
Isaac Bennetch
1c35d42eee Merge QA_4_9 to QA_5_0 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 22:33:17 -04:00
Isaac Bennetch
affac0b5e6 Merge commit '1100bb6a4c' into QA_5_0 2020-10-09 22:22:01 -04:00
Isaac Bennetch
04f83e9019 Merge commit 'de691ae33c' into QA_5_0 2020-10-09 22:21:00 -04:00
Isaac Bennetch
b733f43877 Merge commit 'b47a5d992d' into QA_5_0 2020-10-09 22:20:47 -04:00
Isaac Bennetch
d7004ef436 Merge commit 'deb2dce644' into QA_5_0 2020-10-09 22:20:36 -04:00
Isaac Bennetch
5a59ccfb9e Merge commit 'bdc28f20f4' into QA_5_0 2020-10-09 22:20:20 -04:00
Isaac Bennetch
014f769718 Fix more merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 22:19:46 -04:00
Isaac Bennetch
93c93bc9ee Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 22:14:49 -04:00
Isaac Bennetch
1ef607e887 Prepare for 4.9.6 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2020-10-09 21:36:34 -04:00
Isaac Bennetch
1100bb6a4c Merge remote-tracking branch 'security/QA_4_9-security' into QA_4_9 2020-10-09 21:32:47 -04:00