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

107450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
89d10569e9 Merge branch 'QA_4_6' 
Conflicts:
	po/ko.po
	po/pt_BR.po
 2016-10-15 11:57:51 +05:30
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
90d81d9ffd Merge remote-tracking branch 'origin/master' 2016-10-15 07:19:03 +02:00
Deven Bansod
57d4ad7c43 Merge branch 'QA_4_6' 2016-10-15 10:50:46 +05:30
Vinicius Moreira (Vm Creative)
be29fc6a53 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.8% (2989 of 3219 strings)

[CI skip]
 2016-10-15 07:19:02 +02:00
SDSkyKlouD
6d8ff8a1e5 Translated using Weblate (Korean) 
Currently translated at 78.1% (2516 of 3219 strings)

[CI skip]
 2016-10-15 07:19:01 +02:00
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
Weblate
650522ef28 Merge remote-tracking branch 'origin/master' 2016-10-14 06:37:05 +02:00
Deven Bansod
b95c35e5cc Merge branch 'QA_4_6' 2016-10-14 10:08:51 +05:30
dingo thirteen
2ca85411f4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-14 06:37:02 +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
6ed1da5a45 Merge branch 'QA_4_6' 2016-10-14 09:59:32 +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
dingo thirteen
c2dbfab186 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-13 17:21:28 +02:00
Michal Čihař
b20fd43aaf Document TODO for Advisor 
See #6363

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-13 13:27:40 +02:00
Michal Čihař
8b87e6ae00 Switch to MoTranslator 2.0 
It changes API (to consistenly use camelCase) and removes use of eval().

See #6363, #11993 and phpmyadmin/motranslator#5

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-13 13:24:35 +02:00
Michal Čihař
51a7ea7bf5 Adjust cleanup to changed motranslator deps 
See #6363, #11993 and phpmyadmin/motranslator#5

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-13 13:21:18 +02:00
Deven Bansod
fc4ee9a9e4 Merge branch 'QA_4_6' 2016-10-13 14:11:28 +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
4f3b22b00a Merge branch 'QA_4_6' 2016-10-13 10:59:47 +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
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
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