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

106180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
1aeb705b3f ChangeLog for #12691 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-13 11:40:47 +05:30
Deven Bansod
9b76fccb27 Remove unnecessary call to ksort on empty list 
Fix #12691

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-13 11:37:50 +05:30
Deven Bansod
81fe5fe9bf Fix incorrect calls to escapeString 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-11 19:20:57 +05:30
Weblate
a9048b0b5c Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-11 14:38:34 +01:00
Deven Bansod
d580bb3b51 ChangeLog for #12542 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-11 19:09:44 +05:30
Deven Bansod
d4377e40d8 Merge branch 'rpv-tomsk-fix-HtmlHeaderForUserProperties' into QA_4_6 2016-11-11 19:08:59 +05:30
Burak Yavuz
48650f9403 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-11 14:38:33 +01:00
Domen
fcc4537d93 Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3220 of 3222 strings)

[CI skip]
 2016-11-11 14:38:33 +01:00
Giovanni Sora
dd45b97264 Translated using Weblate (Interlingua) 
Currently translated at 74.6% (2406 of 3222 strings)

[CI skip]
 2016-11-11 14:38:31 +01:00
Deven Bansod
f80140c46e Fix function parameters in b12411cc24 
Fix #12542

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-11 19:06:37 +05:30
dingo thirteen
f7c8cd72a2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-10 19:13:41 +01:00
Παναγιώτης Παπάζογλου
35c7c8039f Translated using Weblate (Greek) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-10 18:32:37 +01:00
Burak Yavuz
b83b71d5a5 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-10 14:06:47 +01:00
Michal Čihař
f4c0331202 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-11-10 11:08:51 +01:00
Stefano Martinelli
dd828ebce0 Translated using Weblate (Italian) 
Currently translated at 100.0% (3222 of 3222 strings)

[CI skip]
 2016-11-10 11:06:34 +01:00
Michal Čihař
ef0f08e7d3 Changelog entry for #12564 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 11:00:32 +01:00
Michal Čihař
c9348b682e Merge remote-tracking branch 'origin/pull/12564' into QA_4_6 2016-11-10 10:59:33 +01:00
Michal Čihař
4cd1814469 Changelog entry for #12372 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:56:42 +01:00
Michal Čihař
08840559ba Adjust code to changes in #12372 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:55:59 +01:00
Roger Walt
32a381d0a5 Fixes #12322, no default function selected for foreignkey fields 
Signed-off-by: Roger Walt <roger.walt@gmail.com>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:52:51 +01:00
Michal Čihař
683c2dc291 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 09:40:14 +01:00
Deven Bansod
ec08844246 Use a forcing parameter to get $the_total records for a foreign key column 
Required at some specific places for ex. browse_foreigners.php (reqd for pagination)
This is in continuation of original fix for #12257 (in #12685)

Also fixed an error in an old commit 9880f57344
related to LIMIT clause generation

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-10 11:43:19 +05:30
Michal Čihař
9b8758512e Changelog entry for #12685 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 18:15:24 +01:00
Michal Čihař
14ccebbd4b Merge remote-tracking branch 'origin/pull/12685' into QA_4_6 2016-11-09 18:14:53 +01:00
Michal Čihař
7270a0c795 Add missing punctionation 
See PR #12686

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 18:07:23 +01:00
Michal Čihař
3debbdd09b Changelog entry for 12689 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 18:05:41 +01:00
Michal Čihař
2c90167a8a Merge remote-tracking branch 'origin/pull/12689' into QA_4_6 2016-11-09 18:04:49 +01:00
Michal Čihař
0404f09ace Update SQL parser to 3.4.12 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 17:43:13 +01:00
Marc Delisle
9fb7293eef Translated using Weblate (French) 
Currently translated at 99.7% (3211 of 3219 strings)

[CI skip]
 2016-11-09 17:43:04 +01:00
Sevdimali İsa
94ef1a4f7c Translated using Weblate (Azerbaijani) 
Currently translated at 53.3% (1717 of 3219 strings)

[CI skip]
 2016-11-09 17:43:03 +01:00
Deven Bansod
2309ef57d2 Add LEFT JOIN for different constraints 
If there are two or more columns in the same constraint (foreign key),
we should use AND to concatenate the conditions on LEFT JOIN for both the columns

Fix #12652

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-09 21:16:00 +05:30
Deven Bansod
cb7abad0b5 Remove call to old methods, fix tests 
Remove definition of old method. Remove related tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-09 10:40:00 +05:30
Michal Čihař
583304a132 Changelog entry for #12683 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:51:30 +01:00
Michal Čihař
8babc66201 Merge remote-tracking branch 'origin/pull/12683' into QA_4_6 2016-11-08 14:50:42 +01:00
Michal Čihař
164176cbbe Changelog entry for #12666 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:48:44 +01:00
Michal Čihař
9df6c8258c Merge remote-tracking branch 'origin/pull/12666' into QA_4_6 2016-11-08 14:48:16 +01:00
Michal Čihař
af73f564dd Changelog entry for #12678 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-08 14:45:46 +01:00
Michal Čihař
38a804edde Merge remote-tracking branch 'origin/pull/12678' into QA_4_6 2016-11-08 14:45:10 +01:00
Weblate
303da921a2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-08 06:37:12 +01:00
Deven Bansod
7b4f4a1bff Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-11-08 11:08:33 +05:30
Deven Bansod
ff3dd90172 Remove unused deubgging calls 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-08 11:07:41 +05:30
popinha13
80ad2da2b8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.2% (3001 of 3219 strings)

[CI skip]
 2016-11-08 06:37:11 +01:00
Lee Joon Haeng
1fcfdb9963 Translated using Weblate (Korean) 
Currently translated at 80.5% (2592 of 3219 strings)

[CI skip]
 2016-11-08 06:37:10 +01:00
Nils Van Zuijlen
dec24a713e Translated using Weblate (French) 
Currently translated at 99.5% (3205 of 3219 strings)

[CI skip]
 2016-11-08 06:37:10 +01:00
Nils Van Zuijlen
1503912dc1 Translated using Weblate (Breton) 
Currently translated at 16.9% (547 of 3219 strings)

[CI skip]
 2016-11-08 06:37:09 +01:00
Prasna Lukito
39abc62b37 Translated using Weblate (Indonesian) 
Currently translated at 69.9% (2252 of 3219 strings)

[CI skip]
 2016-11-08 00:45:10 +01:00
Deven Bansod
1f439a4dcc Use a work around for testing if numRecords at least N 
Fix #12257

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-07 22:56:19 +05:30
Deven Bansod
06e9b62a25 Remove tests against unsupported versions 
Remove duplicate test, fix other tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-11-07 20:42:28 +05:30
Guilherme Rocha
eb5fa46b0c Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2999 of 3219 strings)

[CI skip]
 2016-11-07 14:07:31 +01:00
popinha13
14317c7734 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2998 of 3219 strings)

[CI skip]
 2016-11-07 13:57:56 +01:00