Commit Graph

112537 Commits

Author SHA1 Message Date
Michal Čihař
653f435a38 Merge branch 'QA_4_7' 2018-02-12 16:12:27 +01:00
Weblate
7d8aa5eaf1 Merge remote-tracking branch 'origin/master' 2018-02-12 16:10:20 +01:00
codygee237
1d0c800eb2 Translated using Weblate (Filipino)
Currently translated at 6.3% (210 of 3288 strings)

[CI skip]
2018-02-12 16:09:46 +01:00
Michal Čihař
a82d2b671a Translated using Weblate (Filipino)
Currently translated at 6.5% (211 of 3208 strings)

[CI skip]
2018-02-12 16:05:32 +01:00
Weblate
96e51bc76a Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-02-12 16:05:08 +01:00
Robert Antoni Buj Gelonch
e139b4f196 Translated using Weblate (Catalan)
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
2018-02-12 16:05:01 +01:00
codygee237
aa65f844c1 Translated using Weblate (Filipino)
Currently translated at 6.5% (211 of 3208 strings)

[CI skip]
2018-02-12 16:04:44 +01:00
Michal Čihař
2dd00f97c9 Use php 7.2 on osx
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-02-12 16:00:14 +01:00
Michal Čihař
2f97da2183 Merge branch 'QA_4_7' 2018-02-12 14:45:44 +01:00
Michal Čihař
2f248be866 Fix variable name
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-02-12 14:45:28 +01:00
Michal Čihař
9b36dfba69 Merge branch 'QA_4_7' 2018-02-12 14:27:35 +01:00
Michal Čihař
ce1fbf8f10 Merge remote-tracking branch 'origin/QA_4_7' 2018-02-12 14:27:31 +01:00
Michal Čihař
0870b2b0ae Set system locales separately
The motranslator no longer does this, see
https://github.com/phpmyadmin/motranslator/issues/24

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-02-12 14:17:43 +01:00
Maurício Meneghini Fauth
607ed036fe
Merge pull request #13978 from ufosaga/master
Fix textarea failed to popup (issue #13518)
2018-02-11 23:59:16 -02:00
Robert Antoni Buj Gelonch
1421722cdf Translated using Weblate (Catalan)
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
2018-02-12 01:19:49 +01:00
Robert Antoni Buj Gelonch
3e1f8b2e6e Translated using Weblate (Catalan)
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
2018-02-12 00:46:22 +01:00
H Zeng
3c29612f49 Translated using Weblate (Chinese (Simplified))
Currently translated at 87.3% (2803 of 3208 strings)

[CI skip]
2018-02-12 00:34:56 +01:00
Marczis István
658be9119c Translated using Weblate (Hungarian)
Currently translated at 99.5% (3194 of 3208 strings)

[CI skip]
2018-02-11 16:36:58 +01:00
Weblate
4be25160c3 Merge remote-tracking branch 'origin/master' 2018-02-11 00:35:53 +01:00
Marczis István
f1d9551512 Translated using Weblate (Hungarian)
Currently translated at 96.3% (3168 of 3288 strings)

[CI skip]
2018-02-11 00:35:44 +01:00
H Zeng
44296e6b32 Translated using Weblate (Chinese (Simplified))
Currently translated at 83.2% (2737 of 3288 strings)

[CI skip]
2018-02-11 00:35:36 +01:00
Robert Antoni Buj Gelonch
e68d2b9230 Translated using Weblate (Catalan)
Currently translated at 98.7% (3248 of 3288 strings)

[CI skip]
2018-02-11 00:35:32 +01:00
Viktar Vauchkevich
cd79d31372 Translated using Weblate (Belarusian)
Currently translated at 63.0% (2072 of 3288 strings)

[CI skip]
2018-02-11 00:34:45 +01:00
Viktar Vauchkevich
de1fc6ceb6 Translated using Weblate (Belarusian)
Currently translated at 63.3% (2033 of 3208 strings)

[CI skip]
2018-02-11 00:34:37 +01:00
Maurício Meneghini Fauth
d61fba6d81
Merge pull request #13986 from mauriciofauth/normalization
Refactor PhpMyAdmin\Normalization class
2018-02-10 02:37:58 -02:00
Maurício Meneghini Fauth
8f0dbe453b Fix some coding style issues
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-10 01:08:31 -02:00
Maurício Meneghini Fauth
e2fa9664fb Use DI for DatabaseInterface instance
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-10 00:37:13 -02:00
Maurício Meneghini Fauth
fba227c1e8 Replace static methods with instance methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-10 00:24:04 -02:00
Maurício Meneghini Fauth
37c2a0ec96
Merge pull request #13985 from mauriciofauth/error-report
Refactor PhpMyAdmin\ErrorReport class
2018-02-10 00:18:17 -02:00
Maurício Meneghini Fauth
67e65d91bf Fix some coding style
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-09 21:54:02 -02:00
Maurício Meneghini Fauth
eaae50a1bc Add a constructor
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-09 21:10:17 -02:00
Anu4ruby
5efb29d500 Removed inline styles from AuthenticationConfig.php file-issue 12262 (#13979)
* removed inline styles from AuthenticationConfig.php file-issue 12262

* removed inline styles from AuthenticationConfig.php- file-issue 12262-

Signed-off-by: Anupama V <sadicarnot@gmail.com>
2018-02-09 19:34:32 -02:00
nulll-pointer
96084852da Fix for issue #13778 (#13971)
Changed file ./js/tbl_select.js
Changed event handler on select[name*="criteriaColumnOperators"] object, from 'click' to 'change'.

Fix #13778

Signed-off-by: Lakshay arora <b16060@students.iitmandi.ac.in>
2018-02-09 11:49:58 -02:00
Gladson Samuel Stephen
3f03ce6501 Translated using Weblate (Tamil)
Currently translated at 33.7% (1110 of 3288 strings)

[CI skip]
2018-02-09 10:40:54 +01:00
Gladson Samuel Stephen
7a1beb0cfd Translated using Weblate (Tamil)
Currently translated at 35.0% (1124 of 3208 strings)

[CI skip]
2018-02-09 10:40:47 +01:00
Thomas Wong
4a5ae16eff Fix textarea failed to popup (issue #13518)
Signed-off-by: Thomas Wong <ufosaga@gmail.com>
2018-02-09 10:13:56 +08:00
Rajekevin DOUREPOULLE
f2fb31f93a Translated using Weblate (French)
Currently translated at 99.9% (3285 of 3288 strings)

[CI skip]
2018-02-08 17:36:04 +01:00
Maurício Meneghini Fauth
d60f28e441 Fix visibility of the methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-08 14:32:41 -02:00
Maurício Meneghini Fauth
56daea7d86 Replace static methods with instance methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-08 12:25:13 -02:00
anonymous
840c8026b4 Translated using Weblate (French)
Currently translated at 99.8% (3282 of 3288 strings)

[CI skip]
2018-02-07 16:50:02 +01:00
Weblate
706c16ffba Merge remote-tracking branch 'origin/master' 2018-02-07 16:49:44 +01:00
Gladson Samuel Stephen
42bf278b4f Translated using Weblate (Tamil)
Currently translated at 33.3% (1096 of 3288 strings)

[CI skip]
2018-02-07 16:49:43 +01:00
Rajekevin DOUREPOULLE
d096f6259d Translated using Weblate (French)
Currently translated at 99.7% (3281 of 3288 strings)

[CI skip]
2018-02-07 16:49:12 +01:00
Rajekevin DOUREPOULLE
a3be787b74 Translated using Weblate (French)
Currently translated at 100.0% (3208 of 3208 strings)

[CI skip]
2018-02-07 16:47:09 +01:00
Madhura Jayaratne
06d20fb47a Proper fix for the xss issue
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2018-02-08 00:32:35 +11:00
Madhura Jayaratne
fab0a17886
Merge pull request #13957 from madhuracj/xss
Escape search string and table names in database search results page
2018-02-07 23:21:43 +11:00
Maurício Meneghini Fauth
4fd849efb3
Merge pull request #13972 from mauriciofauth/insert-edit
Refactor PhpMyAdmin\InsertEdit class
2018-02-06 19:39:11 -02:00
Maurício Meneghini Fauth
9273cbe8ce Some coding style fixes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:57 -02:00
Maurício Meneghini Fauth
010c6aab57 Use DI for DatabaseInterface dependency
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:57 -02:00
Maurício Meneghini Fauth
76b0f64f21 Fix visibility of the methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-06 18:47:57 -02:00