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

113181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maurício Meneghini Fauth
ec3583944b Refactor Font methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 22:42:56 -03:00
Maurício Meneghini Fauth
371b01d92c Add type declarations to FileListing 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 22:15:18 -03:00
Maurício Meneghini Fauth
aa32ace0dc Refactor FileListing methods 
Replaces static methods with instance methods.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 22:07:45 -03:00
Maurício Meneghini Fauth
db7704a77f Add type declarations to File 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 21:44:46 -03:00
Maurício Meneghini Fauth
8b05d4ca31 Replace var keyword with protected in File 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 21:21:37 -03:00
Maurício Meneghini Fauth
f85079aa5e Fix broken server export 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-09 21:01:33 -03:00
Weblate
be92c61895 Merge remote-tracking branch 'origin/master' 2018-05-10 01:02:31 +02:00
Yaron Shahrabani
4ac3d541ce Translated using Weblate (Hebrew) 
Currently translated at 40.8% (1345 of 3291 strings)

[CI skip]
 2018-05-10 01:02:29 +02:00
Marc Delisle
0c4f9321ec Translated using Weblate (French) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-10 01:02:23 +02:00
Maurício Meneghini Fauth
e34e22698b
Merge pull request #14275 from williamdes/issue-13894-bin-fk-bug 
Revert modifications
 2018-05-09 20:02:13 -03:00
William Desportes
c19dec2c47
Revert modifications/error 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-10 00:06:15 +02:00
Maurício Meneghini Fauth
d813e920ba Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 23:21:00 -03:00
Weblate
617c88dd96 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-09 04:18:40 +02:00
Yaron Shahrabani
f8d0302e22 Translated using Weblate (Hebrew) 
Currently translated at 40.1% (1319 of 3288 strings)

[CI skip]
 2018-05-09 04:18:38 +02:00
Maurício Meneghini Fauth
3d632e2931 Add ChangeLog entry for #14249 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 23:17:39 -03:00
Lakshay arora
f02c18cb70 Fix for missing go button in view edit, #14249 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>

(cherry picked from commit 3641a6521e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 23:16:18 -03:00
Maurício Meneghini Fauth
74df5cef53
Merge pull request #14263 from nulll-pointer/view_alter_error 
Fix for missing go button in view edit, #14249
 2018-05-08 23:12:46 -03:00
Weblate
6d1bf42c0a Merge remote-tracking branch 'origin/master' 2018-05-08 22:47:49 +02:00
Yaron Shahrabani
5bde08d130 Translated using Weblate (Hebrew) 
Currently translated at 40.1% (1320 of 3291 strings)

[CI skip]
 2018-05-08 22:47:48 +02:00
Maurício Meneghini Fauth
b87f5ed0fa
Merge pull request #14267 from BackEndTea/patch-1 
Require a polyfill instead of the cytpe extension
 2018-05-08 17:47:37 -03:00
ssantos
1142c64b08 Translated using Weblate (German) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-08 17:19:17 +02:00
Gert de Pagter
f7ef36b595
Require a polyfill instead of the cytpe extension 
Ctype is an indirect dependency due to twig,  and it isn't resolved there until a later version than we require.
By requiring the symfony polyfill for cytpe everything will still run, regardless of the ctype availability. 

Twig will require this polyfill itself in a later version, but this makes sure we still allow earlier versions of twig to be used.

Signed-off-by: Gert de Pagter <BackEndTea@gmail.com>
 2018-05-08 16:32:48 +02:00
Maurício Meneghini Fauth
dc72341b75 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:44:19 -03:00
Maurício Meneghini Fauth
de250fbae3 Fix MariaDB 10.2 current_timestamp() 
Fixes #13968 and fixes #13999. Closes #14177.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-08 07:39:53 -03:00
Weblate
8a510a2dd3 Merge remote-tracking branch 'origin/master' 2018-05-07 23:11:58 +02:00
Yaron Shahrabani
7f0a086bfd Translated using Weblate (Hebrew) 
Currently translated at 39.9% (1314 of 3291 strings)

[CI skip]
 2018-05-07 23:11:52 +02:00
Alpix
f88e6c0449 Translated using Weblate (German) 
Currently translated at 99.9% (3288 of 3291 strings)

[CI skip]
 2018-05-07 23:11:46 +02:00
Madhura Jayaratne
d564bf275f Merge branch 'QA_4_8' 2018-05-08 07:11:44 +10:00
Weblate
efb51ae3f3 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-07 23:10:29 +02:00
Yaron Shahrabani
6aaaf1065b Translated using Weblate (Hebrew) 
Currently translated at 39.9% (1313 of 3288 strings)

[CI skip]
 2018-05-07 23:10:24 +02:00
Madhura Jayaratne
e6cc4fbbbc Fix #14264 Linking for 'Distinct values' broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-08 07:10:06 +10:00
Lakshay arora
3641a6521e Fix for missing go button in view edit, #14249 
Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
 2018-05-08 01:13:00 +05:30
Burak Yavuz
744408e72b Translated using Weblate (Turkish) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-07 11:54:35 +02:00
Olivier Humbert
3d7cb69ef1 Translated using Weblate (French) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-07 10:11:25 +02:00
dingo thirteen
b3e0342a48 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3291 of 3291 strings)

[CI skip]
 2018-05-07 09:14:44 +02:00
Maurício Meneghini Fauth
358fbf5b21 Update po files 
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-07 03:27:57 -03:00
Maurício Meneghini Fauth
3e8d461ba3 Add type declarations to Export 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-07 03:18:12 -03:00
Maurício Meneghini Fauth
675be84d97 Add type declarations to ErrorReport 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-07 02:08:55 -03:00
Maurício Meneghini Fauth
b36c295c89 Remove homebrew/php from Travis CI 
homebrew/php was migrated to homebrew/core

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 86adefd460)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 22:46:56 -03:00
Maurício Meneghini Fauth
c34484a739 Fix TableCreateTest::testCreateTable Selenium test 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit e548d0802b)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 22:15:27 -03:00
Maurício Meneghini Fauth
12e24ee4db Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:20:01 -03:00
Weblate
a6814842a5 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-07 02:18:37 +02:00
Edward FANG
179006a1d8 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.9% (2761 of 3288 strings)

[CI skip]
 2018-05-07 02:18:34 +02:00
Maurício Meneghini Fauth
4ee541a000 Add ChangeLog entry for #14260 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:17:50 -03:00
William Desportes
8f571f7e9e #14260 Fixed configuration for DefaultLang and Lang 
Closes: #14260
Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 2f84b4034e)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-06 21:16:36 -03:00
Weblate
7df655f2c9 Merge remote-tracking branch 'origin/master' 2018-05-07 02:13:12 +02:00
Edward FANG
b2d5d7e456 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.9% (2759 of 3288 strings)

[CI skip]
 2018-05-07 02:13:10 +02:00
Maurício Meneghini Fauth
923157d0a6
Merge pull request #14261 from williamdes/issue-14260-langs-cfg 
#14260 Fixed configuration for DefaultLang and Lang
 2018-05-06 21:13:02 -03:00
William Desportes
2f84b4034e
#14260 Fixed configuration for DefaultLang and Lang 
Closes: #14260
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-07 01:03:15 +02:00
Madhura Jayaratne
bb9fc5d6e9 Merge branch 'QA_4_8' 2018-05-06 09:00:52 +10:00