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

113910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yaron Shahrabani
2a6caa8d42 Translated using Weblate (Hebrew) 
Currently translated at 47.3% (1558 of 3291 strings)

[CI skip]
 2018-05-23 03:55:12 +02:00
Maurício Meneghini Fauth
66f2e4a2dc Remove $dbi global from Database classes 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-22 22:46:41 -03:00
Maurício Meneghini Fauth
dce862d41b Remove dbi global from Controllers 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-22 16:51:03 -03:00
Leonardo Strozzi
927fed774c Remove md5 twig extension 
Adapt templates to remove md5 from PhpFuncionsExtension.php

Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-05-22 07:54:03 -03:00
Isaac Bennetch
83f433695b Merge branch 'QA_4_8' 2018-05-20 21:20:07 -04:00
Isaac Bennetch
f2b068e1d3 Better fix for issue #14309 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-20 21:17:16 -04:00
Maurício Meneghini Fauth
447f7ae3d1 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 16:33:10 -03:00
Maurício Meneghini Fauth
54eb5ffff8 Fix Config\FormDisplayTemplateTest failed test 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 16:29:17 -03:00
Maurício Meneghini Fauth
e7ee749650 Add ChangeLog entry for #14309 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 15:01:25 -03:00
Weblate
8ade1a00d1 Merge branch 'QA_4_8' into weblate-merge-tmp 2018-05-19 19:57:25 +02:00
Anawin Wongsadit
f020b4f282 Translated using Weblate (Thai) 
Currently translated at 29.5% (972 of 3288 strings)

[CI skip]
 2018-05-19 19:57:25 +02:00
Muhammad Rifqi Priyo Susanto
922bc1f998 Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:57:17 +02:00
Phoenix Eve Aspacio
e84c7f60e3 fixes broken links to icons in the setup page 
fixes broken links to icons in the setup page

Signed-off-by: Phoenix Eve Aspacio <aspaciop@phoenixpeca.xyz>
(cherry picked from commit bc1fee27be)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 14:56:08 -03:00
Maurício Meneghini Fauth
2dcf6615f5
Merge pull request #14272 from PhoenixPeca/patch-1 
fixes broken links to icons in the setup page
 2018-05-19 14:54:15 -03:00
Weblate
dcda549dd8 Merge branch 'master' into weblate-merge-tmp 2018-05-19 19:39:06 +02:00
Anawin Wongsadit
25efb8c4df Translated using Weblate (Thai) 
Currently translated at 29.5% (971 of 3291 strings)

[CI skip]
 2018-05-19 19:39:05 +02:00
Muhammad Rifqi Priyo Susanto
8a2fe3398d Translated using Weblate (Indonesian) 
Currently translated at 81.0% (2669 of 3291 strings)

[CI skip]
 2018-05-19 19:38:52 +02:00
Maurício Meneghini Fauth
1c2a2bb768 Fix TypeError in ServerDatabasesController 
Fixes #14304

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-19 14:36:49 -03:00
fidella
c52fc4f907 Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:08:25 +02:00
Muhammad Rifqi Priyo Susanto
d1fb1c98db Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:08:19 +02:00
Muhammad Athallah
2efc2c867f Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:07:09 +02:00
Hizkia Felix
7482106f85 Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:07:03 +02:00
Muhammad Rifqi Priyo Susanto
fc566dbc5f Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:06:57 +02:00
Deky Arifianto
afd21353b0 Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:03:14 +02:00
Muhammad Rifqi Priyo Susanto
d34b00efea Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-05-19 19:03:07 +02:00
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
Xuan Hung
b7bbb9bf57 Translated using Weblate (Vietnamese) 
Currently translated at 83.7% (2754 of 3288 strings)

[CI skip]
 2018-05-18 10:42:30 +02:00
Yaron Shahrabani
be4ddc0e27 Translated using Weblate (Hebrew) 
Currently translated at 46.2% (1520 of 3288 strings)

[CI skip]
 2018-05-18 10:37:58 +02: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
Maurício Meneghini Fauth
f5c787e526 Add ChangeLog entry for #13893 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 19:34:58 -03:00
Aswani Prakash
9274c69693 #13893 issue fix Simulating queries produce unexpected results 
Signed-off-by: Aswani Prakash <aswani15prakash@gmail.com>
(cherry picked from commit 594cb7b1f2)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-16 19:33:39 -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