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

111784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
e147d601f0 Translated using Weblate (English (United Kingdom)) 
Currently translated at 98.7% (3227 of 3267 strings)

[CI skip]
 2017-11-14 09:29:15 +01:00
Weblate
2da54c8140 Merge remote-tracking branch 'origin/master' 2017-11-14 04:00:39 +01:00
M1ckm
9859b20af8 Translated using Weblate (English (United Kingdom)) 
Currently translated at 98.8% (3229 of 3267 strings)

[CI skip]
 2017-11-14 04:00:32 +01:00
Maurício Meneghini Fauth
702d6e6600
Merge pull request #13811 from mauriciofauth/query 
Refactor PhpMyAdmin\Database\MultiTableQuery class
 2017-11-14 01:00:04 -02:00
Maurício Meneghini Fauth
b996919c47 Move query results logic into MultiTableQuery class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 23:01:31 -02:00
Maurício Meneghini Fauth
f7d876296e Move new_column template into form template 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 22:17:19 -02:00
Maurício Meneghini Fauth
fc08cca15b Refactor getFormHTML method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 21:55:41 -02:00
Maurício Meneghini Fauth
45de599d79 Move columns template into form template 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 18:05:39 -02:00
Maurício Meneghini Fauth
a76fb00ce6 Refactor Database/MultiTableQuery to use DI 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 17:20:27 -02:00
Maurício Meneghini Fauth
8ec6d433a0 Add missing trans tag 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 16:17:55 -02:00
Maurício Meneghini Fauth
41dfe10efe Use template for getFormHTML 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 16:13:53 -02:00
Maurício Meneghini Fauth
c82669ba57 Use template for getColumnsHTML 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 15:57:13 -02:00
Michal Čihař
d66d86c5d6 Translated using Weblate (English (United Kingdom)) 
Currently translated at 98.6% (3223 of 3267 strings)

[CI skip]
 2017-11-13 16:44:13 +01:00
Maurício Meneghini Fauth
608242662d Make Multi Table Query strings translatable. 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-13 13:15:56 -02:00
Weblate
842d35792f Merge remote-tracking branch 'origin/master' 2017-11-13 15:51:26 +01:00
Weblate
d9ab8cbd89 Merge remote-tracking branch 'origin/master' 2017-11-13 15:51:08 +01:00
M1ckm
6ef0943541 Translated using Weblate (English (United Kingdom)) 
Currently translated at 98.7% (3225 of 3267 strings)

[CI skip]
 2017-11-13 15:51:02 +01:00
Michal Čihař
b2f25b50ad
Merge pull request #13797 from nijel/nosprites 
Remove sprites from the themes
 2017-11-13 15:50:56 +01:00
Michal Čihař
912d367a3b Fix some redirecting URLs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-13 15:48:10 +01:00
Michal Čihař
cedad5f931 Remove sprites from the themes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-13 14:12:12 +01:00
Michal Čihař
f1f011b726 Use PHP 7.1 for Selenium tests 
The 7.2 seems to be quite unstable on Travis CI.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-13 14:11:59 +01:00
Michal Čihař
0b72311db1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2017-11-13 12:38:23 +01:00
Michal Čihař
ec2adf0e56 Merge branch 'QA_4_7' 2017-11-13 12:38:05 +01:00
Michal Čihař
35ee4d4e8e Merge remote-tracking branch 'origin/QA_4_7' 2017-11-13 12:37:43 +01:00
Michal Čihař
9f3449275e Add SJIS-win to default list of allowed charsets 
Fixes #13803

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-13 12:37:24 +01:00
Weblate
24c48d999a Merge remote-tracking branch 'origin/master' 2017-11-13 12:25:28 +01:00
jan madsen
fd9d7c1338 Translated using Weblate (Danish) 
Currently translated at 99.5% (3252 of 3267 strings)

[CI skip]
 2017-11-13 12:25:22 +01:00
Michal Čihař
895ee146d6 Fix undefined variable wihout DB connection 
This might be called from path where DB connection is not needed.

Fixes #13805

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-11-13 12:24:27 +01:00
Володимир Бриняк
15b3f66d1a Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-12 19:28:06 +01:00
jan madsen
9c3d98462e Translated using Weblate (Danish) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-12 18:45:22 +01:00
Maurício Meneghini Fauth
1f98dcf1c2 Fix designer not showing table column information 
Fix #13809

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-12 02:11:47 -02:00
Maurício Meneghini Fauth
3eed95aba0 Use template for _getFootersOptions 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 22:39:03 -02:00
Maurício Meneghini Fauth
3a00dc7d0a Use template for _getSortOrderSelectCell 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 22:11:06 -02:00
Maurício Meneghini Fauth
6c90b384f7 Refactor _getSortSelectCell 
Move 'selected' html to template.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 12:48:17 -02:00
Maurício Meneghini Fauth
7586c2904a Use template for _getSortSelectCell 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-11 12:35:32 -02:00
Maurício Meneghini Fauth
10b8730df5 Use template for _showColumnSelectCell 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 19:57:54 -02:00
Maurício Meneghini Fauth
1f482ff6e7 Use template for displayFormBottom 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
70b592ba61 Usa template for displayTabsBottom 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
ed76f7cffd Remove displayFieldsetBottomSimple method 
Can be replaced by displayFieldsetBottom(false)

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
f64e0e1742 Use template for displayErrors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 19:19:43 -02:00
Maurício Meneghini Fauth
ce9902b5f5 Use template for displayGroupHeader 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 18:20:32 -02:00
Maurício Meneghini Fauth
7efdc53d2a Fix 'count parameter must be an array' error 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 16:07:37 -02:00
Maurício Meneghini Fauth
729349d326 Use template for displayFieldsetTop 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 16:07:00 -02:00
Vinicius Gonçalves
a7c11b1b07 Translated using Weblate (Portuguese) 
Currently translated at 55.4% (1778 of 3207 strings)

[CI skip]
 2017-11-10 18:48:40 +01:00
Maurício Meneghini Fauth
72bcc1336f Use template for displayFieldsetBottom 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 15:08:28 -02:00
Maurício Meneghini Fauth
e7900a82cb Add CreateAddFieldTest 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 14:05:08 -02:00
Maurício Meneghini Fauth
b041c13a0c Fix CreateAddField methods visibility 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2017-11-10 09:06:41 -02:00
Domen
cc340ecae0 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-10 00:51:51 +01:00
Domen
e8a7ce11ae Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3267 of 3267 strings)

[CI skip]
 2017-11-10 00:51:22 +01:00
Tobias Groza
856ea19d31 Translated using Weblate (German) 
Currently translated at 100.0% (3207 of 3207 strings)

[CI skip]
 2017-11-09 19:46:23 +01:00