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

105556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
590593c805 Merge branch 'QA_4_6' 2016-03-09 09:02:27 +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
Michal Čihař
8b87d14fe8 We set internal encoding to utf-8, no need to get it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:47:44 +01:00
Michal Čihař
1a9df888a7 Remove Kanji encoding detection 
Since we set utf-8 as internal charset, there is no need to detect it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:46:37 +01:00
Michal Čihař
f5393eff61 Remove code mentioning register_globals 
This was removed in PHP 5.4.0 so we really do not have to care anymore.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:30:24 +01:00
Michal Čihař
b995e59953 Do not try to use not configured bookmarks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:10:21 +01:00
Michal Čihař
b4cac4827e Set japanese language if we want Kanji encoding 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:08:33 +01:00
Michal Čihař
dc98940872 Add missing docs for Encoding class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 15:04:37 +01:00
Michal Čihař
d846b2e5d5 Prefer mbstring for autodetection as it's usually present these days 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:59:30 +01:00
Michal Čihař
5929b3edf5 Remove not needed use 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:59:13 +01:00
Michal Čihař
3bda9a03b9 Move Kanji encoding handling to Encoding class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:55:41 +01:00
Michal Čihař
28d15ebb8c Add method for checking if encoding conversion is supported 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:26:49 +01:00
Michal Čihař
5bd9fc4e40 Check if DBG is set and store the result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:23:25 +01:00
Michal Čihař
4ed47fc4b4 Move charset conversion to a class 
Also removes ancient support for AIX iconv.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:05:59 +01:00
Michal Čihař
07710e9aef Merge branch 'QA_4_6' 2016-03-08 11:15:31 +01:00
Michal Čihař
1b9ea10f11 Move logging helpers to class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 11:14:28 +01:00
Weblate
45534f7498 Merge remote-tracking branch 'origin/master' 2016-03-08 06:09:41 +01:00
Michal Čihař
3d9f67b9ad Translated using Weblate (Korean) 
Currently translated at 77.7% (2498 of 3214 strings)

[CI skip]
 2016-03-08 06:09:40 +01:00
Madhura Jayaratne
84deb574d3 Merge branch 'QA_4_6' 2016-03-08 16:09:17 +11:00