xmujay
c406a0c190
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2
2013-07-29 22:09:00 +08:00
Kristjan Räts
dcee4d5cd6
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 16:05:49 +02:00
Weblate
2b38f879e8
Merge remote-tracking branch 'origin/master'
2013-07-29 15:50:52 +02:00
Kristjan Räts
c88f287566
Translated using Weblate (Estonian)
...
Currently translated at 99.0% (2682 of 2708)
2013-07-29 15:50:46 +02:00
Michal Čihař
fc5eace830
Process only php files using phpcs
2013-07-29 15:50:36 +02:00
Michal Čihař
2374448044
Update po files
2013-07-29 15:40:22 +02:00
Weblate
e9ca68e6fa
Merge remote-tracking branch 'origin/master'
2013-07-29 15:38:13 +02:00
Michal Čihař
a418f958d6
Translated using Weblate (Czech)
...
Currently translated at 100.0% (2708 of 2709)
2013-07-29 15:38:07 +02:00
Michal Čihař
1317d747a0
Fix typo
2013-07-29 15:37:36 +02:00
Michal Čihař
1a0ac83ee3
Remove extra space
2013-07-29 15:36:51 +02:00
Michal Čihař
0af37bf05b
Add missing comma
2013-07-29 15:34:57 +02:00
Michal Čihař
030462f117
Merge remote-tracking branch 'origin/QA_4_0'
2013-07-29 15:08:06 +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ř
04b24be3fa
Update po files
2013-07-29 15:05:42 +02:00
Michal Čihař
3d8a615612
Update po files
2013-07-29 15:05:39 +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
xmujay
96c1546b3d
refresh navigation panel when upload finished
2013-07-29 20:20:11 +08: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
xmujay
36cef3b76d
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2
2013-07-29 13:28:09 +08: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
