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

107789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
bdb0cd2d21 Merge remote-tracking branch 'origin/master' 2016-11-11 14:40:01 +01:00
Deven Bansod
560bd2ba89 Merge branch 'QA_4_6' 
Conflicts:
	po/el.po
	po/nl.po
	po/tr.po
 2016-11-11 19:11:22 +05:30
Burak Yavuz
5854b8cbaa Translated using Weblate (Turkish) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-11-11 14:40:00 +01:00
Domen
a695429eb5 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-11-11 14:39:59 +01:00
Giovanni Sora
4cf69358c6 Translated using Weblate (Interlingua) 
Currently translated at 74.8% (2418 of 3232 strings)

[CI skip]
 2016-11-11 14:39:58 +01:00
Παναγιώτης Παπάζογλου
5c49e06124 Translated using Weblate (Greek) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-11-11 14:39:57 +01:00
dingo thirteen
a20abcfb58 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-11-11 14:39:56 +01:00
Michal Čihař
5750274c32 Translated using Weblate (Czech) 
Currently translated at 92.5% (2992 of 3232 strings)

[CI skip]
 2016-11-11 14:39:56 +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
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
Burak Yavuz
12d0879fae Translated using Weblate (Turkish) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-11-10 14:02:52 +01:00
Michal Čihař
327bc101bd Merge branch 'QA_4_6' 2016-11-10 11:09:08 +01:00
Michal Čihař
b889437e78 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-11-10 11:09:01 +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
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Stefano Martinelli
6a737d0011 Translated using Weblate (Italian) 
Currently translated at 100.0% (3232 of 3232 strings)

[CI skip]
 2016-11-10 11:06:40 +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ř
fb279cbd22 Merge branch 'QA_4_6' 2016-11-10 10:56:46 +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ř
2de2eb70de Changelog entry for #12352 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:47:27 +01:00
Michal Čihař
6145a84642 Use username for password change strength indicator 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:46:20 +01:00
Michal Čihař
4cfe911260 Upgrade zxcvbn 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:46:06 +01:00
Michal Čihař
eb57b8d171 Improve black list 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:15:12 +01:00
Michal Čihař
75ce2cb463 Merge branch 'master' into tmp 2016-11-10 10:02:01 +01:00
Michal Čihař
3bf24ad87b Correctly initialize scripts on loading password change form 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 10:01:52 +01:00
Michal Čihař
ac2cfef6c8 Move scripts loading to correct location 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 09:59:48 +01:00
Michal Čihař
eb731c91ff Merge remote-tracking branch 'origin/pull/12363' into tmp 2016-11-10 09:45:31 +01:00
Michal Čihař
28592743a0 Merge branch 'QA_4_6' 2016-11-10 09:40:55 +01:00
Michal Čihař
2ea6e324ca Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-10 09:40:48 +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
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