gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,853 Commits 12 Branches 481 Tags 2.4 GiB
5e15a2b054
Commit Graph

105853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
5e15a2b054 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-06 11:32:00 +02:00
Sevdimali İsa
954ebe9cbc Translated using Weblate (Azerbaijani) 
Currently translated at 52.4% (1680 of 3206 strings)

[CI skip]
 2016-09-06 11:31:57 +02:00
Michal Čihař
28c981dd31 Merge pull request #12532 from devenbansod/fix_12531 
Fix #12531 : Properly flag queries as DROP DATABASE
 2016-09-06 11:31:53 +02:00
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Deven Bansod
6bcc593c84 Fix 'Unsupported query' message from Travis logs 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-05 23:00:12 +05:30
Balázs Úr
934c740c2c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-05 18:00:46 +02:00
Balázs Úr
0a7d3afd27 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-09-04 20:17:23 +02:00
Deven Bansod
2a2d6d8bd6 Fix #12534: Remove option from after_field select after a column is dropped 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-04 20:34:36 +05:30
Michal Čihař
e803caed71 Use single quotes in PHP code 
Fixes #12405

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 16:23:21 +02:00
Weblate
2e58cf0105 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-09-02 14:41:00 +02:00
Jozef Pistej
beda3204d5 Translated using Weblate (Slovak) 
Currently translated at 83.4% (2675 of 3206 strings)

[CI skip]
 2016-09-02 14:40:59 +02:00
Michal Čihař
48b44fcf91 Translated using Weblate (Russian) 
Currently translated at 98.1% (3153 of 3213 strings)

[CI skip]
 2016-09-02 14:40:59 +02:00
Michal Čihař
e01f404804 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:40:18 +02:00
Michal Čihař
829d51c9dd Treat hide_location error as user ones 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:38:52 +02:00
Michal Čihař
eb3e3b73c3 Simplified handling of connection errors 
There is no need to retrigger errors, just let the handler know to
handle them without backtrace.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:35:36 +02:00
Michal Čihař
2251ca21c0 Fix regexp for file path cleanup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:25:04 +02:00
Michal Čihař
cb3f2632a9 Properly escape session startup errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-02 14:23:35 +02:00
Michal Čihař
f3ca367efa Fix number formatting with different settings of precision in PHP 
- fixed Util::formatNumber to avoid rounding issues to mess up display
- force precision = 14 to ensure we get sane behavior

With precision set to higher value many things do not behave as expected
producing strange numbers in various places.

For example with precision=19 you get:

php > echo round(1.2, 2);
1.199999999999999956

Fixes #12303

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 15:51:18 +02:00
Michal Čihař
f3babbb945 Correctly calculate string length 
Fixes #12517

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:48:43 +02:00
Michal Čihař
a3d811571a Fix <iframe> tag 
Fixes #12513

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:14:02 +02:00
Michal Čihař
c9000876d5 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-08-30 14:12:26 +02:00
Michal Čihař
d24dd24b75 Ensure unlim_num_rows is numberic 
Fixes #12516

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:08:47 +02:00
Weblate
7563c88c9b Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-08-30 14:05:32 +02:00
Diego Bemquerer Castro
e16af0866d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2987 of 3206 strings)

[CI skip]
 2016-08-30 14:05:31 +02:00
Michal Čihař
ee1878d3ca Extend .gitignore 
Fixes #12515

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-30 14:04:55 +02:00
Michal Čihař
38ce0c9d44 Remove unused paramenter when connecting to MySQLi 
Fixes #12502

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:30:32 +02:00
Isaac Bennetch
efe97b1500 Unable to edit transformations, issue 12292 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-08-27 11:51:37 -04:00
Michal Čihař
ad5187383d Automatically save SQL query in browser local storage 
..when available rather than in cookie as we do not want to send huge
cookies with SQL query there and back.

