Commit Graph

82871 Commits

Author SHA1 Message Date
Myung Han Yu
6e65daca2b Translated using Weblate (Korean)
Currently translated at 71.1% (1855 of 2609)
2013-07-31 09:58:40 +02:00
Henry Heinänen
3d150bbb0a Translated using Weblate (Finnish)
Currently translated at 69.8% (1820 of 2609)
2013-07-30 14:55:10 +02:00
Weblate
3c112edaf3 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-30 14:30:17 +02:00
Tony Chen
0cfbab1528 Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2609 of 2609)
2013-07-30 14:29:47 +02:00
Marc Delisle
baf3dd9b6a Bug #4036 Call to undefined function mb_detect_encoding (clarify the doc) 2013-07-30 08:27:12 -04:00
G. S
a46c38ca94 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-30 14:14:49 +02:00
Anders Jonsson
a58c58a29a Translated using Weblate (Swedish)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-30 11:15:37 +02:00
Tony Chen
917e126e5e Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-30 10:31:34 +02:00
Michal Čihař
d56df11886 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-30 10:17:38 +02:00
Michal Čihař
4da684e7b6 Fixed escaping in error message asking for translations 2013-07-30 10:17:32 +02:00
Michal Čihař
41e06a48fd Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-30 09:41:13 +02:00
Michal Čihař
da4042fb6c Display none only if protection is enabled 2013-07-30 09:40:56 +02:00
Weblate
7cb3344f45 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-29 22:35:58 +02:00
Burak Yavuz
fda943a924 Translated using Weblate (Turkish)
Currently translated at 100.0% (2609 of 2609)
2013-07-29 22:35:42 +02:00
Marc Delisle
5d946eaf57 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 16:32:03 -04:00
Marc Delisle
66fe475d4f ChangeLog entry for Improved protection against cross framing 2013-07-29 16:31:44 -04:00
Matías Bellone
965105c14c Translated using Weblate (Spanish)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 21:15:26 +02:00
Burak Yavuz
22f2158def Translated using Weblate (Turkish)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 20:20:21 +02:00
Marc Delisle
f464ba0f0d Translated using Weblate (French)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 19:26:09 +02:00
Domen
35d553f34f Translated using Weblate (Slovenian)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 18:20:00 +02:00
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