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

109973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2d52373b26 Merge branch 'QA_4_7' 2017-06-15 17:10:01 +02:00
Michal Čihař
40a0dba5e1 Silent hash_equals warnings 
This can happen in case of params get converted to integers.

Fixes #13390

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-15 17:08:38 +02:00
Michal Čihař
96ec99ea22 Merge branch 'QA_4_7' 2017-06-15 16:46:34 +02:00
Michal Čihař
29b68ce92f Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7 2017-06-15 16:46:20 +02:00
Michal Čihař
990b8163b4 Merge branch 'QA_4_7' 2017-06-15 16:45:35 +02:00
Michal Čihař
3675c1ef94 Remove coveralls support 
Their PHP code seems unmaintained and Codecov serves better our purposes
(it can better track pull request changes).

Fixes #12716

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-15 16:44:34 +02:00
Weblate
0251931c3e Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-06-15 16:28:41 +02:00
Володимир Бриняк
fdeba3b5ce Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-15 16:28:41 +02:00
Burak Yavuz
7af4fa2932 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-15 16:28:41 +02:00
Domen
af52e457b3 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-15 16:28:40 +02:00
Māris
0f42586cce Translated using Weblate (Latvian) 
Currently translated at 17.4% (560 of 3204 strings)

[CI skip]
 2017-06-15 16:28:39 +02:00
Giovanni Sora
e1e5fe326f Translated using Weblate (Interlingua) 
Currently translated at 75.5% (2421 of 3204 strings)

[CI skip]
 2017-06-15 16:28:38 +02:00
dingo thirteen
69a07470f3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-15 16:28:38 +02:00
Viktar Vauchkevich
f383b68ead Translated using Weblate (Belarusian) 
Currently translated at 62.4% (2000 of 3204 strings)

[CI skip]
 2017-06-15 16:28:37 +02:00
Michal Čihař
a22b48351e Merge branch 'QA_4_7' 2017-06-15 16:27:55 +02:00
Michal Čihař
c8d7fc4024 Merge commit '2dee421a72824a5493bcf816d6baeb74bc3584c9' 2017-06-15 16:27:21 +02:00
Michal Čihař
14f738c262 Show only supported charsets for conversion 
Fixes #13388

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-15 16:26:54 +02:00
Michal Čihař
d45e61efc5 Avoid PHP errors with non existing configuration on OS X 
It sems that @ does notwork on fileperms there according to error
reports.

Fixes #13386

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-15 16:04:52 +02:00
Weblate
d3e7ebff2e Merge remote-tracking branch 'origin/master' 2017-06-15 11:59:49 +02:00
Burak Yavuz
c42427cf17 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-15 11:59:48 +02:00
Michal Čihař
ab7531810c Merge pull request #13381 from mauriciofauth/js-vendor 
Move third-party js libraries to js/vendor
 2017-06-15 11:59:34 +02:00
Weblate
38c6c4278d Merge remote-tracking branch 'origin/master' 2017-06-15 08:51:12 +02:00
Burak Yavuz
7d0ca5fffe Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-15 08:51:12 +02:00
Viktar Vauchkevich
9139a61f6a Translated using Weblate (Belarusian) 
Currently translated at 62.4% (2007 of 3212 strings)

[CI skip]
 2017-06-15 08:51:03 +02:00
Deven Bansod
a270570e82 ChangeLog for #13384 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-06-15 12:20:42 +05:30
Deven Bansod
059ffe64ed Use better way to form the Database link URLs 
Fix #13384

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2017-06-15 12:18:59 +05:30
Domen
59d35f63c5 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 22:11:15 +02:00
Володимир Бриняк
46a15c7fbf Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 20:12:17 +02:00
Weblate
ea5421bcab Merge remote-tracking branch 'origin/master' 2017-06-14 17:32:00 +02:00
Māris
a324c88940 Translated using Weblate (Latvian) 
Currently translated at 17.3% (557 of 3212 strings)

[CI skip]
 2017-06-14 17:31:58 +02:00
Stefano Martinelli
364b51a2e4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 17:31:57 +02:00
Giovanni Sora
1c9487b2e7 Translated using Weblate (Interlingua) 
Currently translated at 75.4% (2425 of 3212 strings)

[CI skip]
 2017-06-14 17:31:57 +02:00
dingo thirteen
96963916e3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-14 17:31:56 +02:00
Viktar Vauchkevich
cd8f4f2951 Translated using Weblate (Belarusian) 
Currently translated at 62.0% (1992 of 3212 strings)

[CI skip]
 2017-06-14 17:31:54 +02:00
Maurício Meneghini Fauth
d853b60762 Change octal escape with hexadecimal escape 
Octal escape sequences are not allowed in strict mode.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 12:31:43 -03:00
Maurício Meneghini Fauth
3770adbba3 Move js/codemirror to js/vendor/codemirror 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:15:29 -03:00
Maurício Meneghini Fauth
44929a3e7b Move js/sprintf.js to js/vendor/sprintf.js 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:06:55 -03:00
Maurício Meneghini Fauth
0c77c43782 Move js/js.cookie.js to js/vendor/js.cookie.js 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:04:29 -03:00
Maurício Meneghini Fauth
3f632ef7bc Move js/zxcvbn.js to js/vendor/zxcvbn.js 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 02:01:11 -03:00
Maurício Meneghini Fauth
47865ee3bb Move jqPlot to js/vendor 
Move js/jqplot to js/vendor/jqplot

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:26 -03:00
Maurício Meneghini Fauth
555156c85f Move openlayers to js/vendor 
Move js/openlayers to js/vendor/openlayers

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:26 -03:00
Maurício Meneghini Fauth
774150e54d Move tracekit.js to js/vendor 
Move js/tracekit/tracekit.js to js/vendor/tracekit.js

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:25 -03:00
Maurício Meneghini Fauth
61b7d5dfd8 Move js/jquery to js/vendor/jquery 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-06-14 01:57:25 -03:00
Burak Yavuz
a09ce953ba Translated using Weblate (Turkish) 
Currently translated at 100.0% (3212 of 3212 strings)

[CI skip]
 2017-06-13 18:32:43 +02:00
dingo thirteen
2dee421a72 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-13 18:13:34 +02:00
Stefano Martinelli
274ef03d42 Translated using Weblate (Italian) 
Currently translated at 100.0% (3204 of 3204 strings)

[CI skip]
 2017-06-13 18:07:55 +02:00
Michal Čihař
0cbe90430c Merge branch 'QA_4_7' 2017-06-13 17:35:44 +02:00
Michal Čihař
1ecf2561a1 Unmark field as required 
Otherwise the hidden field blocks form submission.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:35:27 +02:00
Michal Čihař
4f30297d38 Cache tracker enabled per table 
This can be executed quite a lot of times during import and there is no
reason to query database again during that.

Fixes #13318

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:34:55 +02:00
Michal Čihař
5fd7b2c9de Avoid getting tracking version for non tracked tables 
We won't use it anyway, so it's better to avoid that query.

Issue #13318

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-06-13 17:31:43 +02:00