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

111689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Володимир Бриняк
a6d2136370 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3267 of 3267 strings)

[CI skip]
 2017-11-04 11:06:55 +01:00
Burak Yavuz
e6ca6b4bac Translated using Weblate (Turkish) 
Currently translated at 100.0% (3267 of 3267 strings)

[CI skip]
 2017-11-03 19:46:52 +01:00
Maurício Meneghini Fauth
ff626c8b16 Fix wrong property value in ServerDatabasesControllerTest 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-03 12:29:57 -02:00
Maurício Meneghini Fauth
2ae2b8b54e Use template for server databases table 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-03 11:31:01 -02:00
Weblate
9ae4ae8220 Merge remote-tracking branch 'origin/master' 2017-11-03 01:28:30 +01:00
Domen
808ed05145 Translated using Weblate (Slovenian) 
Currently translated at 99.6% (3255 of 3267 strings)

[CI skip]
 2017-11-03 01:28:28 +01:00
Giovanni Sora
7f72399518 Translated using Weblate (Interlingua) 
Currently translated at 75.1% (2454 of 3267 strings)

[CI skip]
 2017-11-03 01:28:21 +01:00
Maurício Meneghini Fauth
ff38d5c5eb Move sub page header to index template 
Move server/sub_page_header template from ServerDatabasesController
to server/databases/index template

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 22:26:47 -02:00
Maurício Meneghini Fauth
79f6f88bff Use template for server sub page header 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 22:26:47 -02:00
Maurício Meneghini Fauth
6672d4f2ea Use template for server databases index 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 22:26:47 -02:00
Weblate
da2697bd99 Merge remote-tracking branch 'origin/master' 2017-11-02 21:13:29 +01:00
Burak Yavuz
8a5cc2273f Translated using Weblate (Turkish) 
Currently translated at 98.9% (3232 of 3267 strings)

[CI skip]
 2017-11-02 21:13:28 +01:00
Viktar Vauchkevich
14347bcac0 Translated using Weblate (Belarusian) 
Currently translated at 63.1% (2062 of 3267 strings)

[CI skip]
 2017-11-02 21:13:18 +01:00
Maurício Meneghini Fauth
bbb349af4a Fix foreign key table always empty 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-02 18:11:22 -02:00
Weblate
6d0509713e Merge remote-tracking branch 'origin/master' 2017-11-02 14:54:06 +01:00
Giovanni Sora
4e629e97c7 Translated using Weblate (Interlingua) 
Currently translated at 74.1% (2424 of 3267 strings)

[CI skip]
 2017-11-02 14:54:03 +01:00
Michal Čihař
333393a492 Merge branch 'QA_4_7' 2017-11-02 14:53:44 +01:00
Giovanni Sora
2c86f7be3a Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2423 of 3207 strings)

[CI skip]
 2017-11-02 14:53:31 +01:00
Michal Čihař
95b8235d4a Move sprites data caching to Theme class 
The data is constant for theme, so we don't have to deal with cache
invalidation in testsuite and in corner cases.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:53:20 +01:00
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ř
f8559aeb78 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-02 14:03:48 +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