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

106496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
1e2c24474e Merge branch 'QA_4_6' into QA_4_6-security 2017-01-21 16:45:06 +01:00
Michal Čihař
593f71dd23 Fixed filtering for active processes 
There are dozen of process states when executing the query, we can't
filter just for one of them. Let's rather exclude those without state
and are idling.

See also http://dev.mysql.com/doc/refman/5.7/en/general-thread-states.html

Fixes #12732

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 16:24:34 +01:00
Michal Čihař
e7928e58cc Update SQL parser to 3.4.17 
Fixes #12894

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 14:06:06 +01:00
Michal Čihař
827ff5715a Fix database search with newer php-gettext 
We really need integer from count query.

Fixes #12881

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-20 13:19:24 +01:00
Weblate
9d3c265adc Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-20 03:47:53 +01:00
Flavio Coelho
206a59007a Translated using Weblate (Portuguese) 
Currently translated at 54.0% (1740 of 3222 strings)

[CI skip]
 2017-01-20 03:47:52 +01:00
Isaac Bennetch
f2cdfc5d00 Merge pull request #12884 from slimtim/issue_12840_v2 
Fix PHP Notice 'Undefined index: row_format' when altering table options
 2017-01-19 21:47:42 -05:00
Michal Čihař
71575e3d49 Changelog entry for #12876 and #12885 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 18:05:46 +01:00
Michal Čihař
82ae5abef3 Merge pull request #12885 from slimtim/issue_12876_v4 
Fix PHP notices and warning related to dbs_to_test global
 2017-01-18 18:04:49 +01:00
Weblate
c4bd5dfab4 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-18 10:00:12 +01:00
Giovanni Sora
9b96ff3b17 Translated using Weblate (Interlingua) 
Currently translated at 75.9% (2447 of 3222 strings)

[CI skip]
 2017-01-18 10:00:10 +01:00
Michal Čihař
f1aefb1fa5 Changelog entry for #12861 and #12891 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:59:12 +01:00
Michal Čihař
89357ee0f1 Share code for getting lower_case_table_names value 
Issue #12861

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-18 09:58:29 +01:00
Mike Lewis
3bf78afeca Only convert table name to lower-case when installation forces it 
Issue #12861

A `lower_case_table_names` setting of `2` does not mean that the table needs to be forced to lower-case
This preserves case unless the `lower_case_table_names` setting is `1`, implying that lower-case should be forced

Signed-off-by: Mike Lewis <mike@mplew.is>
 2017-01-18 09:55:25 +01:00
Weblate
f4c620bcf2 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-17 20:12:08 +01:00
Sevdimali İsa
575f34953d Translated using Weblate (Azerbaijani) 
Currently translated at 53.3% (1718 of 3222 strings)

[CI skip]
 2017-01-17 20:12:05 +01:00
Isaac Bennetch
f1375a26a3 Remove dead code related to 4a2695c 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 14:10:24 -05:00
Tim McLaughlin
18d48bb20f Merge branch 'QA_4_6' into issue_12876_v4 2017-01-17 12:00:38 -05:00
Michal Čihař
eb2898527f Changelog entry for #12495 and #12875 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-17 17:22:21 +01:00
Michal Čihař
e21b4f998e Merge remote-tracking branch 'origin/pull/12875' into QA_4_6 2017-01-17 17:21:52 +01:00
Isaac Bennetch
986035a716 Add ChangeLog entry for issue 12831 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-17 10:51:47 -05:00
Shreyas Sinha
4a2695cf5b Row coloring issue and incorrect table code 
Fixes issue #12831

Signed-off-by: Shreyas Sinha <shreyas.sinha14@gmail.com>
 2017-01-17 10:51:47 -05:00
Michal Čihař
a5d677115e Merge branch 'QA_4_6' into QA_4_6-security 2017-01-17 13:37:00 +01:00
Ariel Alonso
a0e0eea03d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.6% (3049 of 3222 strings)

[CI skip]
 2017-01-17 13:35:25 +01:00
Manuela Silva
4233fbc874 Translated using Weblate (Portuguese) 
Currently translated at 53.9% (1738 of 3222 strings)

[CI skip]
 2017-01-17 13:35:24 +01:00
Michal Čihař
4ab34edba6 Merge changes from php-gettext 1.0.12 
This ensures that parameter to select_string is numeric, avoiding code
injection through it.

