Commit Graph

82851 Commits

Author SHA1 Message Date
Weblate
4039f0ce7a Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-29 16:21:52 +02:00
Dieter Adriaenssens
24b93c3a74 Translated using Weblate (Dutch)
Currently translated at 100.0% (2609 of 2609)
2013-07-29 16:20:58 +02:00
Atul Pratap Singh
90b04fd1e7 Left while fixing 4006 2013-07-29 19:48:29 +05:30
Kristjan Räts
0f58a928ce Translated using Weblate (Estonian)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 15:50:09 +02:00
Michal Čihař
20c8606d14 Translated using Weblate (Czech)
Currently translated at 100.0% (2609 of 2609)
2013-07-29 15:39:00 +02:00
Panagiotis Papazoglou
85dfc0b14e Translated using Weblate (Greek)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 15:29:43 +02:00
Michal Čihař
c87441a948 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 15:07:38 +02:00
Michal Čihař
5f6a162b11 Update po files 2013-07-29 15:07:26 +02:00
Michal Čihař
3d8a615612 Update po files 2013-07-29 15:05:39 +02:00
Michal Čihař
c3fa323311 Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-07-29 14:56:43 +02:00
Michal Čihař
f08ff304f9 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 14:55:41 +02:00
Michal Čihař
24d0eb5520 Improved protection against cross framing
We now include CSS to hide the page and display it conditionally after
checking we're in top frame. This adds extra protection for clients who
do not support X-Frame-Options.

See also http://en.wikipedia.org/wiki/Framekiller and
https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet
2013-07-29 14:55:29 +02:00
Michal Čihař
240b8332db Readd AllowThirdPartyFraming option
We want by default no framing of phpMyAdmin, but still some sites might
need to embed it, so configuration option (with appropriate security
warning) is there.

This basically reverts d7e0bed284.
2013-07-29 14:55:22 +02:00
Atul Pratap Singh
5d590ef3d6 Fix bug#4006 2013-07-29 17:36:45 +05:30
Marc Delisle
e73bfee67c 4.0.6-dev 2013-07-28 09:34:39 -04:00
Marc Delisle
6d2efd9c7b Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-28 09:32:57 -04:00
Marc Delisle
52b9b6c81f 4.0.5-rc1 2013-07-28 09:31:06 -04:00
Marc Delisle
0e9e7f28a2 Fix merge conflicts 2013-07-28 06:25:48 -04:00
Marc Delisle
af5ca358d2 Fix merge conflicts 2013-07-28 06:23:57 -04:00
Marc Delisle
f5136aea9e Merge branch 'MAINT_4_0_4' into QA_4_0 2013-07-28 06:22:49 -04:00
Marc Delisle
ad54449d10 4.0.4.2 release 2013-07-28 06:22:27 -04:00
Marc Delisle
836529be42 Fix merge conflicts 2013-07-28 05:55:40 -04:00
Dieter Adriaenssens
e0c8704f72 [security] Fix stored XSS in link transformation plugin, see PMASA-2013-13 2013-07-28 02:26:26 +02:00
Dieter Adriaenssens
b9c814ed6d [security] Fix unencoded json object, see PMASA-2013-11 2013-07-28 01:50:46 +02:00
Madhura Jayaratne
bf79ce9101 Add metro theme to ignore list 2013-07-27 18:07:32 +05:30
Marc Delisle
3fde4efd51 #3578 transformations for text/plain on a BLOB column 2013-07-27 06:32:58 -04:00
Marc Delisle
4a6b6bda90 bug #3998 Non-permanent SQL history not working 2013-07-26 08:59:04 -04:00
Xosé Calvo
70bcb1184c Translated using Weblate (Galician)
Currently translated at 100.0% (2606 of 2607)
2013-07-25 23:30:45 +02:00
Xosé Calvo
6c5426a3fb Translated using Weblate (Galician)
Currently translated at 98.8% (2577 of 2607)
2013-07-25 19:49:38 +02:00
Atul Pratap Singh
e8d85ade30 allow tooltip overflow, hide axis overflow explicitly 2013-07-25 21:31:37 +05:30
Atul Pratap Singh
c598c59d8a changelog entry for bug#4009 2013-07-25 20:57:39 +05:30
Atul Pratap Singh
a206fa87e9 Fix bug#4009, y-axis ticks invisible in Questions chart 2013-07-25 20:55:56 +05:30
Atul Pratap Singh
dacec69d3e Format values in Questions/Connections chart 2013-07-25 20:55:20 +05:30
Marc Delisle
1293e9b6e9 [security] Fix self-XSS in schema export, see PMASA-2013-14 2013-07-23 11:05:10 -04:00
Marc Delisle
8ef025ef3d [security] Fix control user SQL injection in schema_export.php, see PMASA-2015 2013-07-23 08:48:53 -04:00
Marc Delisle
974d0dedee [security] Fix control user SQL injection in pmd_pdf.php, see PMASA-2013-15 2013-07-23 08:35:07 -04:00
Michal Čihař
2f48cd69eb Fix rule definition (value and check were mixed) 2013-07-23 11:34:33 +02:00
Michal Čihař
81dba57b6a Better injection of variables into eval'd code 2013-07-23 11:20:56 +02:00
Weblate
71c26bcec2 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-20 16:27:30 +02:00
ProUser
6ff96fe062 Translated using Weblate (Swedish)
Currently translated at 100.0% (2607 of 2607)
2013-07-20 16:27:04 +02:00
Telma Gonzaga
8e18a98440 Translated using Weblate (Portuguese)
Currently translated at 50.6% (1319 of 2607)
2013-07-20 16:26:46 +02:00
Marc Delisle
6ac33adc15 ChangeLog entry for bug 4012 fix
Fix another case of parameter incorrectly passed by reference
Adjust functions parameter doc
2013-07-20 10:23:20 -04:00
Dmitriy Buldakov
cd421e018c Bug #4012 Crash on CSV file import 2013-07-20 10:18:02 -04:00
Telma Gonzaga
6209533319 Translated using Weblate (Portuguese)
Currently translated at 50.6% (1318 of 2607)
2013-07-20 08:18:22 +02:00
Michal Čihař
a24e973963 Translated using Weblate (Portuguese)
Currently translated at 50.5% (1317 of 2607)
2013-07-20 08:15:11 +02:00
Weblate
12571ab735 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-19 15:12:23 +02:00
Ballen Abdulkarim
883d272841 Translated using Weblate (Kurdish Sorani)
Currently translated at 21.1% (551 of 2607)
2013-07-19 15:12:02 +02:00
Marc Delisle
77e67c3f2c - bug #4019 Create database if not exists (export): add an option to the
interface to enable generating CREATE DATABASE and USE (false by default)
2013-07-19 09:09:24 -04:00
Marc Delisle
257bd7349c ChangeLog entry for full path disclosure fixes 2013-07-17 15:27:57 -04:00
Marc Delisle
1429272136 Remove other .htaccess for directories which are not at risk 2013-07-17 15:25:53 -04:00