gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,011 Commits 12 Branches 481 Tags 2.4 GiB
44f5b605ae
Commit Graph

107011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
44f5b605ae Merge branch 'QA_4_6' 2016-08-28 10:31:28 +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
63600798fd Merge branch 'QA_4_6' 2016-08-27 11:52:13 -04: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ř
b4807f74e8 Merge branch 'QA_4_6' 2016-08-27 09:16:08 +02: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
dd34ca8512 Merge branch 'QA_4_6' 2016-08-26 00:08:02 +05:30
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
d5c3302fb4 Merge branch 'QA_4_6' 2016-08-25 19:42:25 +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
27d0483192 Merge branch 'QA_4_6' 2016-08-25 19:41:20 +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ř
87f4e954d1 Merge branch 'QA_4_6' 2016-08-25 14:57:30 +02:00
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ř
71336fb6cd Merge branch 'QA_4_6' 2016-08-25 14:33:57 +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
Weblate
2cd4a51dbc Merge remote-tracking branch 'origin/master' 2016-08-25 09:41:22 +02:00
Renan Souza do Nascimento
3d582a3fe8 Translated using Weblate (Portuguese) 
Currently translated at 53.4% (1722 of 3219 strings)

[CI skip]
 2016-08-25 09:41:21 +02:00
Michal Čihař
c95a2c35eb Merge branch 'QA_4_6' 2016-08-25 09:40:59 +02:00
Michal Čihař
2e4c6b3c4a Merge remote-tracking branch 'origin/QA_4_6' 2016-08-25 09:39:50 +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ř
8d46edc4b6 Merge branch 'QA_4_6' 2016-08-24 12:03:37 +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ř
31f6d76405 Merge branch 'QA_4_6' 2016-08-24 11:55:10 +02:00
Michal Čihař
c8c0341d68 Merge remote-tracking branch 'origin/QA_4_6' 2016-08-24 11:50:38 +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
Weblate
043d4ea952 Merge remote-tracking branch 'origin/master' 2016-08-23 16:15:04 +02:00
Lucius Gaitán
ab37daa93e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.6% (2981 of 3219 strings)

[CI skip]
 2016-08-23 16:15:03 +02:00
Giovanni Sora
512782c425 Translated using Weblate (Interlingua) 
Currently translated at 73.6% (2370 of 3219 strings)

[CI skip]
 2016-08-23 16:15:02 +02:00
Isaac Bennetch
3cc02ea2a5 Merge pull request #12406 from nijel/sign-tags 
GPG sign Git release tags
 2016-08-23 10:14:53 -04: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
Satnam S Virdi
c99aeab150 Translated using Weblate (Punjabi) 
Currently translated at 3.1% (102 of 3219 strings)

[CI skip]
 2016-08-23 15:45:40 +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
Michal Čihař
f45a277647 Translated using Weblate (Ukrainian) 
Currently translated at 79.8% (2571 of 3219 strings)

[CI skip]
 2016-08-21 17:35:34 +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
Bohdan S
932b165bb2 Translated using Weblate (Ukrainian) 
Currently translated at 79.8% (2571 of 3219 strings)

[CI skip]
 2016-08-21 15:46:13 +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
Domen
7b5e9e26db Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3219 of 3219 strings)

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

[CI skip]
 2016-08-20 23:33:58 +02:00
Michal Čihař
46b329c32b Merge branch 'QA_4_6' 2016-08-18 17:37:34 +02:00