Michal Čihař
04b24be3fa
Update po files
2013-07-29 15:05:42 +02:00
Michal Čihař
5c51f4fecb
Merge remote-tracking branch 'origin/QA_4_0'
...
Conflicts:
libraries/config/setup.forms.php
2013-07-29 15:00:53 +02:00
Michal Čihař
80e6ecc1c2
Merge commit '5d590ef3d67b4f87b58dbda50e86519bf9b64d34'
...
Conflicts:
import.php
2013-07-29 15:00:07 +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
1da0b0b211
Fix typo
2013-07-29 04:54:48 -04:00
Michal Čihař
3e3620f22d
Use dot notation
2013-07-29 09:29:12 +02:00
Michal Čihař
aaca8fc4c9
Define variable before using it
2013-07-29 09:28:33 +02:00
Michal Čihař
da81549411
Better readable code
2013-07-29 09:26:09 +02:00
Michal Čihař
a3d247ea59
Fixed newlines around +
2013-07-29 09:24:53 +02:00
Michal Čihař
3ef4d4cb2e
Single declaration of a variable
2013-07-29 09:23:44 +02:00
Michal Čihař
22e018f998
Fixed newlines around ||
2013-07-29 09:22:51 +02:00
Michal Čihař
fdc2ac7be5
Fixed newlines around &&
2013-07-29 09:22:37 +02:00
Michal Čihař
1d2f4a5ad3
Merge pull request #545 from adamgsoc2013/ut_plu_dbi
...
test case for DBI/DBIMysql*
2013-07-28 11:18:56 -07:00
Michal Čihař
a413b6bb6b
Merge pull request #544 from adamgsoc2013/UT_plu_table
...
Unit test case for User_Schema
2013-07-28 11:17:41 -07:00
Marc Delisle
0c21130100
Merge pull request #541 from scnakandala/gsoc_2013_2
...
Refactoring SQL executor
2013-07-28 10:03:35 -07:00
adamgsoc2013
da673ad8be
test case for DBI/DBIMysql*
2013-07-28 23:10:55 +08:00
adamgsoc2013
6cae4843eb
rename to test case function name
2013-07-28 23:06:27 +08:00
adamgsoc2013
6292715857
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into UT_plu_table
2013-07-28 23:03:49 +08:00
adamgsoc2013
388a66cd4e
Unit test case for User_Schema
2013-07-28 21:45:08 +08:00
Marc Delisle
cd0167fb80
Merge branch 'QA_4_0'
2013-07-28 09:36:15 -04:00
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
fdb0ad1f69
Merge branch 'QA_4_0'
2013-07-28 06:26:12 -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
269d0c89fe
Fix merge conflicts
2013-07-28 06:17:38 -04:00
Marc Delisle
836529be42
Fix merge conflicts
2013-07-28 05:55:40 -04:00
Spun Nakandala
7b77857602
Query results operations not shown in Show PHP Code
2013-07-28 11:33:48 +05:30
Spun Nakandala
5d539b1b61
duplicate messages after without php code clicked corrected
2013-07-28 11:32:07 +05:30
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
Michal Čihař
6df3c0adb5
Merge pull request #543 from madhuracj/pma_string
...
Pma string
2013-07-27 12:50:24 -07:00
Madhura Jayaratne
627ed59770
Fix failing tests
2013-07-28 01:10:22 +05:30
Madhura Jayaratne
09f1e0cb97
Fix typo
2013-07-28 01:00:34 +05:30
Madhura Jayaratne
dcfeeafe3b
Update test cases
2013-07-28 00:56:02 +05:30
Madhura Jayaratne
a025dc7d2a
Move interfaces into files of their own
2013-07-28 00:04:12 +05:30
Madhura Jayaratne
841ae562e3
Do not access $GLOBALS['PMA_String'] from StringNativeType class
2013-07-27 23:52:17 +05:30
Isaac Bennetch
b0da1d1a99
Generate image sprites (for hide navigation feature)
2013-07-27 14:12:12 -04:00
Isaac Bennetch
1a41ce1f59
Merge branch 'hideTables' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-hideTables
...
Conflicts:
ChangeLog
2013-07-27 14:01:35 -04:00
Madhura Jayaratne
bce4e73452
Simplify
2013-07-27 23:29:57 +05:30
Madhura Jayaratne
37233934a4
Use $this to refer to the instance
2013-07-27 23:29:10 +05:30
Spun Nakandala
3dd358746d
removed include sql.php from import.php
2013-07-27 23:18:06 +05:30
Spun Nakandala
c44eb79b49
no use of the code segment
2013-07-27 23:18:04 +05:30
