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

105652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
476d9a5746 Merge branch 'QA_4_6' 2016-03-31 21:39:21 +11:00
Madhura Jayaratne
6d7acf969a Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-03-31 21:36:58 +11:00
Madhura Jayaratne
413f66f4c2 Fix #12125 Cannot highlight a column if I scroll down from the top of the table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-31 21:34:43 +11:00
Weblate
49b3dbb837 Merge remote-tracking branch 'origin/master' 2016-03-30 15:40:06 +02:00
Ricardo Crivelli
43e031aab6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.1% (2955 of 3208 strings)

[CI skip]
 2016-03-30 15:40:05 +02:00
Eshin Kunishima
a9a6a147d3 Translated using Weblate (Japanese) 
Currently translated at 67.5% (2167 of 3208 strings)

[CI skip]
 2016-03-30 15:40:04 +02:00
Isaac Bennetch
18670840c8 Merge branch 'QA_4_6' 
Fix merge conflicts in po/pt_BR.po

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-30 09:39:08 -04:00
Weblate
a1dd261603 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-29 21:32:50 +02:00
Ricardo Crivelli
cb91d94705 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.3% (2964 of 3211 strings)

[CI skip]
 2016-03-29 21:32:49 +02:00
Isaac Bennetch
3c139e5899 Merge pull request #12141 from madhuracj/issue12132 
Fix #12132 Can not open table with JSON field
 2016-03-29 15:32:44 -04:00
Madhura Jayaratne
f4541c8da6 Fix #12132 Can not open table with JSON field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-28 22:50:20 +11:00
Madhura Jayaratne
d2125684fe Merge branch 'QA_4_6' 2016-03-28 22:19:26 +11:00
Madhura Jayaratne
61dbcafa56 JSON data type is not supported in MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-28 22:17:48 +11:00
Madhura Jayaratne
f4907d7857 Merge pull request #12136 from ibennetch/json 
Fix offering JSON datatype in incompatible MySQL versions
 2016-03-28 22:00:39 +11:00
Isaac Bennetch
a6e9314cf3 Fix offering JSON datatype in incompatible MySQL versions 
Fixes #12135

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-27 12:32:51 -04:00
Michal Čihař
686c5fe97c Merge branch 'QA_4_6' 2016-03-25 08:18:50 +01:00
Michal Čihař
43a4a042ce Fixed error in 3NF step of normalization 
Fixes #12121

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-25 08:18:36 +01:00
Michal Čihař
42a852f6b3 Merge branch 'QA_4_6' 2016-03-25 08:14:56 +01:00
Michal Čihař
57d769970e Merge pull request #12126 from ibennetch/faq-maint 
Faq maint
 2016-03-25 08:14:18 +01:00
Michal Čihař
370620a868 Merge pull request #12127 from ibennetch/glossary 
Fixup for missing glossary terms
 2016-03-25 08:13:36 +01:00
Michal Čihař
3a38702921 Merge pull request #12128 from ibennetch/1_44update 
Update location of tcpdf library in FAQ
 2016-03-25 08:13:12 +01:00
Isaac Bennetch
74994abee4 Update location of tcpdf library 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-24 23:23:16 -04:00
Isaac Bennetch
705b1aebd6 Fixup for missing glossary terms 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-24 23:17:13 -04:00
Isaac Bennetch
8cb928d407 Add security instructions to FAQ 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-24 23:12:20 -04:00
Isaac Bennetch
777fdb8ec2 Fix capitalization 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-24 23:12:20 -04:00
Isaac Bennetch
56c94a7e03 Improve phrasing of FAQ entry 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-24 23:12:20 -04:00
Isaac Bennetch
14cce7ae78 Remove outdated FAQ entries 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-24 23:12:20 -04:00
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