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

103178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
1f86b7fb5c Merge remote-tracking branch 'origin/master' 2015-10-13 17:34:23 +02:00
Juha
f71b85241e Translated using Weblate (Finnish) 
Currently translated at 61.1% (1972 of 3227 strings)

[CI skip]
 2015-10-13 17:34:20 +02:00
Marc Delisle
4fe4cfa46a Merge commit '649591d' 2015-10-13 11:33:34 -04:00
Marc Delisle
b07ba3c831 Merge commit 'b884ccd' 2015-10-13 11:33:12 -04:00
Marc Delisle
c01a276ea1 Merge commit '17c4bb1' 2015-10-13 11:32:54 -04:00
Marc Delisle
7ddbfefb9d Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 11:32:21 -04:00
Deven Bansod
8a82a04ff9 Refactor code for generation of available auth plugins HTML 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-14 00:33:15 +05:30
Marc Delisle
b2de929be4 Merge commit 'd097ed3' 2015-10-13 11:22:32 -04:00
Weblate
649591da8d Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-13 17:15:12 +02:00
Juha
10b38a4aec Translated using Weblate (Finnish) 
Currently translated at 60.8% (1954 of 3210 strings)

[CI skip]
 2015-10-13 17:15:11 +02:00
Marc Delisle
b884ccd753 Enable translation of auth plugin description 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 11:14:57 -04:00
Marc Delisle
17c4bb184c Merge pull request #11569 from devenbansod/refactor_auth_plugins 
Refactor code for generation available auth plugins HTML
 2015-10-13 10:59:15 -04:00
Marc Delisle
b88f03c718 Merge branch 'QA_4_5' 2015-10-13 09:25:36 -04:00
Weblate
d097ed33bf Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-13 15:25:22 +02:00
Juha
6f81207d84 Translated using Weblate (Finnish) 
Currently translated at 60.6% (1946 of 3210 strings)

[CI skip]
 2015-10-13 15:25:21 +02:00
Marc Delisle
56ab89da6c Fix parameter order 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-13 09:25:15 -04:00
Weblate
cef0c77802 Merge remote-tracking branch 'origin/master' 2015-10-13 13:42:56 +02:00
Juha
23f37f5ebd Translated using Weblate (Finnish) 
Currently translated at 60.2% (1944 of 3227 strings)

[CI skip]
 2015-10-13 13:42:54 +02:00
Michal Čihař
b703e3cb74 Update translators credits from Weblate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-13 13:42:15 +02:00
Abhishek kanojia
1fa2fbdd09 Show current PHP version in case minimum version requirement is not met 
Signed-off-by: Abhishek kanojia <abhishekka3193@gmail.com>
 2015-10-12 17:49:35 -04:00
Weblate
fc8ac19f85 Merge remote-tracking branch 'origin/master' 2015-10-12 23:42:52 +02:00
Martin Lacina
62948f20df Translated using Weblate (Slovak) 
Currently translated at 82.9% (2678 of 3227 strings)

[CI skip]
 2015-10-12 23:42:52 +02:00
Giovanni Sora
93a0ab13ce Translated using Weblate (Interlingua) 
Currently translated at 70.6% (2279 of 3227 strings)

[CI skip]
 2015-10-12 23:42:51 +02:00
Marc Delisle
fd2938e919 Merge branch 'QA_4_5' 2015-10-12 17:42:31 -04:00
Marc Delisle
b10676c234 Merge commit '41a3264' 2015-10-12 17:42:22 -04:00
Marc Delisle
40f484e3aa Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-12 17:41:43 -04:00
Marc Delisle
280f306dee Merge commit '404bea4' 2015-10-12 17:19:17 -04:00
Marc Delisle
337697d2e4 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-12 17:18:48 -04:00
Weblate
41a3264f93 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-12 23:17:25 +02:00
Giovanni Sora
7a69c9a71b Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2263 of 3210 strings)

[CI skip]
 2015-10-12 23:17:25 +02:00
Marc Delisle
8cd589a832 Merge pull request #11562 from devenbansod/fix_11561 
Fix #11561
 2015-10-12 17:17:20 -04:00
Deven Bansod
bd49edfb90 Fix 11561 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-13 06:24:12 +05:30
Kristjan Räts
16386e6471 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3227 of 3227 strings)

[CI skip]
 2015-10-12 07:53:39 +02:00
Kristjan Räts
404bea4755 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-10-12 07:52:44 +02:00
Marc Delisle
5dd4218df1 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 07:00:53 -04:00
Marc Delisle
bfb10f57b0 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 06:59:55 -04:00
Marc Delisle
2d30407b91 Merge branch 'QA_4_5' 2015-10-11 06:54:29 -04:00
Marc Delisle
41f5f57c1f Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-11 06:54:07 -04:00
Weblate
5c6a200042 Merge remote-tracking branch 'origin/master' 2015-10-11 12:53:07 +02:00
Martin Lacina
192ab1d205 Translated using Weblate (Slovak) 
Currently translated at 82.8% (2672 of 3227 strings)

[CI skip]
 2015-10-11 12:53:06 +02:00
Marc Delisle
7239f7946c Merge branch 'QA_4_5' 2015-10-11 06:50:09 -04:00
Marc Delisle
da064eec27 Merge commit 'f6ba32e' 2015-10-11 06:49:50 -04:00
Weblate
835c63aed2 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-11 12:49:03 +02:00
Martin Lacina
369be59c08 Translated using Weblate (Slovak) 
Currently translated at 83.4% (2680 of 3210 strings)

[CI skip]
 2015-10-11 12:49:02 +02:00
Marc Delisle
f6ba32e795 Merge pull request #11566 from devenbansod/fix_error_in_11560 
Fix error in PR #11560
 2015-10-11 06:48:58 -04:00
Deven Bansod
0ce416b14c Fix error in PR 11560 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 16:51:49 +05:30
Marc Delisle
fd6ed157a9 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 15:28:14 -04:00
Marc Delisle
9eb8dd974d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-10 15:21:15 -04:00
Marc Delisle
e9cd6b583c Merge pull request #11560 from devenbansod/fix_11520 
Fix #11520
 2015-10-10 15:18:52 -04:00
Deven Bansod
31d19c4cf7 Fix #11520 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-11 05:29:50 +05:30