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

111669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
cca4146ef6 Simplify code generating doc URL 
The testsuite case can be same as default.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:53:20 +01:00
Weblate
a071cfc795 Merge remote-tracking branch 'origin/master' 2017-11-02 14:40:48 +01:00
Giovanni Sora
2ae956387c Translated using Weblate (Interlingua) 
Currently translated at 74.0% (2420 of 3267 strings)

[CI skip]
 2017-11-02 14:40:45 +01:00
Maurício Meneghini Fauth
f388a41b04 Fix undefined index notices 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 11:37:33 -02:00
Michal Čihař
1adf9a493f Revert "Cache already loaded templates" 
This reverts commit 56ff2afb74.

The caching is already done in Twig, no need to duplicate it.
 2017-11-02 14:29:53 +01:00
Michal Čihař
369b0edb42 Remove test for no longer used PMA_TEST_THEME 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:25:40 +01:00
Michal Čihař
56ff2afb74 Cache already loaded templates 
This should improve performance when loading many small templates.

Issue #13711

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:11:16 +01:00
Michal Čihař
cae0ac8947 Use static property rather than static variable for caching twig environment 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:09:41 +01:00
Michal Čihař
ab86c9d84c Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:01:38 +01:00
Michal Čihař
f7d2997d79 Use php for fixing line information in the Gettext files 
The debug information actually maps ranges, not individual lines, so it
needs more logic.

Also the sed was really slow (as it had to replace all lines).

Issue #13344

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:00:00 +01:00
Michal Čihař
2ed0142950 Avoid using concatenation in |trans filter 
The generated PHP code can not be extracted using xgettext.

This is workaround for #13794, should be reverted after proper fix.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 13:41:04 +01:00
Michal Čihař
5a2a115e88 Include correct line information in Gettext files for twig templates 
Fixes #13344

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 13:31:27 +01:00
Michal Čihař
12dbfff7e9 Generate consistent translator comments in twig code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 09:17:22 +01:00
Michal Čihař
5acd64f84d Use two-factor authentication instead fo second authentication factor 
This is probably more widely used naming.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 09:05:18 +01:00
Michal Čihař
192edd9324 Add wikipedia link for TOTP 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 08:41:57 +01:00
Michal Čihař
5a401b192e Changelog entry for #6197 and #13787 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 08:40:14 +01:00
Maurício Meneghini Fauth
96ba136b44
Merge pull request #13785 from mauriciofauth/templates 
Port templates to Twig and remove PHP templates support
 2017-11-02 00:04:02 -02:00
Maurício Meneghini Fauth
38646a32f2
Fix typo in privileges/resource_limits template 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-01 21:31:04 +00:00
Michal Čihař
0fdc80ba9f Merge branch 'QA_4_7' 2017-11-01 18:14:03 +01:00
Michal Čihař
45d1924e70
Merge pull request #13787 from nijel/second-factor 
Second authentication factor
 2017-11-01 18:13:12 +01:00
Michal Čihař
947c1ace03 Share code for getting server URL and use it in 2FA as well 
This way multiple phpMyAdmin installations can be identified.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:55:48 +01:00
Michal Čihař
c5b0da38cd Properly test second factor check 
The default code does session caching, we want to avoid it in the tests.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:35:12 +01:00
Michal Čihař
75c7d9b995 Install optional dependencies on Scrutinizer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
2af38a3de8 Improved FIDO U2F error reporting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
e67ea08eae Properly update FIDO U2F counter on login 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
c64e52c3c0 Test registration and authentication for FIDO U2F 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
d6d84a7607 Share code for error report in second factor 
...and test it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
0d14ba065c Share and test code for listing backends 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
dd3154b103 Test check method for simple second factor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
b5e5f4e8c8 Simplify second factor auth API 
We now only pass SecondFactor object to plugins, not individual
parameters.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:39 +01:00
Michal Čihař
540b78dc2e Add support for FIDO U2F authentication 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:31 +01:00
Michal Čihař
047a6ac3f7 Add documentation for second authentication factor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:31 +01:00
Michal Čihař
8c9abb9888 Add configuration for second authentication factor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:31 +01:00
Michal Čihař
869131f59c Add support for HOTP and TOTP authentication 
This supports Google Authenticator and similar applications.

Issue #6197

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:18 +01:00
Michal Čihař
a646d4314e Add generic interface for second authentication factor 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 16:34:14 +01:00
Maurício Meneghini Fauth
3bb5e0d732 Fix wrong incremental order 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-01 12:44:56 -02:00
Maurício Meneghini Fauth
569ee91f2a Merge branch 'master' into templates 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-01 12:06:09 -02:00
Weblate
069cb028a8 Merge remote-tracking branch 'origin/master' 2017-11-01 10:24:59 +01:00
Jira Aphisitworachorch
78b21da312 Translated using Weblate (Thai) 
Currently translated at 28.3% (916 of 3231 strings)

[CI skip]
 2017-11-01 10:24:58 +01:00
Weblate
230fdee4b2 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-11-01 10:24:56 +01:00
Jira Aphisitworachorch
0afdf4e921 Translated using Weblate (Thai) 
Currently translated at 28.8% (926 of 3205 strings)

[CI skip]
 2017-11-01 10:24:55 +01:00
Michal Čihař
c50bad8fa5 Merge branch 'QA_4_7' 2017-11-01 10:24:17 +01:00
Michal Čihař
5aa9727eb0 Clarify comment and add another host to ignore list 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-01 10:24:09 +01:00
Michal Čihař
931c1c7f72 Merge branch 'QA_4_7' 2017-10-31 19:55:06 +01:00
Michal Čihař
8ed94542c0 Workaround SNI problems on readthedocs.org 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 19:54:48 +01:00
Michal Čihař
a513a7550a Propagate possible failure from saving prefs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 16:13:02 +01:00
Michal Čihař
6b8a9b7aec Decode user preferences as array 
We really want an array here, not an object. Type casting to array helps
only for top level element.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 13:32:51 +01:00
Michal Čihař
28ade643cf Add Util_showDocu Twig tag 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-31 13:32:51 +01:00
Michal Čihař
08ce2fb122 Remove dubugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 14:43:14 +01:00
Michal Čihař
0ccaf0ac91 Use templates for rendering header and footer of login page 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-10-30 14:40:44 +01:00