gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,413 Commits 12 Branches 481 Tags 2.4 GiB
2823d27cd3
Commit Graph

112413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2823d27cd3 Merge branch 'QA_4_7' 2018-01-16 16:06:16 +01:00
Michal Čihař
c77cfa7d13 Avoid operating on uset array index 
Fixes #13939

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-16 16:05:04 +01:00
Michal Čihař
89d40d5e8d Merge branch 'QA_4_7' 2018-01-16 16:02:38 +01:00
Michal Čihař
4ef752efb3 Fixed error handling in PHP 7.2 
Fixes #13938

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-16 16:00:43 +01:00
Maurício Meneghini Fauth
7ce0025dae
Merge pull request #13936 from carusogabriel/assertions 
Use assertNotSame instead of comparison in test
 2018-01-16 11:54:58 -02:00
Maurício Meneghini Fauth
91ee20e757
Merge pull request #13935 from carusogabriel/simplify-returns 
Simplify returns
 2018-01-16 11:38:20 -02:00
Gabriel Caruso
21dacea6d1 Use assertNotSame 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-16 10:32:26 -02:00
Gabriel Caruso
6ff73257e2 Simplify returns 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-16 10:16:56 -02:00
Michal Čihař
51bfd2ee0c Merge branch 'QA_4_7' 2018-01-16 12:47:10 +01:00
Weblate
cf81254b5c Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2018-01-16 12:09:19 +01:00
Dao Nguyen
9ec07c887f Translated using Weblate (Vietnamese) 
Currently translated at 85.9% (2756 of 3207 strings)

[CI skip]
 2018-01-16 12:09:19 +01:00
Michal Čihař
22c54590be Merge branch 'QA_4_7' 2018-01-16 12:09:02 +01:00
Tony Nascimento
2fbea2b82b Translated using Weblate (Portuguese) 
Currently translated at 58.3% (1872 of 3207 strings)

[CI skip]
 2018-01-16 12:08:58 +01:00
Ronny André Løkken
45cbe02f72 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.3% (1840 of 3207 strings)

[CI skip]
 2018-01-16 12:08:16 +01:00
Michal Čihař
fb92eca5ee
Merge pull request #13917 from nijel/release-composer-php 
Force PHP platform in composer to oldest supported version
 2018-01-16 12:07:42 +01:00
Maurício Meneghini Fauth
f45d4a566b Refactor PhpMyAdmin\Display\Export class 
The static methods are replaced with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-01-13 23:51:16 -02:00
Weblate
f40ce94a96 Merge remote-tracking branch 'origin/master' 2018-01-13 03:26:08 +01:00
Dao Nguyen
3e27e1e66a Translated using Weblate (Vietnamese) 
Currently translated at 83.8% (2756 of 3287 strings)

[CI skip]
 2018-01-13 03:26:07 +01:00
Tony Nascimento
cb7bf121de Translated using Weblate (Portuguese) 
Currently translated at 56.4% (1854 of 3287 strings)

[CI skip]
 2018-01-13 03:25:36 +01:00
Ronny André Løkken
fa2f7d7b15 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 55.4% (1823 of 3287 strings)

[CI skip]
 2018-01-13 03:25:00 +01:00
Maurício Meneghini Fauth
0a933ca060 Refactor exportCheckboxCheck method 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-01-13 00:19:42 -02:00
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ř
009246e96a Force PHP platform in composer to oldest supported version 
This way the packages should be compatible with all versions we support
regardless PHP version used to build the release.

Fixes #13831

Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-01-08 18:00:41 +01: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