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

107923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
8c357fab12 Also unset just_one_table while having subquery or having more than or less than 1 tables selected 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:58:05 +05:30
Deven Bansod
3996046254 Merge branch 'QA_4_6' 2016-10-13 10:19:40 +05:30
Deven Bansod
7bc630bf25 ChangeLog entry for #12625 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:18:53 +05:30
Deven Bansod
6b256e89dd Don't set just_one_table to true when JOIN is present in query 
Fix #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 10:17:11 +05:30
Michal Čihař
c365e79470 Do cleanup of simple-math for release as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-12 17:08:19 +02:00
Deven Bansod
5a413ae6df Add tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-12 14:03:57 +05:30
Deven Bansod
eef59d6c48 Fix order of testing DBConnection with different parameters in Config method 
In setup, try to follow what the docs say.
'Password login is still tried first, but as fallback, no password method is tried.'

Fix #12472

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-12 14:03:50 +05:30
Madhura Jayaratne
e0923d54e2 Merge branch 'QA_4_6' into bug12234 2016-10-12 11:44:21 +11:00
Madhura Jayaratne
088d2c36f6 Fix string concatenation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-10-12 09:52:37 +11:00
Michal Čihař
457f5da7f2 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-11 14:30:32 +02:00
Michal Čihař
8980730d3a Fold theme sprites code into Theme.php 
There is no good reason to have this separate.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-11 14:04:19 +02:00
Michal Čihař
5779005049 Merge branch 'QA_4_6' 2016-10-11 13:17:02 +02:00
Michal Čihař
d5028e445a Remove non working todofy badge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-11 13:16:22 +02:00
Deven Bansod
b6f76a84ac Merge branch 'QA_4_6' 
Conflicts:
	po/ia.po
 2016-10-11 12:15:09 +05:30
Deven Bansod
3166e8c0f2 Use values from request parameter url_param only if it is an array 
Fix #12350

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-11 12:14:10 +05:30
Weblate
1bd6d13847 Merge remote-tracking branch 'origin/master' 2016-10-11 08:16:11 +02:00
Deven Bansod
31221e666c Merge branch 'QA_4_6' 
Conflicts:
	libraries/replication.inc.php
 2016-10-11 11:47:59 +05:30
Giovanni Sora
6f2de06884 Translated using Weblate (Interlingua) 
Currently translated at 74.0% (2385 of 3219 strings)

[CI skip]
 2016-10-11 08:16:09 +02:00
Deven Bansod
593cbd271f Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-11 11:45:23 +05:30
Deven Bansod
2fdb15c36e Replace call to an old and unavailable function 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-11 11:44:26 +05:30
Weblate
5fa394b12b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-11 08:13:35 +02:00
Giovanni Sora
88f0b6c99d Translated using Weblate (Interlingua) 
Currently translated at 73.9% (2371 of 3206 strings)

[CI skip]
 2016-10-11 08:13:33 +02:00
Michal Čihař
8ee14c065a Merge branch 'QA_4_6' 2016-10-10 21:33:30 +02:00
Michal Čihař
5ded636281 Translated using Weblate (Vietnamese) 
Currently translated at 86.3% (2768 of 3206 strings)

[CI skip]
 2016-10-10 21:33:04 +02:00
Michal Čihař
489e3b5a9a Translated using Weblate (Tamil) 
Currently translated at 34.2% (1098 of 3206 strings)

[CI skip]
 2016-10-10 21:33:03 +02:00
Bogdan Ciobaca
cf4a1a9ee2 Translated using Weblate (Romanian) 
Currently translated at 53.8% (1727 of 3206 strings)

[CI skip]
 2016-10-10 21:33:03 +02:00
Michal Čihař
2fa52f06b9 Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1724 of 3206 strings)

[CI skip]
 2016-10-10 21:33:03 +02:00
Michal Čihař
521e087cec Translated using Weblate (Kurdish Sorani) 
Currently translated at 31.7% (1017 of 3206 strings)

