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

105252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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ř
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
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
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
Madhura Jayaratne
6eb4baed94 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-16 22:27:37 +11:00
Madhura Jayaratne
902b41e86c Fix #12092 PHP Fatal error: Call to undefined function __() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-16 22:20:30 +11:00
Madhura Jayaratne
2f1c996409 Fix #12099 Undefined index: controllink 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-16 20:44:32 +11:00
Madhura Jayaratne
c8e51a1b59 Fix #12092 Rename exported databases/tables doesn't seem to work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-14 22:13:48 +11:00
Weblate
be0e5bf105 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-11 10:12:42 +01:00
Pedro Ribeiro
4c8a53c6b4 Translated using Weblate (Portuguese) 
Currently translated at 54.1% (1739 of 3211 strings)

[CI skip]
 2016-03-11 10:12:42 +01:00
Madhura Jayaratne
03819741ec Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-03-11 20:12:33 +11:00
Madhura Jayaratne
46a32f55a0 Fix a style error in print view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-11 20:04:29 +11:00
Paulo Lopes Duarte
acb1862b8a Translated using Weblate (Portuguese) 
Currently translated at 53.8% (1728 of 3211 strings)

[CI skip]
 2016-03-10 11:14:35 +01:00
Pedro Ribeiro
e539a53f1d Translated using Weblate (Portuguese) 
Currently translated at 53.8% (1728 of 3211 strings)

[CI skip]
 2016-03-10 11:12:59 +01:00
Tiago Rozeira
8a34ea60d0 Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1726 of 3211 strings)

[CI skip]
 2016-03-10 11:02:49 +01:00
Madhura Jayaratne
86b9067969 Fix #12085 Like search strings being escaped incorrectly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 19:16:54 +11:00
Michal Čihař
8310691341 Add PHP 5.5.0 error codes as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 14:07:25 +01:00
Michal Čihař
3ec1ad0132 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-03-09 11:59:49 +01:00
Michal Čihař
07c2f26223 Add workaround for PHP bug 
I'm unable to better diagnose the problem right now, so let's workaround
it so that it's working for users.

Fixes #11705

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 11:59:08 +01:00
Weblate
b25885ee43 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-09 11:43:42 +01:00
Julian Ladisch
315be0e456 Translated using Weblate (German) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-03-09 11:43:40 +01:00
Michal Čihař
c964633278 Provide diagnostics for JSON encoding errors 
Issue #11705

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 11:43:06 +01:00
Michal Čihař
b93ce993eb Fixed rendering of table stats 
Fixes #12081

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 09:13:33 +01:00
Michal Čihař
ace1faa085 Fixed parsing of field definition 
Fixes #12083

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 09:02:07 +01:00
Weblate
c8422b9700 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-08 06:04:46 +01:00
Michal Čihař
c690f60f50 Translated using Weblate (Korean) 
Currently translated at 78.0% (2505 of 3211 strings)

[CI skip]
 2016-03-08 06:04:45 +01:00
Madhura Jayaratne
e04585df5b Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-03-08 16:04:31 +11:00
Madhura Jayaratne
ff743830ff Fix #12073 Hide edit and delete buttons when the results are not related to a table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-08 16:02:05 +11:00
Michal Čihař
f76ddbe7ab Update SQL parser to ad0e75faa6f6943d013f23d0d1ca31b4781e7b79 
- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT

Fixes #12041

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:50:21 +01:00
Michal Čihař
fe4a3e8727 Fixed processing of queries with escaped quotes 
Imported SQL parser d2e37de1dbec251556f35712bddcd61d24baaee6

Fixes #12054

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:04:00 +01:00
Isaac Bennetch
5125fc3bc0 Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-03-01 14:43:17 -05:00
Michal Čihař
9eee3353a6 Merge branch 'QA_4_5' into QA_4_6 2016-03-01 15:43:18 +01:00