- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5d590e: Fix bug#4006
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5d590ef3d67b4f87b58dbda50e86519bf9b64d34 https://github.com/phpmyadmin/phpmyadmin/commit/5d590ef3d67b4f87b58dbda50e8… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M import.php M libraries/import.lib.php Log Message: ----------- Fix bug#4006 Commit: 80e6ecc1c2811e17b2eefdda7ba12248a4f9660e https://github.com/phpmyadmin/phpmyadmin/commit/80e6ecc1c2811e17b2eefdda7ba… 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 commit '5d590ef3d67b4f87b58dbda50e86519bf9b64d34' Conflicts: import.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1da0b0b2115e...80e6ecc1c281

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 240b83: Readd AllowThirdPartyFraming option
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/QA_4_0 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 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5d590ef3d67b...c3fa3233115e

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 240b83: Readd AllowThirdPartyFraming option
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/MAINT_4_0_5 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 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/52b9b6c81f6e...24d0eb55203b

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5d590e: Fix bug#4006
by Atul Pratap Singh 29 Jul '13

29 Jul '13

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5d590ef3d67b4f87b58dbda50e86519bf9b64d34 https://github.com/phpmyadmin/phpmyadmin/commit/5d590ef3d67b4f87b58dbda50e8… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M import.php M libraries/import.lib.php Log Message: ----------- Fix bug#4006

1 0

[Phpmyadmin-git] [phpmyadmin/error-reporting-server] a3a927: Fix standard name
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/error-reporting-server Commit: a3a92791b456ecfa1bb5d1cc0eec8c0c937be93d https://github.com/phpmyadmin/error-reporting-server/commit/a3a92791b456ecf… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M build.xml Log Message: ----------- Fix standard name

1 0

[Phpmyadmin-git] [phpmyadmin/error-reporting-server] 843249: Use CakePHP CS
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/error-reporting-server Commit: 843249118ac4fcdd73c7190f414983b22407b50f https://github.com/phpmyadmin/error-reporting-server/commit/843249118ac4fcd… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M build.xml Log Message: ----------- Use CakePHP CS

1 0

[Phpmyadmin-git] [phpmyadmin/error-reporting-server] 09027a: Exclude third party files
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/error-reporting-server Commit: 09027a3f9b23de4b5267ba7cb005e483683ec0a1 https://github.com/phpmyadmin/error-reporting-server/commit/09027a3f9b23de4… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M build.xml Log Message: ----------- Exclude third party files

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1da0b0: Fix typo
by Marc Delisle 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1da0b0b2115e95d3a45f5d5dc34ba6dbde05a196 https://github.com/phpmyadmin/phpmyadmin/commit/1da0b0b2115e95d3a45f5d5dc34… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M libraries/string.inc.php Log Message: ----------- Fix typo

1 0

[Phpmyadmin-git] [phpmyadmin/error-reporting-server] 4874a1: Switch to generic phpcs
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/error-reporting-server Commit: 4874a18331e2fa73000fddec58f6f48eec964664 https://github.com/phpmyadmin/error-reporting-server/commit/4874a18331e2fa7… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M build.xml Log Message: ----------- Switch to generic phpcs

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fdc2ac: Fixed newlines around &&
by Michal Čihař 29 Jul '13

29 Jul '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fdc2ac7be5b25d263ee10be7e5a3756f8491ac37 https://github.com/phpmyadmin/phpmyadmin/commit/fdc2ac7be5b25d263ee10be7e5a… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Fixed newlines around && Commit: 22e018f9989de5c4e303b6dfd826fa7d15e655c9 https://github.com/phpmyadmin/phpmyadmin/commit/22e018f9989de5c4e303b6dfd82… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Fixed newlines around || Commit: 3ef4d4cb2e7d16a29bdbc9ba5a1843841b75038c https://github.com/phpmyadmin/phpmyadmin/commit/3ef4d4cb2e7d16a29bdbc9ba5a1… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Single declaration of a variable Commit: a3d247ea59f08230d96535c06ef4c0144f5dea59 https://github.com/phpmyadmin/phpmyadmin/commit/a3d247ea59f08230d96535c06ef… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Fixed newlines around + Commit: da81549411890ba84aeb4b305c2520e3b2d6722e https://github.com/phpmyadmin/phpmyadmin/commit/da81549411890ba84aeb4b305c2… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Better readable code Commit: aaca8fc4c937139bc8b09a5b9ab72fcff1add1b9 https://github.com/phpmyadmin/phpmyadmin/commit/aaca8fc4c937139bc8b09a5b9ab… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Define variable before using it Commit: 3e3620f22d944213c4cf0dac19faac83d2271ebd https://github.com/phpmyadmin/phpmyadmin/commit/3e3620f22d944213c4cf0dac19f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-07-29 (Mon, 29 Jul 2013) Changed paths: M js/functions.js Log Message: ----------- Use dot notation Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1d2f4a5ad344...3e3620f22d94

1 0