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

111955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař
bed6fb4ebd Avois passing extension to Util::getImage 
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 14:24:42 +01:00
Michal Čihař
0aed31b854 Remove extension from js images API 
Now when we use CSS classes, it's up to themes to define this.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:58:17 +01:00
Michal Čihař
502e1edd06 Add icons css 
This should have been part of fd9150460e,
but was ommited due to too aggressive .gitignore, which was fixed in
a923d1483d.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:55:16 +01:00
Michal Čihař
a923d1483d Fix gitnore file to ignore only files at current level 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:54:33 +01:00
Michal Čihař
fd9150460e Use fully CSS based icons 
- themes can easier customize their look
- this better deals with previous JS code who relied on sprites (fixes #13815)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:47:43 +01:00
Michal Čihař
0d18161310 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:45:08 +01:00
Michal Čihař
37abef4715 Use just one error icon 
The other really does not fit the theme and there is no reason to have two.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:33:09 +01:00
Michal Čihař
fecf2de315 Remove unused info icon 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:31:50 +01:00
Michal Čihař
49a1b0e743 Move session cleanup to post login 
It was really misplaced in 951e8ac753
it did cleanup session with every request.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 13:14:58 +01:00
Michal Čihař
80db5c457a Merge branch 'QA_4_7' 2017-11-27 09:26:41 +01:00
Michal Čihař
fd7a4db3b7 Correctly unset session on logout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 09:25:46 +01:00
Michal Čihař
951e8ac753 Consistent session handling across plugins 
We want all auth plugins to behave same, there is no reason to secure
session only in the cookie plugin.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 09:14:52 +01:00
Michal Čihař
460e30d17b Merge branch 'QA_4_7' 2017-11-27 09:01:25 +01:00
Michal Čihař
3f361bf6f0 Merge remote-tracking branch 'origin/QA_4_7' 2017-11-27 09:00:51 +01:00
Michal Čihař
f7e6366d01 Use correct name for motranslator call 
We're not using php gettext, so using _ is mistake.

Issue #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-27 08:59:36 +01:00
Kozioł Marcin
7fb7757aaf Translated using Weblate (Polish) 
Currently translated at 98.5% (3160 of 3207 strings)

[CI skip]
 2017-11-27 08:59:25 +01:00
Weblate
78ce32e42b Merge remote-tracking branch 'origin/master' 2017-11-26 19:18:15 +01:00
Kozioł Marcin
b6a5b90e63 Translated using Weblate (Polish) 
Currently translated at 85.8% (2814 of 3278 strings)

[CI skip]
 2017-11-26 19:18:13 +01:00
Maurício Meneghini Fauth
ed396da220
Merge pull request #13834 from mauriciofauth/display-import 
Refactor PhpMyAdmin\Display\Import class
 2017-11-26 16:17:20 -02:00
Maurício Meneghini Fauth
73e558337c Refactor PhpMyAdmin\Display\Import class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-26 15:38:25 -02:00
Maurício Meneghini Fauth
4b51f335de Use template for getHtmlForImport 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-26 15:38:25 -02:00
Kozioł Marcin
c4dc201f4a Translated using Weblate (Polish) 
Currently translated at 81.2% (2952 of 3207 strings)

[CI skip]
 2017-11-26 17:11:35 +01:00
Kuba Niewiarowski
7ba96feed0 Translated using Weblate (Polish) 
Currently translated at 81.2% (2607 of 3207 strings)

[CI skip]
 2017-11-26 17:07:03 +01:00
Varanka Zoltán
f2b46cccaa Translated using Weblate (Hungarian) 
Currently translated at 98.4% (3157 of 3207 strings)

[CI skip]
 2017-11-26 15:47:39 +01:00
Varanka Zoltán
337ec5ade9 Translated using Weblate (Hungarian) 
Currently translated at 95.6% (3134 of 3278 strings)

[CI skip]
 2017-11-26 15:47:30 +01:00
Renato dos Santos
c8269c0dba Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.8% (3240 of 3278 strings)

[CI skip]
 2017-11-26 14:49:59 +01:00
Aref Ben Lazrek
7ddd26f813 Translated using Weblate (Arabic) 
Currently translated at 49.3% (1583 of 3207 strings)

[CI skip]
 2017-11-26 12:44:30 +01:00
Aref Ben Lazrek
5c32831863 Translated using Weblate (Arabic) 
Currently translated at 48.1% (1578 of 3278 strings)

[CI skip]
 2017-11-26 12:44:22 +01:00
Володимир Бриняк
7b424c19be Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-26 12:04:05 +01:00
Maurício Meneghini Fauth
ec3591fe60 Remove getHtmlForImportOptionsFile method 
Replace getHtmlForImportOptionsFile method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
7e81e5e09e Use template for getHtmlForImportOptionsFile 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
db607e7fa8 Remove getHtmlForImportOptionsSubmit method 
Replace getHtmlForImportOptionsSubmit method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
4ea6e68b37 Remove getHtmlForImportOptionsFormat method 
Replace getHtmlForImportOptionsFormat method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
4ef1e098d2 Remove getHtmlForImportOptionsOther method 
Replace getHtmlForImportOptionsOther method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
8f12613b7b Remove getHtmlForImportOptionsPartialImport method 
Replace getHtmlForImportOptionsPartialImport method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
8502c2ad47 Remove getHtmlForImportCharset method 
Replace getHtmlForImportCharset method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
1c4390205c Remove getHtmlForImportOptions method 
Replace getHtmlForImportOptions method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
2f511140ae Remove getHtmlForImportCompressions method 
Replace getHtmlForImportCompressions method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
3d688660af Remove getHtmlForImportJs method 
Replace getHtmlForImportJs method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
96a1f01a62 Remove getHtmlForHiddenInputs method 
Replace getHtmlForHiddenInputs method with the template call.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
ef7936af09 Use template for getHtmlForImportCharset 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
aeef8e5418 Use template for getHtmlForImportCompressions 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
33330d7a7b Use template for getHtmlForImportJs 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00