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

113143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhura Jayaratne
7b27484897 Fix #14239 Line and some other charts ignore result set order of values chosen for the x-axis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-05-06 08:59:06 +10:00
William Desportes
0d2f70c875 Patch for #14257 CodeMirror hints hidden 
[CI skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
(cherry picked from commit 24f483793c)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 23:39:17 -03:00
Maurício Meneghini Fauth
29115645f3
Merge pull request #14258 from williamdes/issue-14257-codemirror-hints 
Patch for #14257 CodeMirror hints hidden
 2018-05-04 23:28:43 -03:00
William Desportes
24f483793c
Patch for #14257 CodeMirror hints hidden 
[CI skip]

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-04 12:07:34 +02:00
Maurício Meneghini Fauth
0c3d024e3e Add ChangeLog entries for #12373 and #14155 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 04:39:03 -03:00
Maurício Meneghini Fauth
bee5672d8c Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:51:33 -03:00
Maurício Meneghini Fauth
ea1e3a2578 Add ChangeLog entry for #14212 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:46:45 -03:00
Piyush Vijay
b02220241f XML Export from single table throws fatal error (PHP 7.2): #14212 issue fixed 
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

(cherry picked from commit 5b35dba67d)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-04 02:44:41 -03:00
Maurício Meneghini Fauth
2f824e5508
Merge pull request #14216 from Piyush3079/PMA_14212 
Fix XML Export fatal error and add Move columns preview SQL
 2018-05-04 02:40:54 -03:00
Maurício Meneghini Fauth
dcb2aec958
Merge pull request #14255 from laps15/templates 
Addapt getTableHeader to twig template
 2018-05-04 01:51:41 -03:00
Leonardo Strozzi
5bc8689b13 Addapt getTableHeader to twig template 
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
 2018-05-03 22:21:02 -03:00
Piyush Vijay
4304a66995 Duplicate hidden token input field issue solved (#14211) 
* Duplicate hidden token input fields: #14209 issue fixed
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* duplicate hidden input for token removed from error reporting form.
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>
 2018-05-03 21:47:05 -03:00
Maurício Meneghini Fauth
475c186bf9
Merge pull request #14254 from williamdes/issue-14253-git-submodule 
#14253 Git commit info not showing when the repository is a submodule
 2018-05-03 21:33:36 -03:00
William Desportes
9687dfbfd2
#14253 Git commit info not showing when the repository is a submodule 
Added tests for Config::checkGitRevision and Config::isGitRevision

Closes: #14253
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-04 01:26:22 +02:00
Isaac Bennetch
c580f7e06b Slight language improvement 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2018-05-03 16:05:52 -04:00
Piyush Vijay
9c7c5ca951 Changes to make Get auto saved query and show this query here again button functional (#14166) 
* Handling of autosaved query and making get auto-saved query button functional
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Basic functionality of show this query here again added
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* Show this query here again checkbox working properly
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* deleting auto_saved_sql on clicking submit query button
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* javascript error handled
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

* javascript error of JSON undefined removed
Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 16:50:38 -03:00
Maurício Meneghini Fauth
3bf396ce54
Merge pull request #14202 from williamdes/issue-13894-bin-fk-bug 
Binary foreign key enhancement #13894
 2018-05-03 15:52:04 -03:00
Maurício Meneghini Fauth
c946c0d77d Fix broken tests from RelationTest 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 14:03:12 -03:00
Maurício Meneghini Fauth
441321a123 Add ChangeLog entry for #14128 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:48:59 -03:00
Maurício Meneghini Fauth
f65f59c8e8 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:45:57 -03:00
Weblate
808e22fbf9 Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-05-03 18:42:41 +02:00
Yaron Shahrabani
ddc8e8c497 Translated using Weblate (Hebrew) 
Currently translated at 38.2% (1259 of 3288 strings)

[CI skip]
 2018-05-03 18:42:41 +02:00
Maurício Meneghini Fauth
e7a6ff8a0e Remove duplicated input in application_configure.twig 
Some coding style fixes.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:40:33 -03:00
Raman Tehlan
3054999afe Display the secret for 2FA - #14128 (#14154) 
* 2FA Secret added
* 2FA Secret Displayed

Fix #14128

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
(cherry picked from commit 8dbae11f6f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:28:52 -03:00
Raman Tehlan
8dbae11f6f Display the secret for 2FA - #14128 (#14154) 
* 2FA Secret added
* 2FA Secret Displayed

Signed-off-by: Raman Tehlan <ramantehlan@gmail.com>
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:24:06 -03:00
Maurício Meneghini Fauth
c9d344370b Add #14141 changes to Metro theme 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:02:25 -03:00
Weblate
842a01e0b2 Merge remote-tracking branch 'origin/master' 2018-05-03 17:52:43 +02:00
Yaron Shahrabani
14beb5ab6d Translated using Weblate (Hebrew) 
Currently translated at 38.2% (1259 of 3288 strings)

[CI skip]
 2018-05-03 17:52:41 +02:00
Maurício Meneghini Fauth
3178facfa1
Merge pull request #14141 from mohitjawanjal/master 
Remove inline styles from Relation.php
 2018-05-03 12:52:30 -03:00
Maurício Meneghini Fauth
393204ccd0 Upgrade CodeMirror to v5.37.0 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-02 20:12:40 -03:00
Maurício Meneghini Fauth
d98ff075db Automatic fixes by PHP_CodeSniffer 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-02 19:56:09 -03:00
Maurício Meneghini Fauth
e4d0464297 Add PHP_CodeSniffer and ESLint to Travis CI 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-02 19:29:34 -03:00
William Desportes
e9d3fdd493
Binary foreign key enhancement #13894 
Closes: #13894
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2018-05-02 15:23:42 +02:00
Michal Čihař
35e13eada7 Merge branch 'QA_4_8' 2018-05-02 12:14:41 +02:00
Michal Čihař
fac08eb5ef Merge remote-tracking branch 'origin/QA_4_8' 2018-05-02 12:14:37 +02:00
William Desportes
8af0343bb2 Patch for issue #14246 
Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Michal Čihař <michal@cihar.com>
 2018-05-02 12:13:49 +02:00
Maurício Meneghini Fauth
8d74d368b8 Add type declarations to ErrorHandler 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-01 18:19:33 -03:00
Yaron Shahrabani
f5524eaa6c Translated using Weblate (Hebrew) 
Currently translated at 38.1% (1255 of 3288 strings)

[CI skip]
 2018-05-01 14:38:16 +02:00