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

111999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
e34823779e
Merge pull request #13780 from BePsvPT-Fork/navigation-patch 
make navigation database name and icon are in the same horizontal line
 2017-11-28 10:41:42 +01:00
xypXiong
f65c3dc2ed fix #13727 copied table data add number of orders (#13823) 
Signed-off-by: yanping <xyp.xiong@gmail.com>
 2017-11-28 10:40:42 +01:00
Michal Čihař
bdb17ddcd2 Merge branch 'QA_4_7' 2017-11-28 10:29:40 +01:00
Michal Čihař
0262542254 Prefer iconv for encoding conversions 
The mb extension is usually present, however it does not support that
wide range of charsers.

Basically this reverts d846b2e5d5.

Fixes #13842

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 10:28:55 +01:00
Michal Čihař
0654cc490d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-11-28 10:23:24 +01:00
Michal Čihař
e3f6ea6ac8 Merge branch 'QA_4_7' 2017-11-28 10:22:34 +01:00
Michal Čihař
7e4845903e Revert "Translated using Weblate (English (United Kingdom))" 
This reverts commit 663f1f3138.
 2017-11-28 10:22:22 +01:00
Michal Čihař
19a69c61b5 Merge branch 'QA_4_7' 2017-11-28 10:22:07 +01:00
Michal Čihař
438cca1011 Merge remote-tracking branch 'origin/QA_4_7' 2017-11-28 10:21:34 +01:00
Michal Čihař
784fbcd38f Lock page when changes are done in the SQL editor 
The CodeMirror does not update underlying textarea in all cases, so we
need to handle it directly.

Fixes #13821

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 10:20:30 +01:00
Weblate
9cb5d1457d Merge remote-tracking branch 'origin/master' 2017-11-28 09:41:59 +01:00
Matteo Regazzi
47d4042d5b Translated using Weblate (Italian) 
Currently translated at 99.6% (3266 of 3278 strings)

[CI skip]
 2017-11-28 09:41:55 +01:00
Michal Čihař
3cfe9605d5 Use shared code for checking page validity 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 09:41:23 +01:00
Weblate
ca7441de6c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-11-28 09:13:16 +01:00
Weblate
5a31fffbe2 Merge remote-tracking branch 'origin/master' 2017-11-28 09:13:12 +01:00
Matteo Regazzi
3eb8b541a6 Translated using Weblate (Italian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-28 09:13:11 +01:00
ʛħɸʂɫɓɸƴ Twɸȩɩʛħɫʂevɘŋ
c54b177ae3 Translated using Weblate (French) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-28 09:13:08 +01:00
Thomas Staus
663f1f3138 Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-28 09:13:07 +01:00
Matteo Regazzi
49d7e45f45 Translated using Weblate (Italian) 
Currently translated at 99.6% (3265 of 3278 strings)

[CI skip]
 2017-11-28 09:13:06 +01:00
Michal Čihař
4e6a944d7f Merge branch 'QA_4_7' 2017-11-28 09:12:42 +01:00
Michal Čihař
85ff1b6c4b Gracefully fail on missing parameter 
Fixes #13841

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 09:07:04 +01:00
Michal Čihař
8f27080d72 Fix php5 compatibility 
Issue #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-28 07:53:22 +01:00
Michal Čihař
643b635e65 Merge branch 'wl' 2017-11-28 07:47:33 +01:00
Michal Čihař
0d4b17c205 Revert "Translated using Weblate (English (United Kingdom))" 
This reverts commit 7bb365f6a5.
 2017-11-28 07:47:27 +01:00
Thomas Staus
7bb365f6a5 Translated using Weblate (English (United Kingdom)) 
Currently translated at 98.8% (3241 of 3278 strings)

[CI skip]
 2017-11-28 03:25:56 +01:00
Maurício Meneghini Fauth
358295d429 Revert "Translated using Weblate (English (United Kingdom))" 
This reverts commit e75d6017ba.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-28 00:23:15 -02:00
Weblate
737a69e321 Merge remote-tracking branch 'origin/master' 2017-11-28 02:28:22 +01:00
Thomas Staus
e75d6017ba Translated using Weblate (English (United Kingdom)) 
Currently translated at 98.7% (3237 of 3278 strings)

[CI skip]
 2017-11-28 02:28:17 +01:00
Maurício Meneghini Fauth
b149092234 Remove templates/display/import/charset.twig 
Move display/import/charset template into display/import/file_option template.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-27 23:26:56 -02:00
Weblate
25e87f053c Merge remote-tracking branch 'origin/master' 2017-11-27 22:24:54 +01:00
ʛħɸʂɫɓɸƴ Twɸȩɩʛħɫʂevɘŋ
71171c1c8a Translated using Weblate (French) 
Currently translated at 99.9% (3277 of 3278 strings)

[CI skip]
 2017-11-27 22:24:47 +01:00
Michal Čihař
b8fb7f254b Fix referenceding twofactor attribute 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 22:24:06 +01:00
Michal Čihař
c26375a066 Merge branch 'QA_4_7' 2017-11-27 18:26:06 +01:00
Michal Čihař
e51a653a1c Fixed constructing ALTER query with AFTER 
We have to include only non empty fields in this case.

Fixes #13824

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 18:23:21 +01:00
Michal Čihař
88aa6a8333 Avoid using empty and workarounding its match to zero 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 18:20:54 +01:00
Michal Čihař
4a624c6a58 Merge branch 'QA_4_7' 2017-11-27 17:52:16 +01:00
Michal Čihař
e22399bebe Add support for JSON field in MariaDB 
Fixs #13038

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:51:48 +01:00
Michal Čihař
d3f9075165 Load user preferences at one place 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:06:24 +01:00
Michal Čihař
73f428e568 Remove hack for navigation and server switching 
It is not really used with current navigation, so this code has no use
for years.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:02:27 +01:00
Michal Čihař
0f79721570 Remove not needed param from DatabaseInterface::postConnect 
It is called only for user link, so there is no need to make that
parameter.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:00:30 +01:00
Michal Čihař
2bc8afea5f Move storage zeroconfig to the DBI post connect 
This way it is executed only when needed.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 17:00:23 +01:00
Michal Čihař
8e94ba3a40 Use generic PHPMYADMIN define to avoid CSS exection 
It should work pretty much same, but we really don't care which of these
is set for rendering the css.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:51:44 +01:00
Michal Čihař
738f527242 Move goto_whitelist to the core class 
Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:49:24 +01:00
Michal Čihař
4d9b63fa99 Remove global variables cleanup 
This should be no longer necessary, it was really a workaround for
grab_globals, which is not present in PHP for years.

See ee3825013d

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:49:19 +01:00
Michal Čihař
223e4f72ef List missing deps on twofactor configuration page 
Fixes #13827

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:37:00 +01:00
Michal Čihař
e0ac6c888d Better name for twofactor configuration endpoint 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:20:20 +01:00
Michal Čihař
c7e0782201 Do not show verify button on invalid 2fa 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 16:17:12 +01:00
Michal Čihař
e572e43f03 Avoid using mbstring function on filename 
We do not have multibyte filenames...

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 14:40:03 +01:00
Michal Čihař
9d99c637e4 Remove not needed condition 
It is always true.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 14:33:13 +01:00
Michal Čihař
3a00028ecb Generate scripts as an array and concatenate once 
This avoids recalculating the result string several times.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 14:30:50 +01:00