gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,297 Commits 12 Branches 481 Tags 2.4 GiB
91d3d0953e
Commit Graph

109297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
91d3d0953e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-10 14:35:57 +02:00
test
18c7e718ed Translated using Weblate (Croatian) 
Currently translated at 27.7% (888 of 3203 strings)

[CI skip]
 2017-07-10 14:35:54 +02:00
Michal Čihař
85747b9ae9 Use usort() instead of natsort() 
The natsoft has side effect of producit associated array, what is later
represented as object if encoded to JSON and breaking code expect array
instead.

Fixes #13465

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-10 14:34:12 +02:00
Michal Čihař
36ea981bdd Fix format string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:18:55 +02:00
Michal Čihař
ee1ce07970 Fixed version check when not connected to a database 
Fixes #13437

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:15:47 +02:00
Michal Čihař
10b04f175a Fix website URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 11:14:05 +02:00
Michal Čihař
a4ec378179 Move spacing around buttons to Util::getMessage 
We really do not want to add spacing around all buttons, just the ones
in the SQL message.

Fixes #13445

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-07-09 10:50:22 +02:00
Weblate
67b0180ba9 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-08 12:48:15 +02:00
zhangmiao
57fc8e8cf7 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 85.8% (2751 of 3203 strings)

[CI skip]
 2017-07-08 12:48:12 +02:00
yagoub fadel
b9314f1d80 Translated using Weblate (Arabic) 
Currently translated at 49.3% (1581 of 3203 strings)

[CI skip]
 2017-07-08 12:48:11 +02:00
Madhura Jayaratne
d8f11a84a4 Fix #13447 Large multi-line query removes Export operation and blanks query box options 
This is not a guaranteed method of detecting image upload into a BLOB field

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2017-07-08 20:47:45 +10:00
Michal Čihař
4f16801f04 Translated using Weblate (Arabic) 
Currently translated at 48.3% (1548 of 3203 strings)

[CI skip]
 2017-07-05 08:22:05 +02:00
yagoub fadel
cb84500c1d Translated using Weblate (Arabic) 
Currently translated at 48.3% (1548 of 3203 strings)

[CI skip]
 2017-07-05 08:14:35 +02:00
Володимир Бриняк
b92a328e7f Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-07-04 15:48:25 +02:00
Michal Čihař
3fd0bffe66 Translated using Weblate (Arabic) 
Currently translated at 41.6% (1334 of 3203 strings)

[CI skip]
 2017-07-01 09:21:36 +02:00
Weblate
432726a920 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-07-01 09:20:43 +02:00
Aron Bergman
7633018897 Translated using Weblate (Swedish) 
Currently translated at 95.0% (3043 of 3203 strings)

[CI skip]
 2017-07-01 09:20:42 +02:00
Michal Čihař
9f60273f16 Translated using Weblate (Czech) 
Currently translated at 91.9% (2946 of 3203 strings)

[CI skip]
 2017-07-01 09:20:38 +02:00
yagoub fadel
5a2f96df86 Translated using Weblate (Arabic) 
Currently translated at 41.6% (1334 of 3203 strings)

[CI skip]
 2017-07-01 09:20:20 +02:00
Michal Čihař
f0e92a9bfd Sync script with master 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-30 13:19:26 +02:00
Michal Čihař
125d4a1823 Removing composer.lock 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-30 13:19:10 +02:00
Michal Čihař
a2836768d0 Fix format string 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-30 13:17:05 +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
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
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
4b3adeb8cd Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-29 08:07:53 +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ř
f73f75d7f5 Clarify sites this targets 
See #13398

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-29 08:07:05 +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ř
6c42802118 Fix DarwinSSL detection 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-28 18:41:46 +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
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ř
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ř
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
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ř
3e6f5f1847 Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-06-28 15:43:47 +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
Weblate
a2d71c5d24 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-28 15:21:04 +02:00
Burak Yavuz
19fe294049 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 15:21:03 +02:00
George Bezerra
b6666e4bc0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3203 of 3203 strings)

[CI skip]
 2017-06-28 15:21:02 +02:00