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

111937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maurício Meneghini Fauth
0d2e214c58 Remove getHtmlForImportWithPlugin method 
Replace getHtmlForImportWithPlugin 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
45860954cd Use template for getHtmlForImportWithPlugin 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
ce50bd64ce Use template for getHtmlForHiddenInputs 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
dfd8abaae6 Use template for getHtmlForImportOptions 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
Maurício Meneghini Fauth
6e5fbd7403 Use template for getHtmlForImportOptionsSubmit 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-25 17:37:14 -02:00
anonymous
7de0b3fa31 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.8% (3239 of 3278 strings)

[CI skip]
 2017-11-25 14:22:21 +01:00
Renato dos Santos
48aeb1fd8f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.7% (3238 of 3278 strings)

[CI skip]
 2017-11-25 14:21:56 +01:00
Mauricio Bastos
71108bd9e3 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.7% (3237 of 3278 strings)

[CI skip]
 2017-11-25 14:20:22 +01:00
Renato dos Santos
69e1a21eed Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.7% (3236 of 3278 strings)

[CI skip]
 2017-11-25 14:12:37 +01:00
Mauricio Bastos
33a8e0473a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.6% (3197 of 3207 strings)

[CI skip]
 2017-11-25 03:49:00 +01:00
Kristjan Räts
81eb162e40 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-24 19:45:55 +01:00
Weblate
002c97ebfe Merge remote-tracking branch 'origin/master' 2017-11-24 09:34:45 +01:00
Matteo Regazzi
40e14faf71 Translated using Weblate (Italian) 
Currently translated at 99.5% (3264 of 3278 strings)

[CI skip]
 2017-11-24 09:34:41 +01:00
Michal Čihař
b459838606 Unset all session entries on creating new session 
Issue #13828

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-24 09:34:18 +01:00
Weblate
31d00c97b0 Merge remote-tracking branch 'origin/master' 2017-11-24 09:18:05 +01:00
Mauricio Bastos
819061a503 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.6% (3235 of 3278 strings)

[CI skip]
 2017-11-24 09:18:02 +01:00
Viktar Vauchkevich
1b68e153e1 Translated using Weblate (Belarusian) 
Currently translated at 63.1% (2071 of 3278 strings)

[CI skip]
 2017-11-24 09:17:47 +01:00
Michal Čihař
5867fad0ba Deny login if two factor is configured, but not available 
Fixes #13832

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-24 09:17:29 +01:00