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

109100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
0a8490f711 Merge remote-tracking branch 'origin/pull/12987' 2017-03-01 16:16:43 +01:00
Michal Čihař
2c55ecc450 Merge branch 'QA_4_7' 2017-03-01 15:57:24 +01:00
Michal Čihař
b7a87ce156 Adjust tests to new column selection code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:18 +01:00
Michal Čihař
585967b7e4 Fix columns selection in case of query fails 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:57:09 +01:00
Michal Čihař
19aad41506 Merge branch 'QA_4_7' 2017-03-01 15:53:02 +01:00
Michal Čihař
9d13e3d143 Display first char field for foreign key if nothing is configured 
In most cases this is what users want to see and anyway it is way better
than showing nothing.

Issue #12835

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:52:05 +01:00
Michal Čihař
faffa92f22 Fixed related field selection for native relations 
The PMA_getForeigners handles just fine both situations, so there is no
need to check the configuration in advance.

Fixes #12967

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 15:43:33 +01:00
Michal Čihař
002c39877e Merge branch 'QA_4_7' 2017-03-01 12:41:32 +01:00
Michal Čihař
cb60b4a750 Fixed displaying of all rows 
Fixes #13031

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 12:41:07 +01:00
Michal Čihař
12f7f6a785 Merge branch 'QA_4_7' 2017-03-01 10:54:44 +01:00
Michal Čihař
a72a048f1e Correctly handle case when CURRENT_USER() fails 
It's not likely, but the code path was obviously returning wrong value.

Maybe it did happen in issue #13037

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:53:19 +01:00
Michal Čihař
bb95ecf852 Extend Dummy driver to be able to inject expected queries results 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:52:37 +01:00
Michal Čihař
ce49be7e07 Fix condition to activate tracker 
Invoking empty() on the result might work in most cases as false is
empty and false is result from failure, but on the other side empty can
be true for valid results as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 10:45:51 +01:00
Michal Čihař
dee50ad8d1 Reference self as self not using class name 
Issue #13040

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 09:59:58 +01:00
Michal Čihař
4f4667b336 Merge branch 'QA_4_7' 2017-03-01 09:42:13 +01:00
Weblate
6a4a651c44 Merge remote-tracking branch 'origin/master' 2017-03-01 09:36:27 +01:00
Lalith Attanapola
a14c82b2f4 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.6% (1841 of 3193 strings)

[CI skip]
 2017-03-01 09:36:25 +01:00
tmtisfree
9679c4257f Translated using Weblate (French) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-03-01 09:36:23 +01:00
Michal Čihař
7881010d8a Merge branch 'QA_4_7' 2017-03-01 09:36:06 +01:00
Michal Čihař
289c86fc92 Merge commit 'ff5f6db32d52a0a5d4db14ec4101dde8fe04ea83' 2017-03-01 09:36:02 +01:00
Weblate
16c8c60034 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-03-01 09:35:56 +01:00
Lalith Attanapola
0e35120a43 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.6% (1841 of 3192 strings)

[CI skip]
 2017-03-01 09:35:55 +01:00
tmtisfree
e2793c36ad Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-03-01 09:35:54 +01:00
Michal Čihař
248a42af7e Fixed javascript confirmation of dangerous queries 
The confirmations did work properly only in console and not anywhere
else.

- the check function was expecting textarea, while it got text from
  other calls
- the check for empty form was completely outdated, but that seems to
  lead only to dead code and no breakage
- for the inline editor, the form was not properly focused and restored
  on confirmation error

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-01 09:33:18 +01:00
Weblate
ff5f6db32d Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-27 11:43:03 +01:00
Володимир
cc7d5d5c17 Translated using Weblate (Ukrainian) 
Currently translated at 92.4% (2951 of 3192 strings)

[CI skip]
 2017-02-27 11:43:03 +01:00
tmtisfree
99c8937647 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-02-27 11:43:01 +01:00
Michal Čihař
dcb5a8d926 Merge branch 'QA_4_7' 2017-02-27 11:42:45 +01:00
Michal Čihař
843118b449 Merge remote-tracking branch 'origin/QA_4_7' 2017-02-27 11:42:42 +01:00
Michal Čihař
c27d47ed75 Use Referrer-Policy header to specify referrer policy 
The referrer policy in Content-Security-Policy is deprecated.

Fixes #13033

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-02-27 11:42:21 +01:00
Weblate
7fa42d634e Merge remote-tracking branch 'origin/master' 2017-02-27 11:15:28 +01:00
Володимир
670ac2296a Translated using Weblate (Ukrainian) 
Currently translated at 92.4% (2951 of 3193 strings)

[CI skip]
 2017-02-27 11:15:27 +01:00
Microgamer
eac83b6e69 Translated using Weblate (German) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-27 11:15:22 +01:00
tmtisfree
09a3d4c7a9 Translated using Weblate (French) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-27 11:15:22 +01:00
Michal Čihař
3fea1bd5ab Merge pull request #12937 from poush/fix12006 
templating getRadioFields(), getDropDown() in Util.php
 2017-02-27 11:15:09 +01:00
Microgamer
0ac8353321 Translated using Weblate (German) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-26 21:08:38 +01:00
tmtisfree
d7aca6b9a4 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-02-24 10:00:21 +01:00
tmtisfree
8639f51274 Translated using Weblate (French) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-24 10:00:12 +01:00
Joshua Atkins
68f107786c Typographical quotes for table comments 
Signed-off-by: Joshua Atkins <support@jublo.net>
 2017-02-23 12:01:02 +01:00
Burak Yavuz
982d0bdef0 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-23 11:59:29 +01:00
Domen
cbc49c0dbb Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-22 23:12:52 +01:00
Παναγιώτης Παπάζογλου
f09c04281c Translated using Weblate (Greek) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-22 20:30:25 +01:00
tmtisfree
70fe826887 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-02-22 20:01:13 +01:00
tmtisfree
0842835c73 Translated using Weblate (French) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2017-02-22 20:01:03 +01:00
Piyush Agrawal
60dc48155a comments removed, if-else brackets added 
Signed-off-by: Piyush Agrawal <poush12@gmail.com>
 2017-02-22 14:53:13 +05:30
Сергій Педько
1242a967ff Translated using Weblate (Ukrainian) 
Currently translated at 80.0% (2556 of 3193 strings)

[CI skip]
 2017-02-22 10:09:29 +01:00
Weblate
864153ed4c Merge remote-tracking branch 'origin/master' 2017-02-22 09:57:00 +01:00
tmtisfree
4f10087779 Translated using Weblate (French) 
Currently translated at 99.9% (3192 of 3193 strings)

[CI skip]
 2017-02-22 09:56:55 +01:00
Weblate
aa1925c898 Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 2017-02-22 09:56:53 +01:00
tmtisfree
f10fd7deb9 Translated using Weblate (French) 
Currently translated at 100.0% (3192 of 3192 strings)

[CI skip]
 2017-02-22 09:56:50 +01:00