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

105575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
7f082b0d6b This is an inc file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 19:31:16 +11:00
Madhura Jayaratne
5f2c866fcb Merge branch 'QA_4_6' 2016-03-10 19:18:10 +11: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
Madhura Jayaratne
ccc17ae112 Merge branch 'bookmark' 2016-03-10 00:58:49 +11:00
Madhura Jayaratne
2fdb55e8e2 Return false when bookmark table is not configured 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 00:49:30 +11:00
Madhura Jayaratne
5c4c0c242c Pass bookmark variables as method parameters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 00:28:00 +11:00
Madhura Jayaratne
b55ddd09b5 Use as non-static methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 00:25:06 +11:00
Madhura Jayaratne
51dbe97b8d Fix test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 00:23:58 +11:00
Michal Čihař
b8d5d6e9b2 Merge branch 'QA_4_6' 2016-03-09 14:08:03 +01: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
Madhura Jayaratne
263bd601e6 Remove bookmark library includes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:57:09 +11:00
Madhura Jayaratne
b47256cad2 Check whether valid bookmark was returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:52:09 +11:00
Madhura Jayaratne
6ea8b2d3b8 Wrap long line 2016-03-09 23:51:27 +11:00
Madhura Jayaratne
40dc10ec18 Update doc comments of the test class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:42:57 +11:00
Madhura Jayaratne
43cfba9f24 Refactor bookmarking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-09 23:39:29 +11:00
Julian Ladisch
49d22c6c01 Translated using Weblate (German) 
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
 2016-03-09 13:05:54 +01:00
Michal Čihař
1c3590dcec Merge branch 'QA_4_6' 2016-03-09 12:00:04 +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
Weblate
9cea2dec10 Merge remote-tracking branch 'origin/master' 2016-03-09 11:59:49 +01:00
Julian Ladisch
41df6c4105 Translated using Weblate (German) 
Currently translated at 99.9% (3206 of 3208 strings)

[CI skip]
 2016-03-09 11:59:46 +01:00
Michal Čihař
f01b3b7ddd Merge branch 'QA_4_6' 2016-03-09 11:59:36 +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ř
16818f7ad3 Merge branch 'QA_4_6' 2016-03-09 09:13:45 +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ř
02aa073a81 Add missing use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 09:03:44 +01:00