Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: a418f958d6889281aca7950f658b80940aa04bdf
https://github.com/phpmyadmin/phpmyadmin/commit/a418f958d6889281aca7950f658…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 100.0% (2708 of 2709)
Commit: e9ca68e6faf1cc93ced5d74418145bdd121d7e52
https://github.com/phpmyadmin/phpmyadmin/commit/e9ca68e6faf1cc93ced5d744181…
Author: Weblate <noreply(a)weblate.org>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M build.xml
M libraries/server_privileges.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 23744480440d1a1060c2b1c619be571df0a2888a
https://github.com/phpmyadmin/phpmyadmin/commit/23744480440d1a1060c2b1c619b…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/kn.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1317d747a0e7...23744480440d
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3d8a6156124d310a727a7ec2802ae4204d57fd79
https://github.com/phpmyadmin/phpmyadmin/commit/3d8a6156124d310a727a7ec2802…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: 04b24be3fa33f05525a95e6917dfdaa33ce44541
https://github.com/phpmyadmin/phpmyadmin/commit/04b24be3fa33f05525a95e6917d…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/ia.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/kn.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/vls.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: 5f6a162b11da91cfbe67c5e6bb377a31b2c5291d
https://github.com/phpmyadmin/phpmyadmin/commit/5f6a162b11da91cfbe67c5e6bb3…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: c87441a9483871cfcaec8583853889aa8251ccf0
https://github.com/phpmyadmin/phpmyadmin/commit/c87441a9483871cfcaec8583853…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_5' into QA_4_0
Commit: 030462f117d8fdd7a62937bc5a4411ebf4de8e0d
https://github.com/phpmyadmin/phpmyadmin/commit/030462f117d8fdd7a62937bc5a4…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c51f4fecb3d...030462f117d8
Branch: refs/heads/MAINT_4_0_5
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3d8a6156124d310a727a7ec2802ae4204d57fd79
https://github.com/phpmyadmin/phpmyadmin/commit/3d8a6156124d310a727a7ec2802…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Branch: refs/heads/QA_4_0
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3d8a6156124d310a727a7ec2802ae4204d57fd79
https://github.com/phpmyadmin/phpmyadmin/commit/3d8a6156124d310a727a7ec2802…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: 5f6a162b11da91cfbe67c5e6bb377a31b2c5291d
https://github.com/phpmyadmin/phpmyadmin/commit/5f6a162b11da91cfbe67c5e6bb3…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M po/af.po
M po/ar.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bn.po
M po/br.po
M po/bs.po
M po/ca.po
M po/ckb.po
M po/cs.po
M po/cy.po
M po/da.po
M po/de.po
M po/el.po
M po/en_GB.po
M po/es.po
M po/et.po
M po/eu.po
M po/fa.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/he.po
M po/hi.po
M po/hr.po
M po/hu.po
M po/hy.po
M po/id.po
M po/it.po
M po/ja.po
M po/ka.po
M po/kk.po
M po/ko.po
M po/lt.po
M po/lv.po
M po/mk.po
M po/ml.po
M po/mn.po
M po/ms.po
M po/nb.po
M po/nl.po
M po/pa.po
M po/phpmyadmin.pot
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/si.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/ta.po
M po/te.po
M po/th.po
M po/tk.po
M po/tr.po
M po/tt.po
M po/ug.po
M po/uk.po
M po/ur.po
M po/uz.po
M po/uz(a)latin.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update po files
Commit: c87441a9483871cfcaec8583853889aa8251ccf0
https://github.com/phpmyadmin/phpmyadmin/commit/c87441a9483871cfcaec8583853…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Log Message:
-----------
Merge branch 'MAINT_4_0_5' into QA_4_0
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c3fa3233115e...c87441a94838
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 240b8332db53dedc27baeec5306dabad3bdece3b
https://github.com/phpmyadmin/phpmyadmin/commit/240b8332db53dedc27baeec5306…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M doc/config.rst
A js/cross_framing_protection.js
M libraries/Header.class.php
M libraries/Scripts.class.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
Log Message:
-----------
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 d7e0bed28443e6cf8f41965cc2f27be19c667fa6.
Commit: 24d0eb55203b029f250c77d63f2900ffbe099e8b
https://github.com/phpmyadmin/phpmyadmin/commit/24d0eb55203b029f250c77d63f2…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M js/cross_framing_protection.js
M libraries/Header.class.php
Log Message:
-----------
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
Commit: f08ff304f9cbe082a76727ff125580af8efc8f91
https://github.com/phpmyadmin/phpmyadmin/commit/f08ff304f9cbe082a76727ff125…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M doc/config.rst
A js/cross_framing_protection.js
M libraries/Header.class.php
M libraries/Scripts.class.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
Log Message:
-----------
Merge branch 'MAINT_4_0_5' into QA_4_0
Commit: c3fa3233115ee8022c1287cb3da07e67eced69c1
https://github.com/phpmyadmin/phpmyadmin/commit/c3fa3233115ee8022c1287cb3da…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M import.php
M libraries/import.lib.php
Log Message:
-----------
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
Commit: 5c51f4fecb3d2385e3569017d709d8330d54225f
https://github.com/phpmyadmin/phpmyadmin/commit/5c51f4fecb3d2385e3569017d70…
Author: Michal Čihař <mcihar(a)suse.cz>
Date: 2013-07-29 (Mon, 29 Jul 2013)
Changed paths:
M doc/config.rst
A js/cross_framing_protection.js
M libraries/Header.class.php
M libraries/Scripts.class.php
M libraries/config.default.php
M libraries/config/messages.inc.php
M libraries/config/setup.forms.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
libraries/config/setup.forms.php
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/80e6ecc1c281...5c51f4fecb3d