Our code is not vulnerable as we do not pass user supplied values to
this function, this fix is included only to be closer to upstream.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-17 13:33:10 +01:00
Tim McLaughlin
bef006a92a Fix PHP notices and warning related to dbs_to_test global. 
Issue #12876
Signed-off-by: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
 2017-01-09 18:45:38 -08:00
Tim McLaughlin
3b07b39c35 Fix PHP Notice 'Undefined index: row_format' when altering table options. 
Issue #12840
Signed-off-by: Tim McLaughlin <tim.j.mclaughlin@gmail.com>
 2017-01-09 18:33:14 -08:00
Yungu Kim
95956f011d Translated using Weblate (Korean) 
Currently translated at 81.1% (2616 of 3222 strings)

[CI skip]
 2017-01-09 18:45:31 +01:00
Michal Čihař
4abbe78a07 Remove unused entries from goto whitelist 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 16:09:57 +01:00
Michal Čihař
fdbef2dcc8 Add warning about enabling phpinfo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 14:30:37 +01:00
Michal Čihař
1089a7d67e Limit what we display in phpinfo 
- general information
- configuration
- modules

This way we avoid displaying sensitive things (such as httpOnly cookies
from environment of variables).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-07 14:23:28 +01:00
Michal Čihař
93e354c2e3 Revert "Remove option to show phpinfo() ($cfg['ShowPhpInfo'])" 
This reverts commit e67e69229a.
 2017-01-07 14:22:14 +01:00
Michal Čihař
cbcf740adb Merge branch 'QA_4_6' into QA_4_6-security 2017-01-07 11:00:58 +01:00
Michal Čihař
fee3923f48 Update SQL parser to 3.4.16 
* Coding style fixes.
* Properly handle operators AND, NOT, OR, XOR, DIV, MOD

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 12:43:14 +01:00
Michal Čihař
681e908991 Fix check for user groups freatures being enabled 
Fixes #12868

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 09:56:15 +01:00
Michal Čihař
8efea217ff Use same query for display and execution when dropping index 
Fixes #12872

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-06 09:45:42 +01:00
Flavius Nopcea
03cc225303 Translated using Weblate (Romanian) 
Currently translated at 53.7% (1732 of 3222 strings)

[CI skip]
 2017-01-06 09:43:38 +01:00
Mateusz Wasik
737cfafb92 Translated using Weblate (Polish) 
Currently translated at 82.8% (2669 of 3222 strings)

[CI skip]
 2017-01-06 09:43:38 +01:00
Weblate
5c7f0cc7ac Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2017-01-04 16:19:23 +01:00
Flavius Nopcea
ae34ebc929 Translated using Weblate (Romanian) 
Currently translated at 53.6% (1729 of 3222 strings)

[CI skip]
 2017-01-04 16:19:22 +01:00
Daniel Palmeira Huanca
48d584794d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 94.5% (3048 of 3222 strings)

[CI skip]
 2017-01-04 16:19:22 +01:00
Dadan Setia
3a4ed9ac45 Translated using Weblate (Indonesian) 
Currently translated at 69.6% (2245 of 3222 strings)

[CI skip]
 2017-01-04 16:19:21 +01:00
Isaac Bennetch
16fba839bb Changed the SQL window suggestion tool to have DELETE...WHERE 0 instead of 1. 
This should help avoid accidental data loss.

Issue #12859

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2017-01-04 16:18:16 +01:00
Vinicius Veroneze
9b7f4f74e9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.3% (3008 of 3222 strings)

[CI skip]
 2017-01-03 16:54:10 +01:00
Michal Čihař
0376e599f0 Merge pull request #12853 from ibennetch/commatypo 
Fix incorrect comma in message string
 2017-01-02 17:05:58 +01:00
Michal Čihař
5f36fa56c4 Merge remote-tracking branch 'origin/MAINT_4_6_5' into QA_4_6 2017-01-02 16:15:29 +01:00
Michal Čihař
d018add94b Set MySQL SSL parameters even if key is not set 
User might want to set any of the SSL parameters without needing to set
the key.

Fixes #12293

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:06:09 +01:00
Rodrigo Felix
6a0d330718 Translated using Weblate (Portuguese) 
Currently translated at 53.6% (1728 of 3222 strings)

[CI skip]
 2016-12-31 21:46:10 +01:00
Marek Skiba
6316a71595 Translated using Weblate (Polish) 
Currently translated at 81.8% (2638 of 3222 strings)

[CI skip]
 2016-12-31 12:45:50 +01:00