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

105537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
1c3590dcec Merge branch 'QA_4_6' 2016-03-09 12:00:04 +01:00
Weblate
9cea2dec10 Merge remote-tracking branch 'origin/master' 2016-03-09 11:59:49 +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
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
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ř
07e4ab1fc3 Make filter box more compact 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-04 09:05:45 +01:00
Michal Čihař
9f8765681d Changelog for issue #12047 Add javascript filtering for databases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-03 13:15:55 +01:00
Michal Čihař
b7332a27cf Merge pull request #12052 from 007durgesh219/Issue#12047 
Filtering databases on databases listing, Issue #12047
 2016-03-03 13:14:45 +01:00
Durgesh
d798809215 Filtering databases on databases listing, Issue #12047 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-03-03 16:21:15 +05:30
Michal Čihař
a3eb37b5d7 Move token check to PMA_generateToken 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-03 08:23:19 +01:00
Isaac Bennetch
89e4d79d09 Fix typo 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-02 09:47:44 -05:00
Michal Čihař
3344412381 Merge branch 'QA_4_6' 2016-03-02 14:51:08 +01: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ř
baaedf0b74 Merge branch 'QA_4_6' 2016-03-02 14:04:45 +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
Madhura Jayaratne
dd5662977b Merge branch 'QA_4_6' 
Conflicts:
	README
	doc/conf.py
	libraries/Config.php
 2016-03-02 21:22:27 +11:00
Isaac Bennetch
5125fc3bc0 Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-03-01 14:43:17 -05:00
Isaac Bennetch
a0df0f15c1 Merge remote-tracking branch 'upstream/master' 2016-03-01 14:28:50 -05:00
Michal Čihař
b71aeefa3a Disable sending referer 
We don't use it and this can help us get rid of url.php once the browser
support is good enough (as usual, there is no support in IE and broken
support in Edge right now).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 16:09:51 +01:00
Michal Čihař
b856502d64 Prefer phpseclib if avaible 
It does better decisions about which backend to use than simply using
openssl.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:49:05 +01:00