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

111877 Commits

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

[CI skip]
 2017-11-20 20:19:45 +01:00
dingo thirteen
a828eebc6f Translated using Weblate (Dutch) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-20 20:14:32 +01:00
Guilherme Souza Silva
82dfa7f910 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.9% (3242 of 3278 strings)

[CI skip]
 2017-11-20 17:33:19 +01:00
Miro Baía
8abee6b48b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.9% (3242 of 3278 strings)

[CI skip]
 2017-11-20 17:28:40 +01:00
Maurício Meneghini Fauth
414f47ae77 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.9% (3242 of 3278 strings)

[CI skip]
 2017-11-20 04:48:29 +01:00
Weblate
a83c1bf6e5 Merge remote-tracking branch 'origin/master' 2017-11-19 04:27:29 +01:00
Maurício Meneghini Fauth
c8c696cb4d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.6% (3235 of 3278 strings)

[CI skip]
 2017-11-19 04:27:27 +01:00
Maurício Meneghini Fauth
a622e859c6 Fix wrong backslash escape in twig 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-19 01:26:14 -02:00
Maurício Meneghini Fauth
d498b0c489
Merge pull request #13819 from mauriciofauth/display-results 
Use templates for some of Display/Results methods
 2017-11-19 01:13:53 -02:00
Maurício Meneghini Fauth
f50cac4d86 Use template for _buildEmptyDisplay method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-19 00:36:22 -02:00
Maurício Meneghini Fauth
bdb35e5769 Use template for _buildNullDisplay method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-19 00:28:44 -02:00
Maurício Meneghini Fauth
70e9ec0fcd Use template for _buildValueDisplay 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 23:40:56 -02:00
Maurício Meneghini Fauth
9d79d04af7 Use template for _getCommentForRow 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 23:15:02 -02:00
Maurício Meneghini Fauth
fdf7cd75db Use template for _getFormForMultiRowOperations 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 21:29:02 -02:00
Maurício Meneghini Fauth
f513738e7a Use template for _getOptionsBlock 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 20:27:02 -02:00
Maurício Meneghini Fauth
dfa796be07 Use template for _getTableNavigationButton 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 20:27:02 -02:00
Maurício Meneghini Fauth
1852c2c4da Use template for _getAdditionalFieldsForTableNavigation 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 20:27:02 -02:00
Maurício Meneghini Fauth
dba5237520 Use template for _getShowAllCheckboxForTableNavigation 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-18 20:27:02 -02:00
tmtisfree
92b82765af Translated using Weblate (French) 
Currently translated at 100.0% (3278 of 3278 strings)

[CI skip]
 2017-11-18 14:22:42 +01:00
Weblate
4a8dd6b607 Merge remote-tracking branch 'origin/master' 2017-11-18 13:45:30 +01:00
Андрей
9d49ea8ef5 Translated using Weblate (Russian) 
Currently translated at 98.3% (3225 of 3278 strings)

[CI skip]
 2017-11-18 13:45:28 +01:00
tmtisfree
e41ad0c623 Translated using Weblate (French) 
Currently translated at 99.0% (3247 of 3278 strings)

[CI skip]
 2017-11-18 13:45:23 +01:00
Michal Čihař
e09575f5c7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-11-18 13:44:29 +01:00
Michal Čihař
b6a8589037 Merge branch 'QA_4_7' 2017-11-18 13:44:15 +01:00
Michal Čihař
187acd9955 Merge remote-tracking branch 'origin/QA_4_7' 2017-11-18 13:44:12 +01:00
Michal Čihař
facc536689 Detect another way MySQL server needs SSL 
Fixes #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-18 13:43:53 +01:00
Viktar Vauchkevich
06d0d5f941 Translated using Weblate (Belarusian) 
Currently translated at 63.1% (2071 of 3278 strings)

[CI skip]
 2017-11-18 06:44:34 +01:00
Michal Čihař
152c4857c2
Merge pull request #13817 from nijel/link-or-button 
Simplify handling of long URLs in Util::linkOrButton
 2017-11-16 18:52:07 +01:00
Michal Čihař
4669a589c6 Translated using Weblate (Welsh) 
Currently translated at 15.7% (515 of 3278 strings)

[CI skip]
 2017-11-16 17:14:33 +01:00
Michal Čihař
5b71117936 Translated using Weblate (Welsh) 
Currently translated at 16.2% (522 of 3207 strings)

[CI skip]
 2017-11-16 17:14:20 +01:00
Aled Powell
c7eeb20ebe Translated using Weblate (Welsh) 
Currently translated at 16.2% (522 of 3207 strings)

[CI skip]
 2017-11-16 17:13:50 +01:00
Weblate
a08d13813e Merge remote-tracking branch 'origin/master' 2017-11-16 16:40:16 +01:00