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

113117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f65f59c8e8 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-05-03 13:45:57 -03: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
Weblate
7caf90578e Merge remote-tracking branch 'origin/master' 2018-05-01 03:28:36 +02:00
Yaron Shahrabani
7507cfb08e Translated using Weblate (Hebrew) 
Currently translated at 38.1% (1255 of 3288 strings)

[CI skip]
 2018-05-01 03:28:34 +02:00
Maurício Meneghini Fauth
76a4b086a6 Remove runkit dependency 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-30 22:25:57 -03:00
Maurício Meneghini Fauth
a4f44121aa Add some tests to Dbi/DbiMysqliTest 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-30 22:19:03 -03:00
Giovanni Sora
cd9117d0bb Translated using Weblate (Interlingua) 
Currently translated at 75.3% (2479 of 3288 strings)

[CI skip]
 2018-04-30 19:37:43 +02:00
Maurício Meneghini Fauth
c6313acc1d Refactor Dbi\DbiMysqli to use object oriented mysqli 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-30 04:44:09 -03:00
Maurício Meneghini Fauth
e548d0802b Fix TableCreateTest::testCreateTable Selenium test 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-30 01:37:48 -03:00
Maurício Meneghini Fauth
cf040c13ad Exclude Selenium and Runkit tests from build.xml 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-30 00:55:54 -03:00
Maurício Meneghini Fauth
cbfbb3adaf Remove incomplete tests 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-30 00:31:37 -03:00
Maurício Meneghini Fauth
725fbbdcc2
Merge pull request #14244 from Vaggal/jquery_migrate_fixes 
Fixes some jQuery Migrate warnings
 2018-04-29 19:53:28 -03:00
Maurício Meneghini Fauth
3c71a775b5
Merge pull request #14210 from mauriciofauth/themes 
Add Metro theme
 2018-04-29 19:26:28 -03:00
Maurício Meneghini Fauth
a6acd862df Change Brazilian Portuguese to Portuguese (Brazil) 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-29 15:35:42 -03:00
Maurício Meneghini Fauth
5a422a22ac Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-04-29 20:12:01 +02:00
Weblate
5b673c3c19 Merge remote-tracking branch 'origin/master' 2018-04-29 20:03:06 +02:00
Giovanni Sora
b23ec324d4 Translated using Weblate (Interlingua) 
Currently translated at 75.3% (2479 of 3288 strings)

[CI skip]
 2018-04-29 20:03:01 +02:00
Dadan Setia
28229459fd Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-04-29 20:02:59 +02:00
Yaron Shahrabani
cd63800ffe Translated using Weblate (Hebrew) 
Currently translated at 33.8% (1114 of 3288 strings)

[CI skip]
 2018-04-29 20:02:55 +02:00
Maurício Meneghini Fauth
42d4f32d50 Merge branch 'QA_4_8' 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
 2018-04-29 15:02:32 -03:00
Vangelis Galanis
3a01bfd013 Fix some jQuery Migrate warnings 
Signed-off-by: Vangelis Galanis <vaggalanis@gmail.com>
 2018-04-29 19:10:42 +03:00
ssantos
b812bd5c73 Translated using Weblate (German) 
Currently translated at 100.0% (3288 of 3288 strings)

[CI skip]
 2018-04-29 17:36:28 +02:00
Madhura Jayaratne
151976aa61 Merge branch 'QA_4_8' of github.com:phpmyadmin/phpmyadmin into QA_4_8 2018-04-30 00:37:14 +10:00
Madhura Jayaratne
5872167dc2 Fix #14227 Relational linking broken 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2018-04-30 00:36:03 +10:00
Weblate
48f89e583b Merge remote-tracking branch 'origin/QA_4_8' into QA_4_8 2018-04-29 15:54:49 +02:00
Dadan Setia
bf08749f9e Translated using Weblate (Indonesian) 
Currently translated at 81.2% (2670 of 3288 strings)

[CI skip]
 2018-04-29 15:54:46 +02:00