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

105603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Madhura Jayaratne
6eb4baed94 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-16 22:27:37 +11:00
Madhura Jayaratne
251cd5d071 Merge branch 'QA_4_6' 2016-03-16 22:22:04 +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
46dee5d1eb Merge branch 'QA_4_6' 2016-03-16 20:50:16 +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
c6d2f0012c Merge branch 'QA_4_6' 2016-03-14 22:16:07 +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
41134bcd6b Merge remote-tracking branch 'origin/master' 2016-03-11 10:17:37 +01:00
Pedro Ribeiro
a09ee98d06 Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1732 of 3208 strings)

[CI skip]
 2016-03-11 10:17:36 +01:00
Madhura Jayaratne
8899af067e Merge branch 'QA_4_6' 2016-03-11 20:17:23 +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
Weblate
2e3050ba39 Merge remote-tracking branch 'origin/master' 2016-03-10 10:58:53 +01:00
Tiago Rozeira
465eadd236 Translated using Weblate (Portuguese) 
Currently translated at 53.5% (1719 of 3208 strings)

[CI skip]
 2016-03-10 10:58:52 +01:00
Madhura Jayaratne
550536c19c Remove dead code used to export charts 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 20:58:33 +11:00
Madhura Jayaratne
52b75f4b16 Remove line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 20:23:37 +11:00
Madhura Jayaratne
96ca05cb8b This is no longer used to export charts 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 19:42:58 +11:00