Issue #12251
Issue phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 09:15:28 +02:00
Deven Bansod
d7181d1b5a ChangeLog entries for #12476 and #12477 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:04:19 +05:30
Deven Bansod
b3e7f10f2e Check if the indices are present and map to a string value 
Fix #12477

The indices may not be present in the json_decode result, or might not be strings

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:02:21 +05:30
Deven Bansod
96f5f101cc Add error checking in reading the advisory_rules file 
If the file does not exist or if it is not readable by PHP, it can return FALSE.
In such cases, we should print a user-friendly message and return from parsing the rules file.

Fix #12476

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-26 00:01:15 +05:30
Deven Bansod
d0b8281e84 ChangeLog entry for #12497 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-25 19:42:18 +05:30
Deven Bansod
df29d8ae41 Add appr. escaping for $cfg options 'hide_db' and 'only_db' 
These can lead to SQL injection.

Fix #12497

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-25 19:36:35 +05:30
Michal Čihař
26cc80324e Validate git commit hash before using 
Just to ensure we've parsed correct data.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:56:41 +02:00
Michal Čihař
9882dcba3a Fixed editing of ENUM/SET/DECIMAL fields structure 
Fixes #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:33:21 +02:00
Michal Čihař
33348c5ed5 Allow to specify length of 0 
Issue #12480

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 14:32:48 +02:00
Michal Čihař
fb3b722da1 Fixed random logouts due to wrong cookie path 
Some script did not properly configure their relative path and this
could lead to wrong cookie path being set. This doesn't happen in all
cases as the PHP session engine doesn't seem to set the cookie session
in every request.

Fixes #12251
Fixes phpmyadmin/docker#32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-25 09:38:17 +02:00
Renan Souza do Nascimento
54a0594493 Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1724 of 3206 strings)

[CI skip]
 2016-08-25 09:38:10 +02:00
Michal Čihař
6879923acc Do not show warning about short blowfish_secret if none is set 
With empty blowfish_secret user would always get both warnings...

Fixes #12485

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 12:03:22 +02:00
Michal Čihař
cbd6137c03 Avoid double escaping of built in transformation URLs 
We do already escape them in the tranformation, so avoid doing that
before.

Issue #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:48:48 +02:00
Michal Čihař
ed6188d2c8 Whitelist relative URLs from built in transformatons 
Fixes #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:46:46 +02:00
Michal Čihař
38cf234707 Force relative paths in links 
This way we avoid potential problem if script name resolves to a domain.

Issue #12483

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:45:40 +02:00
Michal Čihař
48b6dd58d8 Use one code to check external links 
There is no good reason to duplicate the check in several places.

Fixes #12479

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:38:03 +02:00
Michal Čihař
265efb046f Extend PMA_checkLink to cover more use cases 
- allow to support mailto, ftp or http links on request
- do not use multibyte functions as we're interested in first chars
  anyway and we're comparing against ascii ones

Issue #12479

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-24 11:33:52 +02:00
Giovanni Sora
4a9b84faa2 Translated using Weblate (Interlingua) 
Currently translated at 73.5% (2357 of 3206 strings)

[CI skip]
 2016-08-24 11:19:48 +02:00
Lucius Gaitán
09597d9c5e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 93.1% (2987 of 3206 strings)

[CI skip]
 2016-08-24 06:45:39 +02:00
Satnam S Virdi
d4352a3097 Translated using Weblate (Punjabi) 
Currently translated at 3.1% (102 of 3206 strings)

[CI skip]
 2016-08-23 15:45:45 +02:00
Παναγιώτης Παπάζογλου
6ab7c1318f Translated using Weblate (Greek) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-08-23 00:44:56 +02:00
Bohdan S
140d0e5a5b Translated using Weblate (Ukrainian) 
Currently translated at 80.3% (2575 of 3206 strings)

[CI skip]
 2016-08-21 15:46:18 +02:00
Domen
232bbd0461 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3206 of 3206 strings)

[CI skip]
 2016-08-21 06:46:02 +02:00