Commit Graph

112391 Commits

Author SHA1 Message Date
Maurício Meneghini Fauth
81864e549e Use template for getHtmlForExportOptionsOutput
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-13 00:11:19 -02:00
Maurício Meneghini Fauth
31b7b9cc14 Use template for getHtmlForExportOptionsOutputSeparateFiles
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-12 17:17:09 -02:00
Maurício Meneghini Fauth
ebb22f8600 Use template for getHtmlForExportOptionsOutputRadio
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-12 16:44:46 -02:00
Maurício Meneghini Fauth
5b6bd82145 Use template for getHtmlForExportOptionsOutputCompression
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-11 18:41:57 -02:00
Maurício Meneghini Fauth
16459bf343 Use template for getHtmlForExportOptionsOutputCharset
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-11 15:08:46 -02:00
Maurício Meneghini Fauth
bcb67cb15f Use template for getHtmlForExportOptionsOutputFormat
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 20:47:53 -02:00
Maurício Meneghini Fauth
11c43ef980 Use template for getHtmlForExportOptionsOutputSaveDir
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 17:30:00 -02:00
Maurício Meneghini Fauth
0183003195 Use template for getHtmlForExportOptionsQuickExport
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 15:52:19 -02:00
Maurício Meneghini Fauth
083ae21f51 Use template for getHtmlForExportOptionsRows method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 15:09:48 -02:00
Maurício Meneghini Fauth
8ee32ab972 Use template for getHtmlForExportOptionsFormat
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 14:12:55 -02:00
Maurício Meneghini Fauth
b45deaeb4a Use template for getHtmlForExportOptionsFormatDropdown
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 10:45:27 -02:00
Maurício Meneghini Fauth
b093d7cadd Use template for getHtmlForExportOptionsSelection
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 01:11:30 -02:00
Maurício Meneghini Fauth
0da1a53cf4 Use template for getHtmlForExportOptionsMethod method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-10 00:44:00 -02:00
Maurício Meneghini Fauth
c0ea9039d4 Use template for getOptionsForExportTemplates method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-09 22:04:58 -02:00
Maurício Meneghini Fauth
367f49b12b Fix getPostData function
dataPost can be undefined

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-08 17:12:44 -02:00
Michal Čihař
1fc566fd90 Share code for parsing data-post attribute
It can include leading question mark and we should deal with it in all
locations.

Fixes #13913

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 17:35:32 +01:00
Michal Čihař
d070e4a60f Merge branch 'QA_4_7' 2018-01-08 17:14:06 +01:00
Michal Čihař
2ceb2419a3 Sign only generated files on release
Fixes #13885

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 17:13:41 +01:00
Michal Čihař
8885328bbe Merge branch 'QA_4_7' 2018-01-08 17:00:35 +01:00
Michal Čihař
6dede8e274 Add demo server information to login screen
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 17:00:30 +01:00
Michal Čihař
a9c29c74bb Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2018-01-08 16:37:07 +01:00
Michal Čihař
cd281d9b11 Merge branch 'QA_4_7' 2018-01-08 16:36:07 +01:00
Michal Čihař
20af596643 Add BrowserStack badge
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 16:35:53 +01:00
xypXiong
c0d10e98b5 fix #13712 Doesn't default to primary key when creating relations (#13910)
We need to compare the escaped value here.

Fixes #13712 

Signed-off-by: yanping <xyp.xiong@gmail.com>
2018-01-08 15:44:43 +01:00
Michal Čihař
3ed17858c7 Merge branch 'QA_4_7' 2018-01-08 15:20:48 +01:00
Michal Čihař
d2ea090c2e Fixed fallback value for collation connection.
Fixes #13758

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 15:18:58 +01:00
Michal Čihař
e9ec1388d0 Fixed configuration ops with multiple servers
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 14:15:35 +01:00
Michal Čihař
9de24a39b9 Merge branch 'QA_4_7' 2018-01-08 14:04:50 +01:00
Michal Čihař
224d572c7e Merge remote-tracking branch 'origin/QA_4_7' 2018-01-08 14:04:23 +01:00
Michal Čihař
e3fbc4a0e0 Merge commit '8599e87ad3ee98e056b41cbe87bb54c49debaa49' 2018-01-08 14:04:07 +01:00
Michal Čihař
2705987d33 Merge commit '923ac4d5e9551b251161fe0baf4d7626b2145c88' 2018-01-08 14:02:52 +01:00
Guillermo Lengemann
62d5dd4428 Translated using Weblate (Spanish)
Currently translated at 98.1% (3226 of 3287 strings)

[CI skip]
2018-01-08 14:02:10 +01:00
Michal Čihař
62ba273b82 Fixed resetting default setting values
The attributes are no longer used and the default values are available
in js array.

Fixes #13914

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 14:01:22 +01:00
Saqib Razzaq
7f11ee7023 Translated using Weblate (Urdu)
Currently translated at 17.5% (562 of 3207 strings)

[CI skip]
2018-01-08 13:51:00 +01:00
Supun Tharinda
2319e28032 Translated using Weblate (Sinhala)
Currently translated at 58.1% (1866 of 3207 strings)

[CI skip]
2018-01-08 13:50:58 +01:00
Leonardo Mendes Miraglia
9aca7648b8 Translated using Weblate (Portuguese)
Currently translated at 55.4% (1778 of 3207 strings)

[CI skip]
2018-01-08 13:50:56 +01:00
Slimane Amiri
3554e02074 Translated using Weblate (Kabyle)
Currently translated at 2.5% (83 of 3207 strings)

[CI skip]
2018-01-08 13:50:54 +01:00
Who am I ?
dadfce2262 Translated using Weblate (Indonesian)
Currently translated at 82.2% (2637 of 3207 strings)

[CI skip]
2018-01-08 13:50:52 +01:00
Yash Kothari
658576d14b Translated using Weblate (Hindi)
Currently translated at 37.4% (1200 of 3207 strings)

[CI skip]
2018-01-08 13:50:51 +01:00
tmtisfree
b4f5f4b655 Translated using Weblate (French)
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
2018-01-08 13:50:49 +01:00
Egon DB
4feca63f9e Translated using Weblate (Dutch)
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
2018-01-08 13:50:27 +01:00
Robert Antoni Buj Gelonch
57f0796e0c Translated using Weblate (Catalan)
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
2018-01-08 13:50:25 +01:00
杨一郎
15a97a7c95 Translated using Weblate (Chinese (Simplified))
Currently translated at 86.0% (2799 of 3207 strings)

[CI skip]
2018-01-08 13:34:20 +01:00
zhangmiao
6264e74d16 Translated using Weblate (Chinese (Simplified))
Currently translated at 86.0% (2762 of 3207 strings)

[CI skip]
2018-01-08 13:31:16 +01:00
Weblate
62c80a779c Merge remote-tracking branch 'origin/master' 2018-01-07 21:04:34 +01:00
Who am I ?
92c6c3d2cc Translated using Weblate (Indonesian)
Currently translated at 80.5% (2648 of 3287 strings)

[CI skip]
2018-01-07 21:04:28 +01:00
Maurício Meneghini Fauth
d87245e8d4 Use template for getHtmlForExportTemplateLoading method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-07 18:01:46 -02:00
Maurício Meneghini Fauth
0cefaca341 Use template for getHtmlForExportOptionHeader method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-07 17:22:44 -02:00
Maurício Meneghini Fauth
0fa3dd7366 Use template for getHtmlForHiddenInput method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-07 17:11:11 -02:00
Maurício Meneghini Fauth
47ff231237 Use template for getHtmlForExportSelectOptions method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-01-07 16:34:24 -02:00