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

107068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
68012b0ab4 Merge remote-tracking branch 'origin/master' 2016-09-02 08:59:52 +02:00
Deven Bansod
33f97474b2 Add token parameter POST requests in indexes.js, navigation.js 
Issue #12523

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 12:31:34 +05:30
CHINONSO
9a943d464d Translated using Weblate (Igbo) 
Currently translated at 2.3% (76 of 3219 strings)

[CI skip]

Gbasara ohere Reference System nchọpụta
 2016-09-02 08:59:50 +02:00
Deven Bansod
d46a5f5863 Check if '@' exists before exploding over it and assuming it exists always 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-02 11:55:05 +05:30
CHINONSO
a8945a7b43 Translated using Weblate (Igbo) 
Currently translated at 1.4% (46 of 3219 strings)

[CI skip]
 2016-09-01 19:10:52 +02:00
Deven Bansod
df19f9e17a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2016-09-01 18:41:27 +05:30
Deven Bansod
eb27081a50 Use appropriate name 'params' instead of 'data' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 18:16:29 +05:30
Deven Bansod
9bae7ddc74 Use appropirate name 'params' instead of 'data' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 14:41:24 +05:30
Deven Bansod
18dbcba02d Fix 'Token mismatch' in deleting tracking from db_tracking 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 14:36:18 +05:30
Weblate
c9524984f7 Merge remote-tracking branch 'origin/master' 2016-09-01 08:58:07 +02:00
Deven Bansod
917d9581b7 Fix 'Token mismatch' in drop and truncating a table from db_structure 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 12:30:49 +05:30
Jozef Pistej
31676321c6 Translated using Weblate (Slovak) 
Currently translated at 82.8% (2668 of 3219 strings)

[CI skip]
 2016-09-01 08:58:06 +02:00
Deven Bansod
8d65036a09 Fix 'Token mismatch' in db_search 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 12:21:35 +05:30
Deven Bansod
a40a948d26 Fix 'Token mismatch' in Drop Database 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 11:59:05 +05:30
Deven Bansod
51c04bcaec Remove unneeded debugging statements 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-01 11:45:34 +05:30
Michal Čihař
f4d37041b8 Translated using Weblate (Igbo) 
Currently translated at 0.6% (21 of 3219 strings)

[CI skip]
 2016-08-30 16:12:11 +02:00
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