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

105625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
d6238f7fca Merge branch 'QA_4_6' 2016-03-24 23:31:06 +01:00
Michal Čihař
7cae68f6b1 Merge commit '3c398261b75e5501b11238e0f1082cc234e8aeb5' 2016-03-24 23:31:01 +01:00
Michal Čihař
5d755b194a Fixed activation of some languages 
We need to maintain mixed case language codes as well.

Fixes #12118

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-24 23:30:24 +01:00
Madhura Jayaratne
6b84c576c7 Merge branch 'QA_4_6' 
Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.php
 2016-03-24 17:54:22 +11:00
Weblate
3c398261b7 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-24 07:50:20 +01:00
Madhura Jayaratne
155ad55e91 Translated using Weblate (Sinhala) 
Currently translated at 60.6% (1947 of 3211 strings)

[CI skip]
 2016-03-24 07:50:19 +01:00
Madhura Jayaratne
7a444c2f17 Fix #12120 PMA_Util not found in insert_edit.lib.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-24 17:47:47 +11:00
Weblate
52d10a6b1a Merge remote-tracking branch 'origin/master' 2016-03-24 05:02:34 +01:00
Madhura Jayaratne
7b1abd9807 Translated using Weblate (Sinhala) 
Currently translated at 60.5% (1941 of 3208 strings)

[CI skip]
 2016-03-24 05:02:33 +01:00
Deven Bansod
0da002031c Merge pull request #12113 from devenbansod/add_new_variables 
Add new server variables
Changed appropriate variables to have byte-formatting
Fixed tests
 2016-03-24 09:32:26 +05:30
Deven Bansod
c47a275e22 Added newly introduced variables 
Changed appropriate variables to have byte-formatting

Fixed tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-23 16:19:53 +05:30
Michal Čihař
aa1278b12d Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-18 12:07:16 +01:00
Michal Čihař
aa034bb0c9 Update SQL parser 
- issue #12026 Fixed parsing of UNION SELECT with brackets

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-18 12:06:27 +01:00
Michal Čihař
8a5bf72775 Merge branch 'QA_4_6' 2016-03-18 10:35:43 +01:00
Michal Čihař
1b43606a48 Fixed possible invalid SQL export 
We should emit the charset restoration only if we have emitted its
setting in the header. As the condition was slightly different in both
cases it was possible that only one part of these two was emitted in
past.

Fixes #12074

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-18 10:34:17 +01:00
Isaac Bennetch
6084dc2a25 Release 4.6.0 and prepare for 4.6.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-17 07:52:48 -04:00
Weblate
9642caab99 Merge remote-tracking branch 'origin/master' 2016-03-22 07:21:48 +01:00
Chan Je Park
6bb05f9885 Translated using Weblate (Korean) 
Currently translated at 77.7% (2500 of 3214 strings)

[CI skip]
 2016-03-22 07:21:46 +01:00
Deven Bansod
3b227209a1 Make phpcs happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-22 11:50:22 +05:30
Weblate
bd053d75dd Merge remote-tracking branch 'origin/master' 2016-03-22 01:39:31 +01:00
Eshin Kunishima
2c84cd9806 Translated using Weblate (Japanese) 
Currently translated at 67.2% (2157 of 3208 strings)

[CI skip]
 2016-03-22 01:39:29 +01:00
Tobias Bannert
05fc07b745 Translated using Weblate (German) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-03-22 01:39:28 +01:00
Madhura Jayaratne
ae7c241967 Merge branch 'QA_4_6' 2016-03-22 11:39:00 +11:00
Madhura Jayaratne
a3088fd8bf Fix #12116 Fulltext indexes are not copied when using copy database function 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-22 11:32:44 +11:00
Weblate
992b0ef545 Merge remote-tracking branch 'origin/master' 2016-03-21 13:34:57 +01:00
YF
414b5b5c0a Translated using Weblate (Chinese (China)) 
Currently translated at 88.0% (2825 of 3208 strings)

[CI skip]
 2016-03-21 13:34:54 +01:00
Deven Bansod
155f53c398 Merge branch 'QA_4_6' 
Conflicts:
	po/az.po
 2016-03-21 18:04:12 +05:30
Weblate
5fa6925f1a Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-21 13:31:01 +01:00
YF
3dcabaeb40 Translated using Weblate (Chinese (China)) 
Currently translated at 88.2% (2834 of 3211 strings)

[CI skip]
 2016-03-21 13:30:59 +01:00
Deven Bansod
d2ad23972b Fix #12105 : Multi-server drag-drop-import always fails 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-21 18:00:22 +05:30
Weblate
ec6462b7bd Merge remote-tracking branch 'origin/master' 2016-03-19 18:21:41 +01:00
Weblate
61dd5a7b94 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-19 18:21:41 +01:00
Sevdimali İsa
23116557f2 Translated using Weblate (Azerbaijani) 
Currently translated at 52.4% (1685 of 3211 strings)

[CI skip]
 2016-03-19 18:21:39 +01:00
Sevdimali İsa
f33c8f63b9 Translated using Weblate (Azerbaijani) 
Currently translated at 52.4% (1681 of 3208 strings)

[CI skip]
 2016-03-19 18:21:37 +01:00
Michal Čihař
f1ef05ef77 Merge branch 'QA_4_6' 2016-03-19 18:21:27 +01:00
Michal Čihař
cb1d20eb92 Udate SQL parser to 9d8ae92 
- issue #12109 Fixed parsing of CREATE TABLE [AS] SELECT

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-19 18:20:39 +01:00
Isaac Bennetch
c9dd2e8a78 Prepare for 4.6.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-17 07:41:26 -04:00
Weblate
4def458ad7 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-22 17:16:06 +01:00
Chan Je Park
d83a7a7a81 Translated using Weblate (Korean) 
Currently translated at 78.0% (2507 of 3211 strings)

[CI skip]
 2016-03-22 17:16:05 +01:00
Weblate
be3137c77a Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-22 01:33:07 +01:00
Eshin Kunishima
0f022341a2 Translated using Weblate (Japanese) 
Currently translated at 67.3% (2163 of 3211 strings)

[CI skip]
 2016-03-22 01:33:06 +01:00
Tobias Bannert
51443ae8ff Translated using Weblate (German) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-03-22 01:33:06 +01:00
Michal Čihař
48b444fc21 Merge branch 'QA_4_6' 2016-03-17 11:37:59 +01:00
Weblate
cdf07a17fe Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-17 11:32:36 +01:00
Jozef Pistej
670311dd24 Translated using Weblate (Slovak) 
Currently translated at 83.1% (2671 of 3211 strings)

[CI skip]
 2016-03-17 11:32:36 +01:00
Weblate
eb4f7534dd Merge remote-tracking branch 'origin/master' 2016-03-17 11:32:34 +01:00
Jozef Pistej
409ebff98c Translated using Weblate (Slovak) 
Currently translated at 82.8% (2664 of 3214 strings)

[CI skip]
 2016-03-17 11:32:33 +01:00
Michal Čihař
f8ead4738e Merge branch 'QA_4_6' 2016-03-17 11:32:22 +01:00
Michal Čihař
1523985bce Fix login after logout with http authentication 
We can not check token here as it's always there (in the URL) after
logout.

Fixes #12098

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-17 11:31:06 +01:00
Isaac Bennetch
37b38431d1 4.6.0 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-17 05:47:44 -04:00