gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,035 Commits 12 Branches 481 Tags 2.4 GiB
307dd63354
Commit Graph

106035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
307dd63354 ChangeLog entry for #12472 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:13:25 +02:00
Michal Čihař
6a4cf7b1ec Merge pull request #12631 from devenbansod/fix_12472 
Fix order of testing DBConnection with different parameters in Config method
 2016-10-17 17:12:40 +02:00
Michal Čihař
d47956461f Merge remote-tracking branch 'origin/pull/12616' into QA_4_6 2016-10-17 17:02:25 +02:00
Michal Čihař
d6680545ff ChangeLog entry for #12632 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-17 17:00:42 +02:00
Weblate
0b59c6283e Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 16:59:52 +02:00
SDSkyKlouD
eebe1471b7 Translated using Weblate (Korean) 
Currently translated at 79.7% (2558 of 3206 strings)

[CI skip]
 2016-10-17 16:59:51 +02:00
Michal Čihař
57451f31c8 Merge pull request #12632 from devenbansod/fix_12366 
Use IDENTIFIED BY 'auth_string' if password check plugin is active
 2016-10-17 16:59:43 +02:00
Deven Bansod
25ee53c183 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-17 13:40:25 +05:30
Deven Bansod
f9ed7a5054 ChangeLog for #12639 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-17 13:39:11 +05:30
Deven Bansod
334910216e Check if the function actually has arguments or not 
Fix #12639

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-17 13:36:09 +05:30
Weblate
d37af63415 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-17 10:05:19 +02:00
Zulfikar
61ec405c16 Translated using Weblate (Indonesian) 
Currently translated at 69.6% (2232 of 3206 strings)

[CI skip]
 2016-10-17 10:05:18 +02:00
Weblate
55b3366d64 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-15 09:37:45 +02:00
Deven Bansod
1aaedb32ca Don't output edit/delete row links when table is not set 
Issue #12625

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 13:08:58 +05:30
SDSkyKlouD
96b40611db Translated using Weblate (Korean) 
Currently translated at 78.9% (2530 of 3206 strings)

[CI skip]
 2016-10-15 09:37:43 +02:00
Deven Bansod
5c600140cc Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-15 11:56:19 +05:30
Deven Bansod
adec50866c ChangeLog for #12338 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 11:55:38 +05:30
Deven Bansod
02b1d17c56 Reload the current page after adding/deleting a relation in Designer 
Fix #12338

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-15 10:49:39 +05:30
Weblate
38dc43af2f Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-15 07:18:20 +02:00
Vinicius Moreira (Vm Creative)
b38e22e25f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (2993 of 3206 strings)

[CI skip]
 2016-10-15 07:18:19 +02:00
SDSkyKlouD
78dadd42fa Translated using Weblate (Korean) 
Currently translated at 78.6% (2522 of 3206 strings)

[CI skip]
 2016-10-15 07:18:18 +02:00
Deven Bansod
5668fa558b Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-14 10:01:55 +05:30
Deven Bansod
34637a71d8 ChangeLog for #12634 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:01:04 +05:30
Deven Bansod
201ba095ce Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:01:04 +05:30
Deven Bansod
c00cf34886 Use IF EXISTS with DROP Database while exporting to prevent error while importing this dump 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 10:00:50 +05:30
Deven Bansod
3accab1764 Adjust tests 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 09:55:50 +05:30
Deven Bansod
41b07b2009 Use IF EXISTS with DROP Database to prevent error while importing 
Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 09:54:50 +05:30
Deven Bansod
e63635f456 Use IDENTIFIED BY 'auth_string' if password check plugin is active 
This applies to MariaDB only

Fix #12366

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-14 01:03:46 +05:30
Deven Bansod
900a12f870 Prevent undefined index errors while editing user privs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-13 14:10:59 +05:30
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
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
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
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
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
5fa394b12b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-11 08:13:35 +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
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ř
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
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
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