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

111909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Domen
2b3f395233 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-23 23:59:39 +01:00
Kristjan Räts
4da5b82daf Translated using Weblate (Estonian) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-23 19:41:25 +01:00
Michal Čihař
b0312fb8c5 Add u2f/2fa deps to require-dev 
This way they do not have to be manually installed on Travis.
 2017-11-23 16:56:52 +01:00
Michal Čihař
486ae2fd54 Warn when U2F is about to be used without https 
All browsers refuse to authenticate with http.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 15:57:50 +01:00
Michal Čihař
49281037e3 Replace original Google u2f-api with u2f-api-polyfill 
This gracefully handles Firefox 57 native API as well.

Fixes #13830

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 15:56:18 +01:00
Michal Čihař
3946dbdf0c Ensure Session::secure has empty session 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 15:45:24 +01:00
Michal Čihař
c00aa5170b Use current u2f API 
This has been changed and the Firefox extension I've used for testing
did still support old one while Chrome does only support new one.

Fixes #13829

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 15:01:17 +01:00
Michal Čihař
af69e3b7ac Do not show ui for configuring 2fa if no backends are found 
Fixes #13825

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 13:57:44 +01:00
Michal Čihař
602d07d8aa Fix markup in two factor auth configuration 
Issue #13787

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 13:57:44 +01:00
Michal Čihař
a59af11ba1 Remove things not needed for u2f 
Issue #13787

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-23 13:57:44 +01:00
Andrey Balamut
81b39e7704 Translated using Weblate (Russian) 
Currently translated at 98.5% (3232 of 3278 strings)

[CI skip]
 2017-11-23 13:57:27 +01:00
Burak Yavuz
0693d61bcd Translated using Weblate (Turkish) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-23 08:19:29 +01:00
Maurício Meneghini Fauth
ce73bdbbab Use template for kanjiEncodingForm method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-22 23:19:49 -02:00
Maurício Meneghini Fauth
2e038bd5cd Use template for getHtmlForImportOptionsFormat 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-22 23:19:49 -02:00
Weblate
621bd1d70e Merge remote-tracking branch 'origin/master' 2017-11-22 23:57:55 +01:00
Giovanni Sora
160b2bbe45 Translated using Weblate (Interlingua) 
Currently translated at 75.2% (2466 of 3278 strings)

[CI skip]
 2017-11-22 23:57:51 +01:00
Isaac Bennetch
6aec66fe37 Improvements to two-factor documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-22 17:56:21 -05:00
Isaac Bennetch
31481e1b7a Update po files 
[CI skip]

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-22 15:57:55 -05:00
Isaac Bennetch
b81b03b376 Minor grammar fix and match existing styles 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-11-22 15:56:18 -05:00
Maurício Meneghini Fauth
63ac8cd82d Use template for getHtmlForImportOptionsOther 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-22 15:22:26 -02:00
Maurício Meneghini Fauth
5fc2c010da Use template for getHtmlForImportOptionsPartialImport 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-21 22:43:17 -02:00
dingo thirteen
befd0faba6 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-21 20:45:19 +01:00
Airon Luis Pereira
f0a4e78b9e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.9% (3242 of 3278 strings)

[CI skip]
 2017-11-21 15:43:31 +01:00