[CI skip]
 2016-10-10 21:33:02 +02:00
Arie Kurniawan
f31699970f Translated using Weblate (Indonesian) 
Currently translated at 69.5% (2231 of 3206 strings)

[CI skip]

Correcting translate
 2016-10-10 21:33:02 +02:00
Michal Čihař
e394ca84a4 Translated using Weblate (Danish) 
Currently translated at 92.0% (2952 of 3206 strings)

[CI skip]
 2016-10-10 21:33:01 +02:00
Michal Čihař
fc0e6cc095 Remove extra whitespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-10 21:32:50 +02:00
Michal Čihař
ee65863066 Translated using Weblate (Vietnamese) 
Currently translated at 85.7% (2759 of 3219 strings)

[CI skip]
 2016-10-10 21:31:48 +02:00
Michal Čihař
bd03eae9ae Translated using Weblate (Tamil) 
Currently translated at 34.0% (1095 of 3219 strings)

[CI skip]
 2016-10-10 21:31:47 +02:00
Bogdan Ciobaca
009ffe1433 Translated using Weblate (Romanian) 
Currently translated at 53.5% (1723 of 3219 strings)

[CI skip]
 2016-10-10 21:31:47 +02:00
Michal Čihař
a3423f1af1 Translated using Weblate (Portuguese) 
Currently translated at 53.4% (1722 of 3219 strings)

[CI skip]
 2016-10-10 21:31:47 +02:00
Michal Čihař
7efe9f95af Translated using Weblate (Kurdish Sorani) 
Currently translated at 31.6% (1020 of 3219 strings)

[CI skip]
 2016-10-10 21:31:46 +02:00
Michal Čihař
f0c490ac17 Translated using Weblate (Danish) 
Currently translated at 91.4% (2943 of 3219 strings)

[CI skip]
 2016-10-10 21:31:45 +02:00
Weblate
769be0ef36 Merge remote-tracking branch 'origin/master' 2016-10-10 19:36:21 +02:00
Bogdan Ciobaca
c92ff408f3 Translated using Weblate (Romanian) 
Currently translated at 52.6% (1696 of 3219 strings)

[CI skip]
 2016-10-10 19:36:20 +02:00
Michal Čihař
e6abff8a7f Be consistent in filename sanitization 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-10 17:20:13 +02:00
Arie Kurniawan
c5ee14716b Translated using Weblate (Indonesian) 
Currently translated at 69.2% (2228 of 3219 strings)

[CI skip]
 2016-10-10 17:20:01 +02:00
Madhura Jayaratne
ba50cbb91c Fix bug #12234 No page indicator in view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-10-10 10:27:50 +11:00
Deven Bansod
85b904cec4 Merge branch 'QA_4_6' 
Conflicts:
	po/ar.po
	po/ckb.po
	po/ko.po
 2016-10-10 01:21:50 +05:30
Deven Bansod
c455a5cf8f Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-10 01:20:34 +05:30
Deven Bansod
afa6e3b85e Initialize newly added Textareas with default values 
Actually default values for textareas are blanks.

Fix #12624

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-10 01:18:50 +05:30
Ranja Hseen
c9251735f3 Translated using Weblate (Kurdish Sorani) 
Currently translated at 17.9% (578 of 3219 strings)

[CI skip]
 2016-10-09 12:18:43 +02:00
Ranja Hseen
fd31ed27e0 Translated using Weblate (Kurdish Sorani) 
Currently translated at 18.0% (580 of 3206 strings)

[CI skip]
 2016-10-09 12:14:38 +02:00
Deven Bansod
0b355b7446 Add tests for generation of Field spec with TIMESTAMP with precision 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-08 13:11:42 +05:30
Deven Bansod
4f023ac86a Allow for precision specification in TIMESTAMP datatype while editing/adding a column 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-08 13:11:36 +05:30
Weblate
e376794aba Merge remote-tracking branch 'origin/master' 2016-10-08 09:40:24 +02:00