Matías Bellone
5ff68783cb
Translated using Weblate (Spanish)
...
Currently translated at 99.7% (2699 of 2708)
2013-07-29 22:22:55 +02:00
Matías Bellone
c0b40b2710
Translated using Weblate (Spanish)
...
Currently translated at 99.3% (2689 of 2708)
2013-07-29 22:05:33 +02:00
Burak Yavuz
518d0e02ad
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 22:04:41 +02:00
Burak Yavuz
d68dfbfe64
Translated using Weblate (Turkish)
...
Currently translated at 99.5% (2695 of 2708)
2013-07-29 20:43:00 +02:00
Burak Yavuz
5fa2399cba
Translated using Weblate (Turkish)
...
Currently translated at 99.0% (2682 of 2708)
2013-07-29 20:21:41 +02:00
Marc Delisle
dfaf2b91b4
Translated using Weblate (French)
...
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 20:21:14 +02:00
Marc Delisle
c5e3979193
Translated using Weblate (French)
...
Currently translated at 99.6% (2697 of 2707)
2013-07-29 19:40:16 +02:00
Marc Delisle
ba8d5f7fd5
Translated using Weblate (French)
...
Currently translated at 99.6% (2697 of 2707)
2013-07-29 19:39:55 +02:00
Weblate
239ce57941
Merge remote-tracking branch 'origin/master'
2013-07-29 19:39:35 +02:00
Domen
0d6f02d226
Translated using Weblate (Slovenian)
...
Currently translated at 100.0% (2693 of 2693)
2013-07-29 19:39:09 +02:00
Marc Delisle
dd0276a90b
Translated using Weblate (French)
...
Currently translated at 99.6% (2696 of 2707)
2013-07-29 19:38:50 +02:00
Marc Delisle
a9b7592c8d
English improvement in messages
2013-07-29 13:36:46 -04:00
Domen
cbd43d5468
Translated using Weblate (Slovenian)
...
Currently translated at 100.0% (2693.0 of 2693)
2013-07-29 18:25:44 +02:00
Weblate
659f973173
Merge remote-tracking branch 'origin/master'
2013-07-29 18:04:11 +02:00
Giovanni Sora
129ae2e0f6
Translated using Weblate (Interlingua)
...
Currently translated at 18.5% (500 of 2700)
2013-07-29 18:04:08 +02:00
Isaac Bennetch
07160dec71
Merge pull request #548 from kasunchathuranga/hideTables
...
Move common code to a common ancestor
2013-07-29 09:03:46 -07:00
Weblate
84bf4f5675
Merge remote-tracking branch 'origin/master'
2013-07-29 16:12:19 +02:00
Kristjan Räts
54068e38e4
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2708 of 2708)
2013-07-29 16:11:40 +02:00
Dieter Adriaenssens
d7e585e854
Translated using Weblate (Dutch)
...
Currently translated at 99.4% (2692 of 2708)
2013-07-29 16:11:29 +02:00
Atul Pratap Singh
51f5a3eb65
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2013-07-29 19:40:25 +05:30
Atul Pratap Singh
78cf1c4e22
Left while fixing 4006
2013-07-29 19:37:43 +05:30
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
Atul Pratap Singh
5d590ef3d6
Fix bug#4006
2013-07-29 17:36:45 +05:30
Kasun Chathuranga
b76a1e27a9
Fix comment
2013-07-29 17:26:11 +05:30
Kasun Chathuranga
989161e2bd
Move common code to a common ancestor
2013-07-29 17:03:35 +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
