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

110124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michal Čihař
767c0bf63f Document when SignonScript has been introduced 
See #13400

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 16:29:29 +02:00
Michal Čihař
44361b02db Use consistent look for operations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 16:26:00 +02:00
Michal Čihař
7a139816d1 Remove explicit size attributes from operation inputs 
There is really no reason to specify this for every input.

Issue #13145

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 16:26:00 +02:00
Weblate
dcd2a97ad9 Merge remote-tracking branch 'origin/master' 2017-06-28 16:16:56 +02:00
Giovanni Sora
42cbf101b2 Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2425 of 3211 strings)

[CI skip]
 2017-06-28 16:16:53 +02:00
Michal Čihař
edad6fc2d9 Remove custom layout for operations pages 
Using plain layout looks better in most situations. Maybe we should
limit width as well, but I'm not sure about that.

Fixes #13145
Obsoletes #13339
Obsoletes #13369

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 16:16:37 +02:00
Michal Čihař
157dc8d162 Merge branch 'QA_4_7' 2017-06-28 16:06:41 +02:00
Michal Čihař
a78b963025 Changelog entry for #12944 and #13317 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 16:02:26 +02:00
Michal Čihař
0ded26965b Merge pull request #13317 from manishbisht/json-editor 
JSON data shown in JSON format while editing
 2017-06-28 17:01:26 +03:00
Weblate
1bc5f1fc5c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-28 15:44:28 +02:00
Viktar Vauchkevich
a586ca7a24 Translated using Weblate (Belarusian) 
Currently translated at 63.2% (2027 of 3203 strings)

[CI skip]
 2017-06-28 15:44:24 +02:00
Michal Čihař
688143af8f Merge branch 'QA_4_7' 2017-06-28 15:44:03 +02:00
Michal Čihař
3e6f5f1847 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-06-28 15:43:47 +02:00
Weblate
ef6085d551 Merge remote-tracking branch 'origin/master' 2017-06-28 15:42:13 +02:00
Viktar Vauchkevich
b397b40b1b Translated using Weblate (Belarusian) 
Currently translated at 63.3% (2034 of 3211 strings)

[CI skip]
 2017-06-28 15:42:08 +02:00
Michal Čihař
4ee38fe8d0 Merge branch 'QA_4_7' 2017-06-28 15:41:55 +02:00
Michal Čihař
49c963542d Add tests for both paths in curl 
Test both CURLOPT_CAPATH and URLOPT_CAINFO setup.

Fixes #13398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 15:41:47 +02:00