gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,052 Commits 12 Branches 481 Tags 2.4 GiB
9fbe896d48
Commit Graph

107052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
9fbe896d48 Merge remote-tracking branch 'origin/master' 2016-08-30 15:53:52 +02:00
CHINONSO
683bb4ea96 Translated using Weblate (Igbo) 
Currently translated at 0.6% (21 of 3219 strings)

[CI skip]
 2016-08-30 15:53:49 +02:00
Michal Čihař
6f8bb9d0ec Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-08-30 15:53:34 +02:00
Michal Čihař
2148df85f1 Merge branch 'QA_4_6' 2016-08-30 15:53:06 +02:00
Michal Čihař
f3ca367efa Fix number formatting with different settings of precision in PHP 
- fixed Util::formatNumber to avoid rounding issues to mess up display
- force precision = 14 to ensure we get sane behavior

With precision set to higher value many things do not behave as expected
producing strange numbers in various places.

For example with precision=19 you get:

php > echo round(1.2, 2);
1.199999999999999956

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 15:51:18 +02:00
Weblate
c8b6c9e87b Merge remote-tracking branch 'origin/master' 2016-08-30 14:49:13 +02:00
chi-nonso1
9b22a41dd5 Translated using Weblate (Igbo) 
Currently translated at 0.1% (5 of 3219 strings)

[CI skip]
 2016-08-30 14:49:11 +02:00
Michal Čihař
89fc40a1ce Merge branch 'QA_4_6' 2016-08-30 14:48:55 +02:00
Michal Čihař
f3babbb945 Correctly calculate string length 
Fixes #12517

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:48:43 +02:00
Michal Čihař
5c8972563a Merge branch 'QA_4_6' 2016-08-30 14:14:35 +02:00
Michal Čihař
a3d811571a Fix <iframe> tag 
Fixes #12513

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:14:02 +02:00
Michal Čihař
bddb15b0e9 Merge remote-tracking branch 'origin/QA_4_6' 2016-08-30 14:12:44 +02:00
Michal Čihař
c9000876d5 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-08-30 14:12:26 +02:00
Michal Čihař
d25ff1f466 Translated using Weblate (Igbo) 
Currently translated at 0.0% (1 of 3219 strings)

[CI skip]
 2016-08-30 14:10:53 +02:00
Michal Čihař
3e90d32b72 Merge branch 'QA_4_6' 2016-08-30 14:09:07 +02:00
Michal Čihař
d24dd24b75 Ensure unlim_num_rows is numberic 
Fixes #12516

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:08:47 +02:00
Weblate
7563c88c9b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-30 14:05:32 +02:00
Diego Bemquerer Castro
e16af0866d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2987 of 3206 strings)

[CI skip]
 2016-08-30 14:05:31 +02:00
Michal Čihař
563398815d Merge branch 'QA_4_6' 2016-08-30 14:05:12 +02:00
Michal Čihař
ee1878d3ca Extend .gitignore 
Fixes #12515

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:04:55 +02:00
Michal Čihař
52fe0f358d Add Igbo language 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 13:57:09 +02:00
Michal Čihař
7b244494b4 Fix call to Sanitize 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 14:43:05 +02:00
Michal Čihař
89bea5fff1 Move request cleanup to Sanitize class and add tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 13:48:17 +02:00
Michal Čihař
4b1288a564 Correctly handle errors at client side 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 12:35:22 +02:00
Michal Čihař
8d4bfa0d63 Always test all available http request backends 
Issue #12380

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:47:37 +02:00
Michal Čihař
f3869cefd1 Split backends for URL request for easier testing 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:38:58 +02:00
Michal Čihař
47a0b7edd5 Hardcode connection timeout settings 
We anyway used almost same value in all places.

While doing this change, I've also increased the timeout.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:35:52 +02:00
Michal Čihař
506ba670ee Test posting to URL not allowing post 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:33:03 +02:00
Michal Čihař
d343315245 Set User-Agent directly 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:29:50 +02:00
Michal Čihař
5ecc194ebf Fix headers handling 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:27:12 +02:00
Michal Čihař
f8de425d22 Changelog entry for #12465 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:24:33 +02:00
Michal Čihař
5a8666c36a Fix allow_url_fopen request handling 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:45 +02:00
Michal Čihař
438244650e Consistent coding style 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:43 +02:00
Michal Čihař
d52e2cfbbf Move Util::httpRequest tests to UtilTest.php 
Issue #12465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 11:22:25 +02:00
Michal Čihař
a7755dbb64 Merge pull request #12465 from Seldar/master 
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php
 2016-08-29 11:08:12 +02:00
Weblate
fc67d0d67e Merge remote-tracking branch 'origin/master' 2016-08-29 10:15:56 +02:00
Diego Bemquerer Castro
4ce3430810 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.6% (2981 of 3219 strings)

[CI skip]
 2016-08-29 10:15:55 +02:00
Michal Čihař
001aff0e8c Remove no longer valid options 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:15:41 +02:00
Michal Čihař
d239d6cc49 Add link to related configuration directives 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:15:24 +02:00
Michal Čihař
5087fc727a Revert "Remove documentation for Docker PMA_ABSOLUTE_URI" 
This reverts commit c00cc4a15a.
 2016-08-29 10:14:02 +02:00
Volkan Ulukut
be6944d0eb
Fixes #12380 Refactored http requests into one function "httpRequest" in Util.php 
Signed-off-by: Volkan Ulukut <arthan@gmail.com>
 2016-08-29 00:20:38 +03:00
Michal Čihař
44f5b605ae Merge branch 'QA_4_6' 2016-08-28 10:31:28 +02:00
Michal Čihař
38ce0c9d44 Remove unused paramenter when connecting to MySQLi 
Fixes #12502

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:30:32 +02:00
Isaac Bennetch
63600798fd Merge branch 'QA_4_6' 2016-08-27 11:52:13 -04:00
Isaac Bennetch
efe97b1500 Unable to edit transformations, issue 12292 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-27 11:51:37 -04:00
Michal Čihař
b4807f74e8 Merge branch 'QA_4_6' 2016-08-27 09:16:08 +02:00
Michal Čihař
ad5187383d Automatically save SQL query in browser local storage 
..when available rather than in cookie as we do not want to send huge
cookies with SQL query there and back.

Issue #12251
Issue phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 09:15:28 +02:00
Deven Bansod
dd34ca8512 Merge branch 'QA_4_6' 2016-08-26 00:08:02 +05:30
Deven Bansod
d7181d1b5a ChangeLog entries for #12476 and #12477 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:04:19 +05:30
Deven Bansod
b3e7f10f2e Check if the indices are present and map to a string value 
Fix #12477

The indices may not be present in the json_decode result, or might not be strings

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:02:21 +05:30