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

107728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
986012bce0 Fold hidden input into exiting rows 
This makes it easier to change them using CSS, see pr #12287.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 09:37:01 +01:00
Deven Bansod
0bdb13e960 Merge branch 'QA_4_6' 2016-11-10 11:47:25 +05:30
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ř
5dc004dfe0 Merge branch 'QA_4_6' 2016-11-09 18:15:29 +01:00
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ř
19db0d1cef Document upgrading for #12688 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 18:12:53 +01:00
Michal Čihař
76eaef7584 Changelog entry for #12688 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 18:11:19 +01:00
Michal Čihař
9c52cd4c66 Correctly name upgrade file (pr #12688) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-09 18:11:19 +01:00
Michal Čihař
3b48533288 Merge remote-tracking branch 'origin/pull/12688' 2016-11-09 18:09:28 +01:00
Michal Čihař
0b62043c7e Merge branch 'QA_4_6' 2016-11-09 18:09:12 +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ř
c2da1a803f Merge branch 'QA_4_6' 2016-11-09 17:44:23 +01:00
Michal Čihař
9794f27f69 Merge remote-tracking branch 'origin/QA_4_6' 2016-11-09 17:44:11 +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
Marc Delisle
a352f3e72d Translated using Weblate (French) 
Currently translated at 99.2% (3206 of 3230 strings)

[CI skip]
 2016-11-09 17:42:54 +01:00
Sevdimali İsa
dfe344031d Translated using Weblate (Azerbaijani) 
Currently translated at 52.9% (1710 of 3230 strings)

[CI skip]
 2016-11-09 17:42:53 +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
Daniel Popiniuc
7a76640279 Bookmark id that is an auto_increment column can only take positive values starting from 1, therefore should be unsigned otherwise half of allowed interval is wasted from start, and this is the fix for that. 2016-11-09 15:26:38 +02:00
Nils Van Zuijlen
d7a74c2684 Translated using Weblate (French) 
Currently translated at 99.0% (3199 of 3230 strings)

[CI skip]
 2016-11-08 15:48:05 +01:00
Marc Delisle
8dcf58f5ae Translated using Weblate (French) 
Currently translated at 99.0% (3198 of 3230 strings)

[CI skip]
 2016-11-08 15:47:40 +01:00
Raphaël Barman
9681544729 Translated using Weblate (French) 
Currently translated at 99.0% (3198 of 3230 strings)

[CI skip]
 2016-11-08 15:46:05 +01:00
Nils Van Zuijlen
c5d8460f74 Translated using Weblate (French) 
Currently translated at 99.0% (3198 of 3230 strings)

[CI skip]
 2016-11-08 15:45:39 +01:00
Marc Delisle
a914e5c02c Translated using Weblate (French) 
Currently translated at 99.0% (3198 of 3230 strings)

[CI skip]
 2016-11-08 15:42:16 +01:00
Michal Čihař
3313dc2c85 Merge branch 'QA_4_6' 2016-11-08 14:51:34 +01:00
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ř
c48f2a6830 Merge branch 'QA_4_6' 2016-11-08 14:48:48 +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ř
2c90866b18 Merge branch 'QA_4_6' 2016-11-08 14:46:01 +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
Michal Čihař
f9dc8c6bb8 Merge branch 'QA_4_6' 2016-11-08 14:44:56 +01:00
Weblate
b339553338 Merge remote-tracking branch 'origin/master' 2016-11-08 06:38:52 +01:00
Deven Bansod
36476c77a8 Merge branch 'QA_4_6' 
Conflicts:
	po/da.po
	po/id.po
	po/ko.po
	po/pt_BR.po
 2016-11-08 11:09:57 +05:30
popinha13
13f3b2b1ab Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.7% (2996 of 3230 strings)

[CI skip]
 2016-11-08 06:38:51 +01:00
Lee Joon Haeng
8beba8a07f Translated using Weblate (Korean) 
Currently translated at 80.2% (2591 of 3230 strings)

[CI skip]
 2016-11-08 06:38:50 +01:00
Nils Van Zuijlen
4b6eb187d4 Translated using Weblate (French) 
Currently translated at 98.9% (3197 of 3230 strings)

[CI skip]
 2016-11-08 06:38:49 +01:00
Nils Van Zuijlen
6b70628e36 Translated using Weblate (Breton) 
Currently translated at 16.9% (546 of 3230 strings)

[CI skip]
 2016-11-08 06:38:47 +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
Weblate
303da921a2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-11-08 06:37:12 +01:00
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