gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,279 Commits 12 Branches 481 Tags 2.4 GiB
2732c9b4e2
Commit Graph

113279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
2732c9b4e2
Merge pull request #14306 from ibennetch/14303 
Fix #14303, Uncaught TypeError: Return value of PhpMyAdmin\Bookmark::getId()
 2018-05-18 17:35:28 -03:00
Isaac Bennetch
8a39cfca8b Fix #14303, Uncaught TypeError: Return value of PhpMyAdmin\Bookmark::getId() 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-18 10:02:24 -04:00
Maurício Meneghini Fauth
b4ee5b96be Do not allow failures for CI_MODE=lint on Travis 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-18 02:35:12 -03:00
Maurício Meneghini Fauth
cce9efc61f Fix ESLint errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-18 02:16:31 -03:00
Maurício Meneghini Fauth
633f9732eb Fix some namespace errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-18 02:08:44 -03:00
Maurício Meneghini Fauth
baf0985e5f Fix phpcs errors 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-18 01:59:38 -03:00
Weblate
01910f5474 Merge branch 'master' into weblate-merge-tmp 2018-05-18 03:25:45 +02:00
Xuan Hung
be7d711af3 Translated using Weblate (Vietnamese) 
Currently translated at 83.6% (2753 of 3291 strings)

[CI skip]
 2018-05-18 03:25:45 +02:00
Nicola Lombardi
7b832d4408 Translated using Weblate (Italian) 
Currently translated at 99.9% (3290 of 3291 strings)

[CI skip]
 2018-05-18 03:25:41 +02:00
Yaron Shahrabani
0531047101 Translated using Weblate (Hebrew) 
Currently translated at 46.2% (1522 of 3291 strings)

[CI skip]
 2018-05-18 03:25:37 +02:00
Kristjan Räts
749ea8c9ef Translated using Weblate (Estonian) 
Currently translated at 99.9% (3288 of 3291 strings)

[CI skip]
 2018-05-18 03:25:21 +02:00
Maurício Meneghini Fauth
21f75cf555 Fix TypeError on Display/Results 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-17 22:23:30 -03:00
Aswani Prakash
594cb7b1f2 #13893 issue fix Simulating queries produce unexpected results 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
 2018-05-16 19:29:24 -03:00
Maurício Meneghini Fauth
fef5966c3d Merge branch 'QA_4_8' 2018-05-16 15:01:04 -03:00
Weblate
b4cb319abb Merge branch 'QA_4_8' into weblate-merge-tmp 2018-05-16 19:58:31 +02:00
Yaron Shahrabani
6b25ff2b5e Translated using Weblate (Hebrew) 
Currently translated at 42.2% (1388 of 3288 strings)

[CI skip]
 2018-05-16 19:58:30 +02:00
Maurício Meneghini Fauth
fcd0ee9945 Add ChangeLog entry for #14066 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 14:57:32 -03:00
Xinyu Liu
f262c8cd7a fix: AUTO_INCREMENT error when only exporting table structure in database-level exports; issue #14066 
Signed-off-by: Xinyu Liu <meteor.lxy@foxmail.com>
(cherry picked from commit f1fa924f5f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 14:55:59 -03:00
Xinyu Liu
e1519d2414 fix: toggle export options when selecting all struture or all data in database-level exports 
Signed-off-by: Xinyu Liu <meteor.lxy@foxmail.com>
(cherry picked from commit 298ef43482)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 14:55:32 -03:00
Weblate
215cd79202 Merge branch 'master' into weblate-merge-tmp 2018-05-16 19:52:55 +02:00
Yaron Shahrabani
7762bd0bd4 Translated using Weblate (Hebrew) 
Currently translated at 42.2% (1389 of 3291 strings)

[CI skip]
 2018-05-16 19:52:55 +02:00
Maurício Meneghini Fauth
3c12c9efb4
Merge pull request #14119 from meteorlxy/patch-tmp 
fix: AUTO_INCREMENT error when only exporting table structure in database-level exports; issue #14066
 2018-05-16 14:52:46 -03:00
Maurício Meneghini Fauth
c1a54f77b1
Merge pull request #14296 from mauriciofauth/strict-types 
Enable strict mode in PHP files
 2018-05-16 05:17:39 -03:00
Maurício Meneghini Fauth
dc8c92bfd8 Enable strict mode in test files 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 04:36:04 -03:00
Maurício Meneghini Fauth
af148ad92b Enable strict mode in PHP files 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 04:36:04 -03:00
Maurício Meneghini Fauth
d243f7ccd6 Enable strict mode in libraries files 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 03:20:45 -03:00
Maurício Meneghini Fauth
ec52933841 Enable strict mode in Utils/HttpRequest class 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 03:20:45 -03:00
Maurício Meneghini Fauth
0a53065f93 Enable strict mode in Twig classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 03:20:45 -03:00
Maurício Meneghini Fauth
c426891bf5 Enable strict mode in Server classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 03:20:45 -03:00
Maurício Meneghini Fauth
56ce176752 Enable strict mode in Rte classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 03:20:45 -03:00
Maurício Meneghini Fauth
cf44cc9630 Enable strict mode in Properties classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
0998a50e9e Enable strict mode in Plugins classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
9dbae0a9ed Enable strict mode in Navigation classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
107e0b14e0 Enable strict mode in Gis classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
2be3ac83df Enable strict mode in Engines classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
267aadd4c3 Enable strict mode in Display classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
f3fcbdf12f Enable strict mode in Di classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
d8c16bce6b Add ChangeLog entry for #14296 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 01:09:16 -03:00
Maurício Meneghini Fauth
db708a4da6 Merge branch 'QA_4_8' 2018-05-15 03:59:42 -03:00
Maurício Meneghini Fauth
fefcac214d Add ChangeLog entry for #14278 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 03:57:50 -03:00
Leonardo Strozzi
ffe49cb133 Fix central columns in-line edit bug 
fixes #14278

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
(cherry picked from commit dce39bb1f0)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 03:56:31 -03:00
Maurício Meneghini Fauth
76b423d525
Merge pull request #14286 from laps15/bugfix 
Fix central columns in-line edit bug
 2018-05-15 03:54:44 -03:00
Maurício Meneghini Fauth
c8bfcb7fb8
Merge pull request #14290 from mauriciofauth/strict-types 
Enable strict mode in some classes
 2018-05-15 03:30:57 -03:00
Maurício Meneghini Fauth
aa8ab162a4 Enable strict mode in Dbi classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 01:36:23 -03:00
Maurício Meneghini Fauth
764f7a7dde Enable strict mode in Database classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 01:18:52 -03:00
Maurício Meneghini Fauth
5f46a4ba52 Enable strict mode in Controllers classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 01:18:52 -03:00
Maurício Meneghini Fauth
b6435e9ed2 Enable strict mode in Config classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 01:03:57 -03:00
Maurício Meneghini Fauth
6cf8ee0831 Enable strict mode in some classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-15 01:03:57 -03:00
Madhura Jayaratne
80f93d6f02 Resolved merge conflict 2018-05-15 05:38:55 +10:00
Madhura Jayaratne
38c800c972 Fix #14289 Fix multi-column sorting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-15 05:25:45 +10:00