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

110141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
4b6e774865 Merge remote-tracking branch 'origin/QA_4_7' 2017-06-30 13:21:38 +02:00
Michal Čihař
dc57e15e1b Merge commit 'bd6b96f00d0399ab0ee87dbf7a786d17be6038cc' 2017-06-30 13:21:27 +02:00
Michal Čihař
28c20d2743 Merge commit '9bc46b72c6f0fd26b4a8cc402dbe6674e4b3f2fe' 2017-06-30 13:20:39 +02:00
Michal Čihař
f9503fce90 Merge commit '704ebb01136b0d88a80c9903e5f4f150fe716626' 2017-06-30 13:20:29 +02:00
Michal Čihař
43fafba83c Translated using Weblate (Arabic) 
Currently translated at 39.6% (1273 of 3211 strings)

[CI skip]
 2017-06-30 11:19:23 +02:00
Michal Čihař
a69a0f3069 Translated using Weblate (Arabic) 
Currently translated at 39.9% (1280 of 3203 strings)

[CI skip]
 2017-06-30 11:19:18 +02:00
yagoub fadel
035d5d6a36 Translated using Weblate (Arabic) 
Currently translated at 39.9% (1280 of 3203 strings)

[CI skip]
 2017-06-30 11:16:24 +02:00
Maurício Meneghini Fauth
7bc4e18a53 Merge pull request #13423 from CommanderRoot/patch-1 
Properly fix #13420
 2017-06-30 01:02:15 -03:00
CommanderRoot
f52faf1f7f Properly fix #13420 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-06-30 05:50:43 +02:00
Weblate
0f4baa8967 Merge remote-tracking branch 'origin/master' 2017-06-30 00:57:01 +02:00
yagoub fadel
f26a5d1fdf Translated using Weblate (Arabic) 
Currently translated at 39.6% (1273 of 3211 strings)

[CI skip]
 2017-06-30 00:56:53 +02:00
Maurício Meneghini Fauth
f012039d47 Merge pull request #13420 from CommanderRoot/patch-1 
Remove double escaping
 2017-06-29 19:56:41 -03:00
CommanderRoot
dfb33462bb Remove double escaping 
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
 2017-06-29 23:26:11 +02:00
Isaac Bennetch
bd6b96f00d Prepare for 4.7.3-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-06-29 15:25:11 -04:00
Weblate
9bc46b72c6 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-29 21:22:11 +02:00
yagoub fadel
101411a789 Translated using Weblate (Arabic) 
Currently translated at 35.2% (1129 of 3203 strings)

[CI skip]
 2017-06-29 21:22:08 +02:00
Isaac Bennetch
704ebb0113 Adding composer lock for 4.7.2 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-06-29 13:23:55 -04:00
Isaac Bennetch
cd0c255982 Prepare for 4.7.2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-06-29 13:02:10 -04:00
Weblate
0d2e48b644 Merge remote-tracking branch 'origin/master' 2017-06-29 17:26:35 +02:00
yagoub fadel
f2b8f6f1cf Translated using Weblate (Arabic) 
Currently translated at 34.9% (1123 of 3211 strings)

[CI skip]
 2017-06-29 17:26:28 +02:00
Maurício Meneghini Fauth
fed497d97e Merge pull request #13416 from mauriciofauth/templates 
Port some templates to Twig
 2017-06-29 12:26:21 -03:00
Michal Čihař
da09332249 Merge remote-tracking branch 'origin/QA_4_7' 2017-06-29 08:20:27 +02:00
Michal Čihař
581e0226ee Translated using Weblate (Arabic) 
Currently translated at 34.9% (1123 of 3211 strings)

[CI skip]
 2017-06-29 08:19:16 +02:00
Michal Čihař
dc4437c288 Translated using Weblate (Arabic) 
Currently translated at 35.2% (1129 of 3203 strings)

[CI skip]
 2017-06-29 08:19:08 +02:00
Weblate
e0e40c2fd0 Merge remote-tracking branch 'origin/master' 2017-06-29 08:07:56 +02:00
Weblate
4b3adeb8cd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-29 08:07:53 +02:00
yagoub fadel
d278346dec Translated using Weblate (Arabic) 
Currently translated at 34.9% (1123 of 3211 strings)

[CI skip]
 2017-06-29 08:07:48 +02:00
yagoub fadel
208debcdfe Translated using Weblate (Arabic) 
Currently translated at 35.2% (1129 of 3203 strings)

[CI skip]
 2017-06-29 08:07:47 +02:00
Michal Čihař
9d43025673 Merge branch 'QA_4_7' 2017-06-29 08:07:29 +02:00
Michal Čihař
6469ca5fc8 Merge remote-tracking branch 'origin/QA_4_7' 2017-06-29 08:07:26 +02:00
Michal Čihař
f73f75d7f5 Clarify sites this targets 
See #13398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-29 08:07:05 +02:00
Maurício Meneghini Fauth
4c92fd5827 Port templates to Twig 
- Port export templates to Twig
- Port javascript/display template to Twig
- Port list templates to Twig

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-29 01:34:18 -03:00
Franco
3048161603 Translated using Weblate (Spanish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2017-06-28 20:10:44 +02:00
Franco
ef4a3ad98e Translated using Weblate (Spanish) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 20:07:36 +02:00
Michal Čihař
0aae5bd2c7 Merge branch 'QA_4_7' 2017-06-28 18:41:51 +02:00
Michal Čihař
6c42802118 Fix DarwinSSL detection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 18:41:46 +02:00
Michal Čihař
a0d87a07cd Merge branch 'QA_4_7' 2017-06-28 18:32:17 +02:00
Michal Čihař
6065c01ecf Merge remote-tracking branch 'origin/QA_4_7' 2017-06-28 18:32:15 +02:00
Michal Čihař
949a74d4d5 Skip CURLOPT_CAPATH and CURLOPT_CAINFO tests on unsupported platforms 
These flags are not supported on some of the platforms, see
https://curl.haxx.se/docs/ssl-compared.html

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 18:31:22 +02:00
Domen
2a396eef88 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 18:31:14 +02:00
dingo thirteen
9eb7a97f81 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 18:31:12 +02:00
dingo thirteen
7838f2219b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2017-06-28 18:11:02 +02:00
Domen
1e36822151 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2017-06-28 17:31:09 +02:00
Michal Čihař
5434ea42c8 Merge branch 'QA_4_7' 2017-06-28 17:24:43 +02:00
Michal Čihař
061f68a67a Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-06-28 17:24:22 +02:00
Michal Čihař
173fee5c94 Merge branch 'QA_4_7' 2017-06-28 17:24:03 +02:00
Michal Čihař
d9fbcf4158 Include DST Root CA X3 certificate 
Apparently some CURL versions have problems with ISRG Root X1, so let's
include another root as well.

Unfortunately the error messages are generic, so it's hard to tell what
is actually wrong, but I guess it is lack of support for some algos used
by ISRG root.

Issue #13398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 17:22:46 +02:00
Weblate
85c698935d Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-28 16:30:49 +02:00
Giovanni Sora
dbd53d0d74 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2421 of 3203 strings)

[CI skip]
 2017-06-28 16:30:46 +02:00
Michal Čihař
e1ed5b7382 Merge branch 'QA_4_7' 2017-06-28 16:30:23 +02:00