gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,480 Commits 12 Branches 481 Tags 2.4 GiB
711095d4cc
Commit Graph

117480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes
711095d4cc
Merge #16391 - Fix #16326 - Latitude and Longitudes swap for geometries in edit mode 
Fixes: #16326
Pull-request: #16391

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-13 13:46:24 +02:00
Saksham Gupta
280188f1fb
Fix #16326 - Latitude and Longitudes swap 
Fixes: #16326

Signed-off-by: Saksham Gupta <shucon01@gmail.com>
 2020-10-13 13:38:28 +02:00
William Desportes
0f0dc09dee
#16326 - Add tests for Util::asWKT 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-12 11:48:03 +02:00
P
96f151330f
Translated using Weblate (Bulgarian) 
Currently translated at 60.1% (2004 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-12 10:26:10 +02:00
William Desportes
463f2a0cc5
Add some style to the reset Zoom button 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:36:52 +02:00
William Desportes
81e64f0402
Add a ChangeLog entry for #16245 and 7c091b6177 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:35:05 +02:00
William Desportes
7c091b6177
Fix a PHP error when reporting a particular JS error 
"Fatal error: Uncaught TypeError: PhpMyAdmin\ErrorReport::translateStacktrace(): Argument
#1 ($stack) must be of type array, null given, called in libraries/classes/ErrorReport.php on line 116 and defined in libraries/classes/ErrorReport.php:256
Stack trace:
#0 libraries/classes/ErrorReport.php(116): PhpMyAdmin\ErrorReport->translateStacktrace(NULL)
#1 libraries/classes/ErrorReport.php(78): PhpMyAdmin\ErrorReport->getData()
#2 libraries/classes/ErrorReport.php(282): PhpMyAdmin\ErrorReport->getPrettyData()
#3 error_report.php(136): PhpMyAdmin\ErrorReport->getForm()
#4 {main} thrown in libraries/classes/ErrorReport.php on line 256"

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:33:56 +02:00
William Desportes
c87576f44c
Merge #16384 - Fix #16245 - Failed Zoom search clears existing values 
Pull-request: #16384
Fixes: #16245

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:31:25 +02:00
William Desportes
abe46bef1d
Fix po files mistake from 224a9ce4a8 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:10:55 +02:00
William Desportes
ee538e3d0c
Trim whitespaces on jquery.sortableTable.js and add a copyright line 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:09:38 +02:00
William Desportes
224a9ce4a8
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 21:04:22 +02:00
Kyotaro Iijima
b4bb373f0b
Translated using Weblate (Japanese) 
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/ja/
Signed-off-by: Kyotaro Iijima <kyotaro.eyes@gmail.com>
 2020-10-11 19:09:28 +02:00
P
cc925ae416
Translated using Weblate (Bulgarian) 
Currently translated at 59.9% (2000 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-11 19:09:27 +02:00
Kyotaro Iijima
9fcac75729
Translated using Weblate (Japanese) 
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/ja/
Signed-off-by: Kyotaro Iijima <kyotaro.eyes@gmail.com>
 2020-10-11 19:09:19 +02:00
P
c618af03bc
Translated using Weblate (Bulgarian) 
Currently translated at 60.5% (2005 of 3309 strings)

[CI skip]

Translation: phpMyAdmin/4.9
Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/bg/
Signed-off-by: P <plamen_mbx@yahoo.com>
 2020-10-11 19:09:19 +02:00
William Desportes
1fcb62e563
Flag 32 bit incompatible tests 
Group:  32bit-incompatible

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 19:05:14 +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
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
71ceacb79b
Fix a coding standard issue 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2020-10-11 18:02:27 +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
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
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
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
Petr Duda
7c7d66f3ae
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-09 23:07:24 +02:00